Merge branch 'main' of https://github.com/grublox/grublox-site

.htaccess

@@ -0,0 +1,23 @@
+#only if using apache
+
+ErrorDocument 403 /error.php?code=403
+ErrorDocument 404 /error.php?code=404
+
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^([^\.]+)$ $1.php [NC,L]
+
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^([^\.]+)$ $1.php [NC,L]
+RewriteRule ^(.*)\.aspx$ $1 [L]
+
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^([^\.]+)$ $1.php [NC,L]
+RewriteRule ^(.*)\.ashx$ $1 [L]
+
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^([^\.]+)$ $1.php [NC,L]
+RewriteRule ^(.*)\.html$ $1 [L]

about.php

@@ -1,3 +1,4 @@
 <?php
 require_once("core/config.php");
-print_r($maintainers);
+echo "maintainers ";
+ print_r($maintainers);

core/config.php

@@ -6,7 +6,7 @@ $maintainers = array("Mario1", "qzip");
 
 $version = 1.0;
 $maintainers = array("Mario1", "qzip", "nolanwhy");
-$arraybackground = array('win7.png', 'win8.png', 'epic.png', 'yosemite.png', 'aurora.png', 'tiger.png', 'fish.png');
+$arraybackground = array('win7.png', 'win8.png', 'epic.png', 'yosemite.png', 'aurora.png', 'tiger.png', 'fish.png', 'baconbloxii.png');
 $youtubefunnies = array('bitqf13QU7Q', 'Z_V6yKKIk5U', '2tHl6O5Sp8w', '-5WcDfKndxU', 'cwyTleTL06Y','Rr8XkF5TBLU');
 
      try {

error.php

@@ -0,0 +1,2 @@
+<h1>error <?php echo $_GET["code"]; ?></h1>
+<p>(this is a placeholder by the way)</p>

grublox.sql

@@ -30,7 +30,7 @@ SET time_zone = "+00:00";
 CREATE TABLE `users` (
   `id` int(11) NOT NULL,
   `username` varchar(20) NOT NULL,
-  `password` varchar(50) NOT NULL,
+  `password` varchar(450) NOT NULL,
   `date` datetime NOT NULL DEFAULT current_timestamp(),
   `token` varchar(25) DEFAULT NULL COMMENT 'Token for joining. Useful to secure joining to prevent unauthorized users to use other names.',
   `description` varchar(250) DEFAULT NULL,

home.php

@@ -9,6 +9,25 @@ session_start();
 require_once 'core/classes.php';
 require_once 'core/classes/user.php';
 $user = new User($con, $_SESSION['user']);
+
+$himsgs = [
+    "Hello",
+    "What's up",
+    "How you doing",
+    "Ayo",
+    "Hola",
+    "Welcome",
+    "Welcome back",
+    "Hi",
+    "Hey",
+    "Heyyo",
+    "Howdy",
+    "Hi there",
+    "Ahoy"
+];
+$himsg = array_rand($himsgs);
+$himsg = $himsgs[$himsg];
+
 $getitstarted = new PartyStarter;
 $getitstarted->header();
 ?>
@@ -18,7 +37,7 @@ $getitstarted->header();
  <main class="container text-white" style="width: 100%;">
   <br><br>
   <img src="https://tr.rbxcdn.com/4039b106ee8e92c8c73595ffaa35108d/150/150/AvatarHeadshot/Png" class="rounded-circle" width=190 height=190></img>
-  <span class=" text-center" style="font-size: 2rem; margin-left: 6px;">Welcome back, <?php echo $user->getUsername(); ?></span>
+  <span class=" text-center" style="font-size: 2rem; margin-left: 6px;"><?php echo $himsg; ?>, <?php echo $user->getUsername(); ?>!</span>
   <div style="margin-bottom: 50px;"></div>
   <h4 class=" card-title" style="margin-bottom: 15px;">Friends (2)</h4>
   <div class="card  shadow-sm" style="height: 11.75rem;">
@@ -84,4 +103,4 @@ $getitstarted->header();
 	</div>
  </main>
 </body>
-</html>
+</html>