diff --git a/about/index.php b/about/index.php index b44bfa18..a982ba8a 100644 --- a/about/index.php +++ b/about/index.php @@ -3,7 +3,7 @@ require(BASE . '/api/discord/bots/admin.php'); //require(BASE . '/api/google/count_majors.php'); -head('About Us', true); +head('About Us', true, false, false, "UNT Robotics is a broad engineering student organization at the University of North Texas. We focus on developing student's skills in engineering & robotics, which involves a range of beginner workshops, industry talks, robotics-based hackathons, recreational projects and competitions."); ?>
diff --git a/about/our-alumni.php b/about/our-alumni.php index d165e673..948424ce 100644 --- a/about/our-alumni.php +++ b/about/our-alumni.php @@ -1,7 +1,7 @@ 'Nick Tindle', diff --git a/about/our-team.php b/about/our-team.php index 238333e2..1e740638 100644 --- a/about/our-team.php +++ b/about/our-team.php @@ -1,7 +1,7 @@ 'Peyton Thibodeaux', diff --git a/about/our-web-team.php b/about/our-web-team.php index e7283053..2a0ad753 100644 --- a/about/our-web-team.php +++ b/about/our-web-team.php @@ -1,7 +1,7 @@
diff --git a/auth/discord.php b/auth/discord.php index 937fca1b..d367f7cf 100644 --- a/auth/discord.php +++ b/auth/discord.php @@ -118,7 +118,7 @@ function assign_user_good_standing($user_discord_id) { return AdminBot::add_user_role($user_discord_id); } -head('Joined Discord', true, true); +head('Joined Discord', true, true, false, "", null); // user must be authenticated to reach this point diff --git a/auth/join-discord.php b/auth/join-discord.php index 5c4cd0d4..0a8ded3d 100644 --- a/auth/join-discord.php +++ b/auth/join-discord.php @@ -1,6 +1,6 @@ - - - - -
-
+ + + + + + + + + +
+
-
-
-
-
-
+
+
+
+
+
+
-
-
- -
+
+ +
- +
-
- + + diff --git a/template/top.php b/template/top.php index ec9bf514..f1d2187b 100644 --- a/template/top.php +++ b/template/top.php @@ -23,31 +23,30 @@ $session = array(); class mmysqli extends mysqli { - public function __construct($host, $user, $pass, $db) { + public function __construct($host, $user, $pass, $db, $port = 3306, $socket = null) { parent::init(); - if (!parent::real_connect($host, $user, $pass, $db, 3306, null, MYSQLI_CLIENT_FOUND_ROWS)) { + if (!parent::real_connect($host, $user, $pass, $db, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS)) { die('Connect Error (' . mysqli_connect_errno() . ') ' . mysqli_connect_error()); } } } -$db = new mmysqli(DATABASE_HOST, DATABASE_USER, DATABASE_PASSWORD, DATABASE_NAME); +$db = new mmysqli(DATABASE_HOST, DATABASE_USER, DATABASE_PASSWORD, DATABASE_NAME, DATABASE_PORT, DATABASE_SOCKET); $db->set_charset(DATABASE_CHARSET); date_default_timezone_set(TIMEZONE); $untrobotics = new untrobotics($db); -function head($title, $heading, $auth = false, $return = false) { +function head($title, $heading, $auth = false, $return = false, string $description = null, string $og_image_url = null) { global $base, $userinfo, $session, $untrobotics, $db; $default_values = array( 2 => array("auth", true), - 3 => array("breadcrumbs", array("Home" => "/")), - 4 => array("return", false) + 3 => array("return", false), ); foreach (func_get_args() as $key => $val) { - if ($val == NULL) { + if ($val === NULL) { $$default_values[$key][0] = $default_values[$key][1]; } }