Skip to content

Commit

Permalink
Merge pull request #601 from geoffhumphrey/v2.1.0
Browse files Browse the repository at this point in the history 
V2.1.0
  • Loading branch information
@geoffhumphrey
geoffhumphrey committed May 10, 2016
2 parents 9c0e0a6 + 8aacf24 commit 435409d
Show file tree
Hide file tree
Showing 289 changed files with 52,116 additions and 42,935 deletions.
8 changes: 8 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,11 @@ update/current/alter_tables_DEPRECATED.php
update/current/alter_tables_DEPRECATED.php

mods/not_real.php

includes/process/process_users.inc (Laptop1's conflicted copy 2016-03-09).php

sections/brew-ba.sec.php

sections/nhc_pay.sec.php

sections/nav_admin.php
43 changes: 22 additions & 21 deletions .htaccess
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
#No indexing
IndexIgnore *

# Make sure index.php is the default page
DirectoryIndex index.php

RewriteEngine on
# If storing your installation in a sub-folder, uncomment the following line and replace [subfolder] with the name of your subfolder
# RewriteBase /[subfolder]
RewriteRule ^$ index.php [L]
RewriteRule ^([A-Za-z0-9-]+)?$ index.php?section=$1 [L]
RewriteRule ^([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/?$ index.php?section=$1&go=$2 [L]
RewriteRule ^([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/?$ index.php?section=$1&go=$2&action=$3 [L]
RewriteRule ^([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/?$ index.php?section=$1&go=$2&action=$3&id=$4 [L]
# Custom error pages
ErrorDocument 404 /404.php
ErrorDocument 401 /401.php
ErrorDocument 403 /403.php
ErrorDocument 404 /404.php
ErrorDocument 500 /500.html

#No indexing
IndexIgnore *

# Make sure index.php is the default page
DirectoryIndex index.php

RewriteEngine on
# If storing your installation in a sub-folder, uncomment the following line and replace [subfolder] with the name of your subfolder
# RewriteBase /[subfolder]
RewriteRule ^$ index.php [L]
RewriteRule ^([A-Za-z0-9-]+)?$ index.php?section=$1 [L]
RewriteRule ^([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/?$ index.php?section=$1&go=$2 [L]
RewriteRule ^([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/?$ index.php?section=$1&go=$2&action=$3 [L]
RewriteRule ^([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/([A-Za-z0-9-]+)/?$ index.php?section=$1&go=$2&action=$3&id=$4 [L]

# Custom error pages
ErrorDocument 404 /404.php
ErrorDocument 401 /401.php
ErrorDocument 403 /403.php
ErrorDocument 404 /404.php
ErrorDocument 500 /500.html

176 changes: 88 additions & 88 deletions 400.php
View file
Original file line number Diff line number Diff line change
@@ -1,89 +1,89 @@
<?php
require('paths.php');
require(CONFIG.'bootstrap.php');
$section = "400";
$go = "error_page";

$container_main = "container";
$nav_container = "navbar-default";
?>

<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title><?php echo $_SESSION['contestName']; ?> Organized By <?php echo $_SESSION['contestHost']." &gt; Error 400"; ?></title>

<!-- Load jQuery / http://jquery.com/ -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>

<!-- Load Bootstrap / http://www.getbootsrap.com -->
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>

<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- Load Font Awesome / https://fortawesome.github.io/Font-Awesome -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">

<!-- Load BCOE&M Custom Theme CSS - Contains Bootstrap overrides and custom classes -->
<link rel="stylesheet" type="text/css" href="<?php echo $theme; ?>" />

<!-- Load BCOE&M Custom JS -->
<script src="<?php echo $base_url; ?>js_includes/bcoem_custom.min.js"></script>
</head>
<body>
<!-- MAIN NAV -->
<div class="container hidden-print">
<?php include (SECTIONS.'nav.sec.php'); ?>
</div><!-- container -->
<!-- ./MAIN NAV -->

<!-- ALERTS -->
<div class="container bcoem-warning-container">
<div class="alert alert-danger"><span class="fa fa-exclamation-circle"></span> <strong>Invalid request.</strong> Don't worry, we still want you around!</div>

</div><!-- ./container -->
<!-- ./ALERTS -->

<!-- Public Pages (Fixed Layout with Sidebar) -->
<div class="container">
<div class="row">
<div class="col col-lg-9 col-md-8 col-sm-12 col-xs-12">
<div class="page-header">
<h1>400 Error</h1>
</div>
<p class="lead">Unfortunately, there was a problem.</p>
<p class="lead"><small>Please use the main navigation above to get where you want to go.</small></p>
<p>Cheers!<br>&ndash; The <?php echo $_SESSION['contestName']; ?> Site Server</p>
</div><!-- ./left column -->
<div class="sidebar col col-lg-3 col-md-4 col-sm-12 col-xs-12">
<?php include (SECTIONS.'sidebar.sec.php'); ?>
</div><!-- ./sidebar -->
</div><!-- ./row -->
<!-- ./Public Pages -->
</div><!-- ./container -->
<!-- ./Public Pages -->

<!-- Mods Bottom -->
<div class="container">

</div>
<!-- ./Mods Bottom -->

<!-- Footer -->
<footer class="footer hidden-xs hidden-sm hidden-md">
<nav class="navbar navbar-default navbar-fixed-bottom">
<div class="container text-center">
<p class="navbar-text col-md-12 col-sm-12 col-xs-12 text-muted small"><?php include (SECTIONS.'footer.sec.php'); ?></p>
</div>
</nav>
</footer><!-- ./footer -->
<!-- ./ Footer -->
</body>
<?php
require('paths.php');
require(CONFIG.'bootstrap.php');
$section = "400";
$go = "error_page";

$container_main = "container";
$nav_container = "navbar-default";
?>

<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title><?php echo $_SESSION['contestName']; ?> Organized By <?php echo $_SESSION['contestHost']." &gt; Error 400"; ?></title>

<!-- Load jQuery / http://jquery.com/ -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>

<!-- Load Bootstrap / http://www.getbootsrap.com -->
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>

<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- Load Font Awesome / https://fortawesome.github.io/Font-Awesome -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">

<!-- Load BCOE&M Custom Theme CSS - Contains Bootstrap overrides and custom classes -->
<link rel="stylesheet" type="text/css" href="<?php echo $theme; ?>" />

<!-- Load BCOE&M Custom JS -->
<script src="<?php echo $base_url; ?>js_includes/bcoem_custom.min.js"></script>
</head>
<body>
<!-- MAIN NAV -->
<div class="container hidden-print">
<?php include (SECTIONS.'nav.sec.php'); ?>
</div><!-- container -->
<!-- ./MAIN NAV -->

<!-- ALERTS -->
<div class="container bcoem-warning-container">
<div class="alert alert-danger"><span class="fa fa-exclamation-circle"></span> <strong>Invalid request.</strong> Don't worry, we still want you around!</div>

</div><!-- ./container -->
<!-- ./ALERTS -->

<!-- Public Pages (Fixed Layout with Sidebar) -->
<div class="container">
<div class="row">
<div class="col col-lg-9 col-md-8 col-sm-12 col-xs-12">
<div class="page-header">
<h1>400 Error</h1>
</div>
<p class="lead">Unfortunately, there was a problem.</p>
<p class="lead"><small>Please use the main navigation above to get where you want to go.</small></p>
<p>Cheers!<br>&ndash; The <?php echo $_SESSION['contestName']; ?> Site Server</p>
</div><!-- ./left column -->
<div class="sidebar col col-lg-3 col-md-4 col-sm-12 col-xs-12">
<?php include (SECTIONS.'sidebar.sec.php'); ?>
</div><!-- ./sidebar -->
</div><!-- ./row -->
<!-- ./Public Pages -->
</div><!-- ./container -->
<!-- ./Public Pages -->

<!-- Mods Bottom -->
<div class="container">

</div>
<!-- ./Mods Bottom -->

<!-- Footer -->
<footer class="footer hidden-xs hidden-sm hidden-md">
<nav class="navbar navbar-default navbar-fixed-bottom">
<div class="container text-center">
<p class="navbar-text col-md-12 col-sm-12 col-xs-12 text-muted small"><?php include (SECTIONS.'footer.sec.php'); ?></p>
</div>
</nav>
</footer><!-- ./footer -->
<!-- ./ Footer -->
</body>
</html>
Loading

0 comments on commit 435409d

Please sign in to comment.