diff --git a/Resources/Scripts/JavaScript/index.php b/Resources/Scripts/JavaScript/index.php deleted file mode 100755 index 6f9bdcb..0000000 --- a/Resources/Scripts/JavaScript/index.php +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - -
- - -CANTTOUCH; - - die($page); - } -?> \ No newline at end of file diff --git a/Resources/Scripts/PHP/Classes/Article.php b/app/classes/Article.php similarity index 100% rename from Resources/Scripts/PHP/Classes/Article.php rename to app/classes/Article.php diff --git a/Resources/Scripts/PHP/Classes/ArticleComment.php b/app/classes/ArticleComment.php similarity index 100% rename from Resources/Scripts/PHP/Classes/ArticleComment.php rename to app/classes/ArticleComment.php diff --git a/Resources/Scripts/PHP/Classes/EpisodeComment.php b/app/classes/EpisodeComment.php similarity index 100% rename from Resources/Scripts/PHP/Classes/EpisodeComment.php rename to app/classes/EpisodeComment.php diff --git a/Resources/Scripts/PHP/Classes/Project.php b/app/classes/Project.php similarity index 100% rename from Resources/Scripts/PHP/Classes/Project.php rename to app/classes/Project.php diff --git a/Resources/Scripts/PHP/Classes/Show.php b/app/classes/Show.php similarity index 100% rename from Resources/Scripts/PHP/Classes/Show.php rename to app/classes/Show.php diff --git a/Resources/Scripts/PHP/Classes/User.php b/app/classes/User.php similarity index 100% rename from Resources/Scripts/PHP/Classes/User.php rename to app/classes/User.php diff --git a/Resources/Scripts/PHP/Hubs/CommunityHub.php b/app/hubs/CommunityHub.php similarity index 100% rename from Resources/Scripts/PHP/Hubs/CommunityHub.php rename to app/hubs/CommunityHub.php diff --git a/Resources/Scripts/PHP/Library.php b/app/library.php similarity index 78% rename from Resources/Scripts/PHP/Library.php rename to app/library.php index 180e035..e9544ca 100755 --- a/Resources/Scripts/PHP/Library.php +++ b/app/library.php @@ -1,20 +1,4 @@ - - - - - -
- - -CANTTOUCH; - - die($page); - } - /* /// // Author: Skylear Johnson Co-Author: None @@ -22,58 +6,35 @@ CANTTOUCH; // This script is copyright (c) 2013, by Mad Splash Studios. /// */ - + ini_set('display_errors', 'On'); error_reporting(E_ALL | E_STRICT); - - /* This entire block here is a method to rid POST, GET and COOKIE of unwanted slashes. - // I have to give some thanks to Atli from Dream.In.Code for helping me come up with this. - // However, this should never really be used. If magic_slashes is a problem, it's time to switch servers; ASAP. */ - if(function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { - function undo_magic_quotes_gpc(&$array) { - foreach($array as &$value) { - if(is_array($value)) { - - undo_magic_quotes_gpc($value); - - } else { - - $value = stripslashes($value); - - } - } - } - - undo_magic_quotes_gpc($_POST); - undo_magic_quotes_gpc($_GET); - undo_magic_quotes_gpc($_COOKIE); - } - + // ---------------------------------------------------------------------------- // // ---------------------------------------------------------------------------- // /// 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. - + // Used for scripts that require some sort of timing. function getMicroTime() { - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); + list($usec, $sec) = explode(" ", microtime()); + return ((float)$usec + (float)$sec); } - + function arrayCheck($ArrayToCheck, $CheckAgainst) { if(count(array_intersect($ArrayToCheck, $CheckAgainst)) > 0) { return true; @@ -81,112 +42,71 @@ CANTTOUCH; return false; } } - + // ---------------------------------------------------------------------------- // // ---------------------------------------------------------------------------- // /// Pretty functions - used to makes things cleaner and look nicer. - + // Change the MySQL date format (YYYY-MM-DD) into something friendlier. function betterDate($uglyDate) { try { $date = new DateTime($uglyDate); - + return $date->format("jS M Y, g:i A"); } catch(PDOException $ex) { echo $ex->getMessage(); } } - + function nicerDate($uglyDate) { try { $date = new DateTime($uglyDate); - + return $date->format("jS M Y - g:i A"); } catch(PDOException $ex) { echo $ex->getMessage(); } } - + function getAge($date) { $birthDay = new DateTime($date); $today = new DateTime(); - + $age = $today->diff($birthDay); return $age->y; } - + // ---------------------------------------------------------------------------- // // ---------------------------------------------------------------------------- // /// Aegis functions - cleans data and parses it, as well as hashes and checks other stuff for protection. - + // 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; } - + // Hash a password thousands of times using a random salt. function hashPass($password, $salt, $username = "failure") { for($round = 0; $round < 124363; $round++) { $HashedPass = hash("sha512", $username . $salt . $password); } - + return $HashedPass; } - - function generateSalt($max = 15) { - $characterList = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%&*?"; - $i = 0; - $salt = ""; - - while ($i < $max) { - $salt .= $characterList{mt_rand(0, (strlen($characterList) - 1))}; - $i++; - } - - return $salt; + + function generateSalt(int $length = 15): string + { + return bin2hex(random_bytes($length)); } - + // Validate the email address inputted! - function checkEmail($email) { - $isValid = true; - $atIndex = strrpos($email, "@"); - - if(is_bool($atIndex) && !$atIndex) { - $isValid = false; - } else { - $domain = substr($email, $atIndex + 1); - $local = substr($email, 0, $atIndex); - $localLen = strlen($local); - $domainLen = strlen($domain); - - if($localLen < 1 || $localLen > 64) { - $isValid = false; - } elseif($domainLen < 1 || $domainLen > 255) { - $isValid = false; - } elseif($local[0] == '.' || $local[$localLen - 1] == '.') { - $isValid = false; - } elseif(preg_match('/\\.\\./', $local)) { - $isValid = false; - } elseif(!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)) { - $isValid = false; - } elseif(preg_match('/\\.\\./', $domain)) { - $isValid = false; - } elseif(!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/', str_replace("\\\\", "", $local))) { - if (!preg_match('/^"(\\\\"|[^"])+"$/', str_replace("\\\\", "", $local))) { - $isValid = false; - } - } - - if ($isValid && !(checkdnsrr($domain, "MX") || checkdnsrr($domain, "A"))) { - $isValid = false; - } - } - - return $isValid; + function checkEmail($email): bool + { + return filter_var($email, FILTER_VALIDATE_EMAIL) ? true : false; } - + // Simple BBCode parse function. function BBCode($data) { $input = array( @@ -214,7 +134,7 @@ CANTTOUCH; '/\[code\](.*?)\[\/code\]/is', '/ \:P/is' ); - + $output = array( '
', '

', @@ -240,36 +160,36 @@ CANTTOUCH; '
CODE 

$1

', '' ); - + $rtrn = preg_replace($input, $output, $data); - + return $rtrn; } - + // ---------------------------------------------------------------------------- // // ---------------------------------------------------------------------------- // /// Email functions - used to send emails for various reasons - + // Send an email to the specified recipient. function sendMail($mailSubject, $mailContent, $mailDestinee, $templatename) { $mailHeaders = 'MIME-Version: 1.0' . "\r\n"; $mailHeaders .= 'Content-type: text/html; charset=iso-8859-1' . "\r\n"; $mailHeaders .= 'From: theguys@localhost:8888' . "\r\n"; - + $filename = $_SERVER['DOCUMENT_ROOT'] . "/Resources/Templates/emails/" . $templatename . ".php"; include("$filename"); - + foreach($mailContent as $a => $b) { $template = str_replace("{{{" . $a . "}}}", $b, $template); } - + mail($mailDestinee, $mailSubject, $template, $mailHeaders); } - + // ---------------------------------------------------------------------------- // // ---------------------------------------------------------------------------- // /// Generator functions - used to create things that would take too many lines to constantly repeat - + // Create the new and improved text editor. function textEditor($Width, $Height, $Name, $Default) { echo <<IMG
  • URL
  • - + - + EDITOR; } - + // Function to check for errors and display them as needed. function displayErrors($leErrors, $errorArray) { $Errors = array( @@ -308,29 +228,50 @@ EDITOR; "That password doesn't match the username. Reset your password?", "<1-- 13 -->Whoops! You need to give both your username and your password!" ); - + $leErrors = array_intersect($leErrors, $errorArray); - + foreach($leErrors as $error) { $error = $error - 1; echo "" . $Errors[$error] . ""; } } - + // Retrieve template from the source. function GetTemplate($templatename) { $filename = $_SERVER['DOCUMENT_ROOT'] . "/Resources/Templates/" . $templatename . ".php"; include("$filename"); - + return $template; } - + // Parse all proper content into the template. function ParseTemplate($template, $array) { foreach($array as $a => $b) { $template = str_replace("{{{" . $a . "}}}", $b, $template); } - + return $template; } -?> \ No newline at end of file + + /** + * Return the path to the given template. + */ + function template(string $name): string + { + return "../app/templates/$name.php"; + } + + /** + * Render a template. Pass data to it - uses an output buffer to have PHP process the template instead of using + * a template engine. If you're including partials in the page, call render('partial', $data), as $data will still + * be available. + */ + function render(string $baseView, array $data = []): string + { + ob_start(); + extract($data); + include template($baseView); + return ob_get_clean(); + } +?> diff --git a/Resources/Scripts/PHP/Modules/CommunityModule.php b/app/modules/CommunityModule.php similarity index 100% rename from Resources/Scripts/PHP/Modules/CommunityModule.php rename to app/modules/CommunityModule.php diff --git a/Resources/Scripts/PHP/Modules/DatabaseModule.php b/app/modules/DatabaseModule.php similarity index 100% rename from Resources/Scripts/PHP/Modules/DatabaseModule.php rename to app/modules/DatabaseModule.php diff --git a/Resources/Scripts/PHP/Modules/DisplayModule.php b/app/modules/DisplayModule.php similarity index 100% rename from Resources/Scripts/PHP/Modules/DisplayModule.php rename to app/modules/DisplayModule.php diff --git a/Resources/Scripts/PHP/Modules/ParserModule.php b/app/modules/ParserModule.php similarity index 100% rename from Resources/Scripts/PHP/Modules/ParserModule.php rename to app/modules/ParserModule.php diff --git a/Resources/Scripts/PHP/SuperNav.php b/app/supernav.php similarity index 100% rename from Resources/Scripts/PHP/SuperNav.php rename to app/supernav.php diff --git a/Resources/Templates/articles/articlebody.php b/app/templates/articles/articlebody.php similarity index 100% rename from Resources/Templates/articles/articlebody.php rename to app/templates/articles/articlebody.php diff --git a/Resources/Templates/articles/featured.php b/app/templates/articles/featured.php similarity index 100% rename from Resources/Templates/articles/featured.php rename to app/templates/articles/featured.php diff --git a/Resources/Templates/articles/listedarticle.php b/app/templates/articles/listedarticle.php similarity index 100% rename from Resources/Templates/articles/listedarticle.php rename to app/templates/articles/listedarticle.php diff --git a/blog/Pieces/footer.htm b/app/templates/blog/footer.htm similarity index 100% rename from blog/Pieces/footer.htm rename to app/templates/blog/footer.htm diff --git a/blog/Pieces/header.htm b/app/templates/blog/header.htm similarity index 100% rename from blog/Pieces/header.htm rename to app/templates/blog/header.htm diff --git a/blog/Pieces/Blog/list.htm b/app/templates/blog/list.htm similarity index 100% rename from blog/Pieces/Blog/list.htm rename to app/templates/blog/list.htm diff --git a/blog/Pieces/Blog/read.htm b/app/templates/blog/read.htm similarity index 100% rename from blog/Pieces/Blog/read.htm rename to app/templates/blog/read.htm diff --git a/Resources/Templates/comments/commentbox.php b/app/templates/comments/commentbox.php similarity index 100% rename from Resources/Templates/comments/commentbox.php rename to app/templates/comments/commentbox.php diff --git a/Resources/Templates/comments/commentform.php b/app/templates/comments/commentform.php similarity index 100% rename from Resources/Templates/comments/commentform.php rename to app/templates/comments/commentform.php diff --git a/Resources/Templates/comments/episodeform.php b/app/templates/comments/episodeform.php similarity index 100% rename from Resources/Templates/comments/episodeform.php rename to app/templates/comments/episodeform.php diff --git a/community/Pieces/Community/extras/verified.php b/app/templates/community/extras/verified.php similarity index 100% rename from community/Pieces/Community/extras/verified.php rename to app/templates/community/extras/verified.php diff --git a/community/Pieces/Community/extras/verifiederror.php b/app/templates/community/extras/verifiederror.php similarity index 100% rename from community/Pieces/Community/extras/verifiederror.php rename to app/templates/community/extras/verifiederror.php diff --git a/community/Pieces/footer.htm b/app/templates/community/footer.htm similarity index 100% rename from community/Pieces/footer.htm rename to app/templates/community/footer.htm diff --git a/community/Pieces/header.htm b/app/templates/community/header.htm similarity index 100% rename from community/Pieces/header.htm rename to app/templates/community/header.htm diff --git a/community/Pieces/Community/login.htm b/app/templates/community/login.htm similarity index 100% rename from community/Pieces/Community/login.htm rename to app/templates/community/login.htm diff --git a/community/Pieces/Community/register.htm b/app/templates/community/register.htm similarity index 100% rename from community/Pieces/Community/register.htm rename to app/templates/community/register.htm diff --git a/community/Pieces/Community/verify.htm b/app/templates/community/verify.htm similarity index 100% rename from community/Pieces/Community/verify.htm rename to app/templates/community/verify.htm diff --git a/Resources/Templates/emails/newsletter.php b/app/templates/emails/newsletter.php similarity index 100% rename from Resources/Templates/emails/newsletter.php rename to app/templates/emails/newsletter.php diff --git a/Resources/Templates/emails/verification.php b/app/templates/emails/verification.php similarity index 100% rename from Resources/Templates/emails/verification.php rename to app/templates/emails/verification.php diff --git a/Pieces/footer.htm b/app/templates/footer.htm similarity index 100% rename from Pieces/footer.htm rename to app/templates/footer.htm diff --git a/Pieces/header.htm b/app/templates/header.htm similarity index 100% rename from Pieces/header.htm rename to app/templates/header.htm diff --git a/Pieces/home.htm b/app/templates/home.htm similarity index 100% rename from Pieces/home.htm rename to app/templates/home.htm diff --git a/Pieces/privacy.htm b/app/templates/privacy.htm similarity index 100% rename from Pieces/privacy.htm rename to app/templates/privacy.htm diff --git a/projects/Pieces/footer.htm b/app/templates/projects/footer.htm similarity index 100% rename from projects/Pieces/footer.htm rename to app/templates/projects/footer.htm diff --git a/projects/Pieces/header.htm b/app/templates/projects/header.htm similarity index 100% rename from projects/Pieces/header.htm rename to app/templates/projects/header.htm diff --git a/projects/Pieces/main.htm b/app/templates/projects/main.htm similarity index 100% rename from projects/Pieces/main.htm rename to app/templates/projects/main.htm diff --git a/projects/projects.php b/app/templates/projects/projects.php similarity index 100% rename from projects/projects.php rename to app/templates/projects/projects.php diff --git a/projects/Pieces/Templates/show.php b/app/templates/projects/show.php similarity index 100% rename from projects/Pieces/Templates/show.php rename to app/templates/projects/show.php diff --git a/Resources/Templates/projects/thumbnail.php b/app/templates/projects/thumbnail.php similarity index 100% rename from Resources/Templates/projects/thumbnail.php rename to app/templates/projects/thumbnail.php diff --git a/Pieces/slider.htm b/app/templates/slider.htm similarity index 100% rename from Pieces/slider.htm rename to app/templates/slider.htm diff --git a/Pieces/tandc.htm b/app/templates/tandc.htm similarity index 100% rename from Pieces/tandc.htm rename to app/templates/tandc.htm diff --git a/community/Pieces/index.php b/community/Pieces/index.php deleted file mode 100755 index 6f9bdcb..0000000 --- a/community/Pieces/index.php +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - -
    - - -CANTTOUCH; - - die($page); - } -?> \ No newline at end of file diff --git a/Resources/CSS/CustomFonts.css b/public/assets/css/CustomFonts.css similarity index 100% rename from Resources/CSS/CustomFonts.css rename to public/assets/css/CustomFonts.css diff --git a/Resources/CSS/FormStyles.css b/public/assets/css/FormStyles.css similarity index 100% rename from Resources/CSS/FormStyles.css rename to public/assets/css/FormStyles.css diff --git a/Resources/CSS/MadSplash_v3.css b/public/assets/css/MadSplash_v3.css similarity index 100% rename from Resources/CSS/MadSplash_v3.css rename to public/assets/css/MadSplash_v3.css diff --git a/Resources/CSS/ie6.css b/public/assets/css/ie6.css similarity index 100% rename from Resources/CSS/ie6.css rename to public/assets/css/ie6.css diff --git a/Resources/Fonts/BebasNeue-webfont.eot b/public/assets/fonts/BebasNeue-webfont.eot similarity index 100% rename from Resources/Fonts/BebasNeue-webfont.eot rename to public/assets/fonts/BebasNeue-webfont.eot diff --git a/Resources/Fonts/BebasNeue-webfont.svg b/public/assets/fonts/BebasNeue-webfont.svg similarity index 100% rename from Resources/Fonts/BebasNeue-webfont.svg rename to public/assets/fonts/BebasNeue-webfont.svg diff --git a/Resources/Fonts/BebasNeue-webfont.ttf b/public/assets/fonts/BebasNeue-webfont.ttf similarity index 100% rename from Resources/Fonts/BebasNeue-webfont.ttf rename to public/assets/fonts/BebasNeue-webfont.ttf diff --git a/Resources/Fonts/BebasNeue-webfont.woff b/public/assets/fonts/BebasNeue-webfont.woff similarity index 100% rename from Resources/Fonts/BebasNeue-webfont.woff rename to public/assets/fonts/BebasNeue-webfont.woff diff --git a/Resources/Fonts/Minecraft_font.eot b/public/assets/fonts/Minecraft_font.eot similarity index 100% rename from Resources/Fonts/Minecraft_font.eot rename to public/assets/fonts/Minecraft_font.eot diff --git a/Resources/Fonts/Minecraft_font.svg b/public/assets/fonts/Minecraft_font.svg similarity index 100% rename from Resources/Fonts/Minecraft_font.svg rename to public/assets/fonts/Minecraft_font.svg diff --git a/Resources/Fonts/Minecraft_font.ttf b/public/assets/fonts/Minecraft_font.ttf similarity index 100% rename from Resources/Fonts/Minecraft_font.ttf rename to public/assets/fonts/Minecraft_font.ttf diff --git a/Resources/Fonts/Minecraft_font.woff b/public/assets/fonts/Minecraft_font.woff similarity index 100% rename from Resources/Fonts/Minecraft_font.woff rename to public/assets/fonts/Minecraft_font.woff diff --git a/Resources/Fonts/SF_Arch_Rival-webfont.eot b/public/assets/fonts/SF_Arch_Rival-webfont.eot similarity index 100% rename from Resources/Fonts/SF_Arch_Rival-webfont.eot rename to public/assets/fonts/SF_Arch_Rival-webfont.eot diff --git a/Resources/Fonts/SF_Arch_Rival-webfont.svg b/public/assets/fonts/SF_Arch_Rival-webfont.svg similarity index 100% rename from Resources/Fonts/SF_Arch_Rival-webfont.svg rename to public/assets/fonts/SF_Arch_Rival-webfont.svg diff --git a/Resources/Fonts/SF_Arch_Rival-webfont.ttf b/public/assets/fonts/SF_Arch_Rival-webfont.ttf similarity index 100% rename from Resources/Fonts/SF_Arch_Rival-webfont.ttf rename to public/assets/fonts/SF_Arch_Rival-webfont.ttf diff --git a/Resources/Fonts/SF_Arch_Rival-webfont.woff b/public/assets/fonts/SF_Arch_Rival-webfont.woff similarity index 100% rename from Resources/Fonts/SF_Arch_Rival-webfont.woff rename to public/assets/fonts/SF_Arch_Rival-webfont.woff diff --git a/Resources/Fonts/zeronero-webfont.eot b/public/assets/fonts/zeronero-webfont.eot similarity index 100% rename from Resources/Fonts/zeronero-webfont.eot rename to public/assets/fonts/zeronero-webfont.eot diff --git a/Resources/Fonts/zeronero-webfont.svg b/public/assets/fonts/zeronero-webfont.svg similarity index 100% rename from Resources/Fonts/zeronero-webfont.svg rename to public/assets/fonts/zeronero-webfont.svg diff --git a/Resources/Fonts/zeronero-webfont.ttf b/public/assets/fonts/zeronero-webfont.ttf similarity index 100% rename from Resources/Fonts/zeronero-webfont.ttf rename to public/assets/fonts/zeronero-webfont.ttf diff --git a/Resources/Fonts/zeronero-webfont.woff b/public/assets/fonts/zeronero-webfont.woff similarity index 100% rename from Resources/Fonts/zeronero-webfont.woff rename to public/assets/fonts/zeronero-webfont.woff diff --git a/Resources/Images/Avatars/MasonBrick.jpg b/public/assets/images/Avatars/MasonBrick.jpg similarity index 100% rename from Resources/Images/Avatars/MasonBrick.jpg rename to public/assets/images/Avatars/MasonBrick.jpg diff --git a/Resources/Images/Avatars/Sky.png b/public/assets/images/Avatars/Sky.png similarity index 100% rename from Resources/Images/Avatars/Sky.png rename to public/assets/images/Avatars/Sky.png diff --git a/Resources/Images/Avatars/pumpkin.png b/public/assets/images/Avatars/pumpkin.png similarity index 100% rename from Resources/Images/Avatars/pumpkin.png rename to public/assets/images/Avatars/pumpkin.png diff --git a/Resources/Images/Backgrounds/EmailHead.jpg b/public/assets/images/Backgrounds/EmailHead.jpg similarity index 100% rename from Resources/Images/Backgrounds/EmailHead.jpg rename to public/assets/images/Backgrounds/EmailHead.jpg diff --git a/Resources/Images/Backgrounds/NewOceanWave.jpg b/public/assets/images/Backgrounds/NewOceanWave.jpg similarity index 100% rename from Resources/Images/Backgrounds/NewOceanWave.jpg rename to public/assets/images/Backgrounds/NewOceanWave.jpg diff --git a/Resources/Images/Backgrounds/Stripes.png b/public/assets/images/Backgrounds/Stripes.png similarity index 100% rename from Resources/Images/Backgrounds/Stripes.png rename to public/assets/images/Backgrounds/Stripes.png diff --git a/Resources/Images/Backgrounds/Wave.png b/public/assets/images/Backgrounds/Wave.png similarity index 100% rename from Resources/Images/Backgrounds/Wave.png rename to public/assets/images/Backgrounds/Wave.png diff --git a/Resources/Images/Backgrounds/Wave2.png b/public/assets/images/Backgrounds/Wave2.png similarity index 100% rename from Resources/Images/Backgrounds/Wave2.png rename to public/assets/images/Backgrounds/Wave2.png diff --git a/Resources/Images/Backgrounds/Wave3.png b/public/assets/images/Backgrounds/Wave3.png similarity index 100% rename from Resources/Images/Backgrounds/Wave3.png rename to public/assets/images/Backgrounds/Wave3.png diff --git a/Resources/Images/Covers/BlogPosts/42814Cover.png b/public/assets/images/Covers/BlogPosts/42814Cover.png similarity index 100% rename from Resources/Images/Covers/BlogPosts/42814Cover.png rename to public/assets/images/Covers/BlogPosts/42814Cover.png diff --git a/Resources/Images/Covers/BlogPosts/5214Cover.png b/public/assets/images/Covers/BlogPosts/5214Cover.png similarity index 100% rename from Resources/Images/Covers/BlogPosts/5214Cover.png rename to public/assets/images/Covers/BlogPosts/5214Cover.png diff --git a/Resources/Images/Covers/BlogPosts/52614Cover.png b/public/assets/images/Covers/BlogPosts/52614Cover.png similarity index 100% rename from Resources/Images/Covers/BlogPosts/52614Cover.png rename to public/assets/images/Covers/BlogPosts/52614Cover.png diff --git a/Resources/Images/Covers/BlogPosts/52814Cover.png b/public/assets/images/Covers/BlogPosts/52814Cover.png similarity index 100% rename from Resources/Images/Covers/BlogPosts/52814Cover.png rename to public/assets/images/Covers/BlogPosts/52814Cover.png diff --git a/Resources/Images/Covers/BlogPosts/60714Cover.png b/public/assets/images/Covers/BlogPosts/60714Cover.png similarity index 100% rename from Resources/Images/Covers/BlogPosts/60714Cover.png rename to public/assets/images/Covers/BlogPosts/60714Cover.png diff --git a/Resources/Images/Covers/BlogPosts/BlueCheckers.png b/public/assets/images/Covers/BlogPosts/BlueCheckers.png similarity index 100% rename from Resources/Images/Covers/BlogPosts/BlueCheckers.png rename to public/assets/images/Covers/BlogPosts/BlueCheckers.png diff --git a/Resources/Images/Covers/BlogPosts/Problem.png b/public/assets/images/Covers/BlogPosts/Problem.png similarity index 100% rename from Resources/Images/Covers/BlogPosts/Problem.png rename to public/assets/images/Covers/BlogPosts/Problem.png diff --git a/Resources/Images/Covers/BlogPosts/ProjectScreenie1.png b/public/assets/images/Covers/BlogPosts/ProjectScreenie1.png similarity index 100% rename from Resources/Images/Covers/BlogPosts/ProjectScreenie1.png rename to public/assets/images/Covers/BlogPosts/ProjectScreenie1.png diff --git a/Resources/Images/Covers/SlideLinks/CIOButton.png b/public/assets/images/Covers/SlideLinks/CIOButton.png similarity index 100% rename from Resources/Images/Covers/SlideLinks/CIOButton.png rename to public/assets/images/Covers/SlideLinks/CIOButton.png diff --git a/Resources/Images/Covers/SlideLinks/DownloadButton.png b/public/assets/images/Covers/SlideLinks/DownloadButton.png similarity index 100% rename from Resources/Images/Covers/SlideLinks/DownloadButton.png rename to public/assets/images/Covers/SlideLinks/DownloadButton.png diff --git a/Resources/Images/Covers/Slides/CarRunSlide2.jpg b/public/assets/images/Covers/Slides/CarRunSlide2.jpg similarity index 100% rename from Resources/Images/Covers/Slides/CarRunSlide2.jpg rename to public/assets/images/Covers/Slides/CarRunSlide2.jpg diff --git a/Resources/Images/Covers/Slides/NewLogoSlide.jpg b/public/assets/images/Covers/Slides/NewLogoSlide.jpg similarity index 100% rename from Resources/Images/Covers/Slides/NewLogoSlide.jpg rename to public/assets/images/Covers/Slides/NewLogoSlide.jpg diff --git a/Resources/Images/Covers/Slides/TheRPGMakersSlide.jpg b/public/assets/images/Covers/Slides/TheRPGMakersSlide.jpg similarity index 100% rename from Resources/Images/Covers/Slides/TheRPGMakersSlide.jpg rename to public/assets/images/Covers/Slides/TheRPGMakersSlide.jpg diff --git a/Resources/Images/General/Batty1.png b/public/assets/images/General/Batty1.png similarity index 100% rename from Resources/Images/General/Batty1.png rename to public/assets/images/General/Batty1.png diff --git a/Resources/Images/General/CC3.png b/public/assets/images/General/CC3.png similarity index 100% rename from Resources/Images/General/CC3.png rename to public/assets/images/General/CC3.png diff --git a/Resources/Images/General/CantTouchThis.png b/public/assets/images/General/CantTouchThis.png similarity index 100% rename from Resources/Images/General/CantTouchThis.png rename to public/assets/images/General/CantTouchThis.png diff --git a/Resources/Images/General/Car2.png b/public/assets/images/General/Car2.png similarity index 100% rename from Resources/Images/General/Car2.png rename to public/assets/images/General/Car2.png diff --git a/Resources/Images/General/Cookie.png b/public/assets/images/General/Cookie.png similarity index 100% rename from Resources/Images/General/Cookie.png rename to public/assets/images/General/Cookie.png diff --git a/Resources/Images/General/SkyDrawn.png b/public/assets/images/General/SkyDrawn.png similarity index 100% rename from Resources/Images/General/SkyDrawn.png rename to public/assets/images/General/SkyDrawn.png diff --git a/Resources/Images/General/TamakiSad.png b/public/assets/images/General/TamakiSad.png similarity index 100% rename from Resources/Images/General/TamakiSad.png rename to public/assets/images/General/TamakiSad.png diff --git a/Resources/Images/Icons/Emotes/AHH.gif b/public/assets/images/Icons/Emotes/AHH.gif similarity index 100% rename from Resources/Images/Icons/Emotes/AHH.gif rename to public/assets/images/Icons/Emotes/AHH.gif diff --git a/Resources/Images/Icons/Emotes/BRB.gif b/public/assets/images/Icons/Emotes/BRB.gif similarity index 100% rename from Resources/Images/Icons/Emotes/BRB.gif rename to public/assets/images/Icons/Emotes/BRB.gif diff --git a/Resources/Images/Icons/Emotes/Blank.gif b/public/assets/images/Icons/Emotes/Blank.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Blank.gif rename to public/assets/images/Icons/Emotes/Blank.gif diff --git a/Resources/Images/Icons/Emotes/Bomb.gif b/public/assets/images/Icons/Emotes/Bomb.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Bomb.gif rename to public/assets/images/Icons/Emotes/Bomb.gif diff --git a/Resources/Images/Icons/Emotes/Erm.gif b/public/assets/images/Icons/Emotes/Erm.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Erm.gif rename to public/assets/images/Icons/Emotes/Erm.gif diff --git a/Resources/Images/Icons/Emotes/Facepalm.gif b/public/assets/images/Icons/Emotes/Facepalm.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Facepalm.gif rename to public/assets/images/Icons/Emotes/Facepalm.gif diff --git a/Resources/Images/Icons/Emotes/Grin.gif b/public/assets/images/Icons/Emotes/Grin.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Grin.gif rename to public/assets/images/Icons/Emotes/Grin.gif diff --git a/Resources/Images/Icons/Emotes/Grr.gif b/public/assets/images/Icons/Emotes/Grr.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Grr.gif rename to public/assets/images/Icons/Emotes/Grr.gif diff --git a/Resources/Images/Icons/Emotes/Hmph.gif b/public/assets/images/Icons/Emotes/Hmph.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Hmph.gif rename to public/assets/images/Icons/Emotes/Hmph.gif diff --git a/Resources/Images/Icons/Emotes/Horror.gif b/public/assets/images/Icons/Emotes/Horror.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Horror.gif rename to public/assets/images/Icons/Emotes/Horror.gif diff --git a/Resources/Images/Icons/Emotes/Huh.gif b/public/assets/images/Icons/Emotes/Huh.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Huh.gif rename to public/assets/images/Icons/Emotes/Huh.gif diff --git a/Resources/Images/Icons/Emotes/MegaSad.gif b/public/assets/images/Icons/Emotes/MegaSad.gif similarity index 100% rename from Resources/Images/Icons/Emotes/MegaSad.gif rename to public/assets/images/Icons/Emotes/MegaSad.gif diff --git a/Resources/Images/Icons/Emotes/Nope.gif b/public/assets/images/Icons/Emotes/Nope.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Nope.gif rename to public/assets/images/Icons/Emotes/Nope.gif diff --git a/Resources/Images/Icons/Emotes/Shrug.gif b/public/assets/images/Icons/Emotes/Shrug.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Shrug.gif rename to public/assets/images/Icons/Emotes/Shrug.gif diff --git a/Resources/Images/Icons/Emotes/Smile.gif b/public/assets/images/Icons/Emotes/Smile.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Smile.gif rename to public/assets/images/Icons/Emotes/Smile.gif diff --git a/Resources/Images/Icons/Emotes/Surrender.gif b/public/assets/images/Icons/Emotes/Surrender.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Surrender.gif rename to public/assets/images/Icons/Emotes/Surrender.gif diff --git a/Resources/Images/Icons/Emotes/Tongue.gif b/public/assets/images/Icons/Emotes/Tongue.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Tongue.gif rename to public/assets/images/Icons/Emotes/Tongue.gif diff --git a/Resources/Images/Icons/Emotes/Ugh.gif b/public/assets/images/Icons/Emotes/Ugh.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Ugh.gif rename to public/assets/images/Icons/Emotes/Ugh.gif diff --git a/Resources/Images/Icons/Emotes/WOO.gif b/public/assets/images/Icons/Emotes/WOO.gif similarity index 100% rename from Resources/Images/Icons/Emotes/WOO.gif rename to public/assets/images/Icons/Emotes/WOO.gif diff --git a/Resources/Images/Icons/Emotes/What.gif b/public/assets/images/Icons/Emotes/What.gif similarity index 100% rename from Resources/Images/Icons/Emotes/What.gif rename to public/assets/images/Icons/Emotes/What.gif diff --git a/Resources/Images/Icons/Emotes/XD.gif b/public/assets/images/Icons/Emotes/XD.gif similarity index 100% rename from Resources/Images/Icons/Emotes/XD.gif rename to public/assets/images/Icons/Emotes/XD.gif diff --git a/Resources/Images/Icons/Emotes/XP.gif b/public/assets/images/Icons/Emotes/XP.gif similarity index 100% rename from Resources/Images/Icons/Emotes/XP.gif rename to public/assets/images/Icons/Emotes/XP.gif diff --git a/Resources/Images/Icons/Emotes/Yay.gif b/public/assets/images/Icons/Emotes/Yay.gif similarity index 100% rename from Resources/Images/Icons/Emotes/Yay.gif rename to public/assets/images/Icons/Emotes/Yay.gif diff --git a/Resources/Images/Icons/General/CrossNav.png b/public/assets/images/Icons/General/CrossNav.png similarity index 100% rename from Resources/Images/Icons/General/CrossNav.png rename to public/assets/images/Icons/General/CrossNav.png diff --git a/Resources/Images/Icons/General/CrossNavDark.png b/public/assets/images/Icons/General/CrossNavDark.png similarity index 100% rename from Resources/Images/Icons/General/CrossNavDark.png rename to public/assets/images/Icons/General/CrossNavDark.png diff --git a/Resources/Images/Icons/General/New.png b/public/assets/images/Icons/General/New.png similarity index 100% rename from Resources/Images/Icons/General/New.png rename to public/assets/images/Icons/General/New.png diff --git a/Resources/Images/Icons/General/ThumbDownIcon.png b/public/assets/images/Icons/General/ThumbDownIcon.png similarity index 100% rename from Resources/Images/Icons/General/ThumbDownIcon.png rename to public/assets/images/Icons/General/ThumbDownIcon.png diff --git a/Resources/Images/Icons/General/ThumbUpIcon.png b/public/assets/images/Icons/General/ThumbUpIcon.png similarity index 100% rename from Resources/Images/Icons/General/ThumbUpIcon.png rename to public/assets/images/Icons/General/ThumbUpIcon.png diff --git a/Resources/Images/Icons/General/ThumbsDown.png b/public/assets/images/Icons/General/ThumbsDown.png similarity index 100% rename from Resources/Images/Icons/General/ThumbsDown.png rename to public/assets/images/Icons/General/ThumbsDown.png diff --git a/Resources/Images/Icons/General/ThumbsUp.png b/public/assets/images/Icons/General/ThumbsUp.png similarity index 100% rename from Resources/Images/Icons/General/ThumbsUp.png rename to public/assets/images/Icons/General/ThumbsUp.png diff --git a/Resources/Images/Icons/General/UpdatedTag.png b/public/assets/images/Icons/General/UpdatedTag.png similarity index 100% rename from Resources/Images/Icons/General/UpdatedTag.png rename to public/assets/images/Icons/General/UpdatedTag.png diff --git a/Resources/Images/Icons/Social/Twitter.png b/public/assets/images/Icons/Social/Twitter.png similarity index 100% rename from Resources/Images/Icons/Social/Twitter.png rename to public/assets/images/Icons/Social/Twitter.png diff --git a/Resources/Images/Icons/Social/TwitterHOV.png b/public/assets/images/Icons/Social/TwitterHOV.png similarity index 100% rename from Resources/Images/Icons/Social/TwitterHOV.png rename to public/assets/images/Icons/Social/TwitterHOV.png diff --git a/Resources/Images/Icons/Social/YouTube.png b/public/assets/images/Icons/Social/YouTube.png similarity index 100% rename from Resources/Images/Icons/Social/YouTube.png rename to public/assets/images/Icons/Social/YouTube.png diff --git a/Resources/Images/Icons/Social/YouTubeHOV.png b/public/assets/images/Icons/Social/YouTubeHOV.png similarity index 100% rename from Resources/Images/Icons/Social/YouTubeHOV.png rename to public/assets/images/Icons/Social/YouTubeHOV.png diff --git a/Resources/Images/Logos/LogoV7.png b/public/assets/images/Logos/LogoV7.png similarity index 100% rename from Resources/Images/Logos/LogoV7.png rename to public/assets/images/Logos/LogoV7.png diff --git a/Resources/Images/Logos/LogoV7B.png b/public/assets/images/Logos/LogoV7B.png similarity index 100% rename from Resources/Images/Logos/LogoV7B.png rename to public/assets/images/Logos/LogoV7B.png diff --git a/Resources/Images/Thumbs/Book/BattlesforArthosThumb.png b/public/assets/images/Thumbs/Book/BattlesforArthosThumb.png similarity index 100% rename from Resources/Images/Thumbs/Book/BattlesforArthosThumb.png rename to public/assets/images/Thumbs/Book/BattlesforArthosThumb.png diff --git a/Resources/Images/Thumbs/Book/NoThumb.png b/public/assets/images/Thumbs/Book/NoThumb.png similarity index 100% rename from Resources/Images/Thumbs/Book/NoThumb.png rename to public/assets/images/Thumbs/Book/NoThumb.png diff --git a/Resources/Images/Thumbs/Game/BattleMonstersThumb.png b/public/assets/images/Thumbs/Game/BattleMonstersThumb.png similarity index 100% rename from Resources/Images/Thumbs/Game/BattleMonstersThumb.png rename to public/assets/images/Thumbs/Game/BattleMonstersThumb.png diff --git a/Resources/Images/Thumbs/Game/NoThumb.png b/public/assets/images/Thumbs/Game/NoThumb.png similarity index 100% rename from Resources/Images/Thumbs/Game/NoThumb.png rename to public/assets/images/Thumbs/Game/NoThumb.png diff --git a/Resources/Images/Thumbs/Show/NoThumb.png b/public/assets/images/Thumbs/Show/NoThumb.png similarity index 100% rename from Resources/Images/Thumbs/Show/NoThumb.png rename to public/assets/images/Thumbs/Show/NoThumb.png diff --git a/Resources/Images/Thumbs/Show/ROBLOXRPGTutorialThumb.png b/public/assets/images/Thumbs/Show/ROBLOXRPGTutorialThumb.png similarity index 100% rename from Resources/Images/Thumbs/Show/ROBLOXRPGTutorialThumb.png rename to public/assets/images/Thumbs/Show/ROBLOXRPGTutorialThumb.png diff --git a/Resources/Scripts/JavaScript/TextEditor.js b/public/assets/scripts/TextEditor.js similarity index 100% rename from Resources/Scripts/JavaScript/TextEditor.js rename to public/assets/scripts/TextEditor.js diff --git a/Resources/Scripts/JavaScript/jQuery.js b/public/assets/scripts/jQuery.js similarity index 100% rename from Resources/Scripts/JavaScript/jQuery.js rename to public/assets/scripts/jQuery.js diff --git a/Resources/Scripts/JavaScript/latestTweet.js b/public/assets/scripts/latestTweet.js similarity index 100% rename from Resources/Scripts/JavaScript/latestTweet.js rename to public/assets/scripts/latestTweet.js diff --git a/Resources/Scripts/JavaScript/passSecurityCheck.js b/public/assets/scripts/passSecurityCheck.js similarity index 100% rename from Resources/Scripts/JavaScript/passSecurityCheck.js rename to public/assets/scripts/passSecurityCheck.js diff --git a/blog/blog.php b/public/blog/index.php similarity index 100% rename from blog/blog.php rename to public/blog/index.php diff --git a/community/index.php b/public/community/index.php similarity index 100% rename from community/index.php rename to public/community/index.php diff --git a/community/verify.php b/public/community/verify.php similarity index 100% rename from community/verify.php rename to public/community/verify.php diff --git a/public/index.php b/public/index.php new file mode 100755 index 0000000..ff3f222 --- /dev/null +++ b/public/index.php @@ -0,0 +1,25 @@ + diff --git a/projects/show.php b/public/projects/index.php similarity index 100% rename from projects/show.php rename to public/projects/index.php