jake/spoons
1
Fork 0
mirror of https://github.com/jakejarvis/spoons.git synced 2025-04-27 11:38:25 -04:00
Code Releases Activity

prevent double-shuffling or double-clearing, fixes issue #6

Browse Source
This commit is contained in:
Jake Jarvis 2013-05-19 17:42:19 -04:00
parent ee8e1f4562
commit 7e25c2285f
4 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
View File

@ -9,8 +9,10 @@ RewriteRule ^sms/?$ sms.php
RewriteRule ^print.pdf print.php RewriteRule ^print.pdf print.php
RewriteRule ^shuffle/?$ index.php?shuffle RewriteRule ^shuffle/?$ index.php?shuffle
RewriteRule ^shuffle/confirmed/?$ index.php?shuffle&confirmed RewriteRule ^shuffle/confirmed/?$ index.php?shuffle&confirmed
RewriteRule ^shuffle/done/?$ index.php?shuffle&done
RewriteRule ^clear/?$ index.php?clear RewriteRule ^clear/?$ index.php?clear
RewriteRule ^clear/confirmed/?$ index.php?clear&confirmed RewriteRule ^clear/confirmed/?$ index.php?clear&confirmed
RewriteRule ^clear/done/?$ index.php?clear&done
RewriteRule ^add/?$ add.php RewriteRule ^add/?$ add.php
RewriteRule ^spoon/([^/.]+)/?$ index.php?spoon=$1 RewriteRule ^spoon/([^/.]+)/?$ index.php?spoon=$1
RewriteRule ^revive/([^/.]+)/?$ index.php?revive=$1 RewriteRule ^revive/([^/.]+)/?$ index.php?revive=$1

13
header.php
View File

@ -1,15 +1,4 @@
<?php <?php include_once('init.php') // probably already done but just in case... ?>
include_once('config.php');
session_start();
if(!isset($_SESSION['logged_in']) || $_SESSION['logged_in'] == FALSE) {
header("Location:" . $site_url . "/login");
die();
}
include_once('functions.php');
include_once('db_connect.php');
?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>

46
index.php
View File

@ -1,6 +1,18 @@
<?php <?php
include('init.php');
// needs to be at top so we can redirect to prevent double-shuffling or double-clearing
if(isset($_GET['shuffle']) && isset($_GET['confirmed'])) {
shuffleSpooners();
header("Location:" . $site_url . "/shuffle/done");
} else if(isset($_GET['clear']) && isset($_GET['confirmed'])) {
mysql_query("TRUNCATE spooners");
header("Location:" . $site_url . "/clear/done");
}
$page = "Home"; $page = "Home";
include('header.php'); include('header.php');
?> ?>
<style> <style>
@ -48,11 +60,17 @@ include('header.php');
color: #b94a48; color: #b94a48;
} }
div.alert a.btn { div.alert a.btn {
color: #333;
padding: 4px 20px !important;
}
div.alert a.btn-success {
color: #fff; color: #fff;
} }
div.alert a.btn i {
margin:2px 4px 0px -8px;
}
div.alert p { div.alert p {
margin-top: 10px; margin: 10px 0px;
margin-bottom: 0px;
} }
</style> </style>
@ -82,19 +100,15 @@ if(isset($_GET['revive'])) {
/*********** SHUFFLING **********/ /*********** SHUFFLING **********/
if(isset($_GET['shuffle']) && !isset($_GET['confirmed'])) { ?> if(isset($_GET['shuffle']) && !isset($_GET['confirmed']) && !isset($_GET['done'])) { ?>
<div class="alert alert-error"> <div class="alert alert-error">
<a type="button" class="close" data-dismiss="alert">&times;</a> <a type="button" class="close" data-dismiss="alert">&times;</a>
<h4>Are you sure you wanna do that...?</h4> <h4>Are you sure you wanna do that...?</h4>
<p>Shuffling is permanent, and your head <strong>will</strong> roll if you do this at the wrong time. You might wanna <a href="<?php echo $site_url ?>/print.pdf">save a PDF</a> of the current order first.</p> <p>Shuffling is permanent, and your head <strong>will</strong> roll if you do this at the wrong time. You might wanna <a href="<?php echo $site_url ?>/print.pdf">save a PDF</a> of the current order first.</p>
<a href="<?php echo $site_url ?>/shuffle/confirmed" class="btn btn-success">Yes, I'm positive.</a> <a href="<?php echo $site_url ?>/shuffle/confirmed" class="btn btn-success"><i class="icon-ok icon-white"></i> Yes, I'm positive.</a>
<a href="<?php echo $site_url ?>/" class="btn btn-warning" style="margin-left:16px;">No, please forgive me!</a> <a href="<?php echo $site_url ?>/" class="btn" style="margin-left:16px;"><i class="icon-remove"></i> No, please forgive me!</a>
</div> </div>
<?php } else if(isset($_GET['shuffle']) && isset($_GET['confirmed'])) { <?php } else if(isset($_GET['shuffle']) && isset($_GET['done'])) { ?>
shuffleSpooners();
?>
<div class="alert"> <div class="alert">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<h4>Spooners have been successfully shuffled.</h4> <h4>Spooners have been successfully shuffled.</h4>
@ -103,19 +117,15 @@ if(isset($_GET['shuffle']) && !isset($_GET['confirmed'])) { ?>
<?php <?php
/*********** CLEARING ALL **********/ /*********** CLEARING ALL **********/
if(isset($_GET['clear']) && !isset($_GET['confirmed'])) { ?> if(isset($_GET['clear']) && !isset($_GET['confirmed']) && !isset($_GET['done'])) { ?>
<div class="alert alert-error"> <div class="alert alert-error">
<a type="button" class="close" data-dismiss="alert">&times;</a> <a type="button" class="close" data-dismiss="alert">&times;</a>
<h4>Are you sure you wanna do that...?</h4> <h4>Are you sure you wanna do that...?</h4>
<p>Clearing the list is permanent, and your head <strong>will</strong> roll if you do this at the wrong time. You might wanna <a href="<?php echo $site_url ?>/print.pdf">save a PDF</a> of the current list first.</p> <p>Clearing the list is permanent, and your head <strong>will</strong> roll if you do this at the wrong time. You might wanna <a href="<?php echo $site_url ?>/print.pdf">save a PDF</a> of the current list first.</p>
<a href="<?php echo $site_url ?>/clear/confirmed" class="btn btn-success">Yes, I'm positive.</a> <a href="<?php echo $site_url ?>/clear/confirmed" class="btn btn-success"><i class="icon-ok icon-white"></i> Yes, I'm positive.</a>
<a href="<?php echo $site_url ?>/" class="btn btn-warning" style="margin-left:16px;">No, please forgive me!</a> <a href="<?php echo $site_url ?>/" class="btn" style="margin-left:16px;"><i class="icon-remove"></i> No, please forgive me!</a>
</div> </div>
<?php } else if(isset($_GET['clear']) && isset($_GET['confirmed'])) { <?php } else if(isset($_GET['clear']) && isset($_GET['done'])) { ?>
mysql_query("TRUNCATE spooners");
?>
<div class="alert"> <div class="alert">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<h4>All spooners have been successfully deleted.</h4> <h4>All spooners have been successfully deleted.</h4>

15
init.php Normal file
View File

@ -0,0 +1,15 @@
<?php
include_once('config.php'); // these have probably all been included already, but just in case...
include_once('functions.php');
include_once('db_connect.php');
if(!$initialized) {
session_start();
if(!isset($_SESSION['logged_in']) || $_SESSION['logged_in'] == FALSE) {
header("Location:" . $site_url . "/login");
die();
}
$initialized = TRUE;
}
?>