Skip to content

Six bug fixes #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JimFriend wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Six bug fixes #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cd262f
Fix for an error occuring when accessing the Register page for the fi…
JimFriend Dec 28, 2013
e290a44
Fix for an error occurring when attempting to register a new user fro…
JimFriend Dec 28, 2013
48f770a
Fixes a mail-related bug when attempting to use a message variable be…
JimFriend Dec 28, 2013
1aeaa9d
Fix for the Login page where you would receive an error if there wasn…
JimFriend Dec 28, 2013
969c5ee
Fix for Login page where you were getting an error if you left the Re…
JimFriend Dec 28, 2013
848afe3
Fixed a missed opening curly brace in an if statement. Not sure if th…
JimFriend Dec 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
$errors = array();
$username = trim($_POST["username"]);
$password = trim($_POST["password"]);
$remember_choice = trim($_POST["remember_me"]);
$remember_choice = !empty( $_POST["remember_me"] ) ? trim( $_POST["remember_me"] ) : 0;

//Perform some validation
//Feel free to edit / change as required
Expand Down Expand Up @@ -74,18 +74,18 @@
$loggedInUser->hash_pw = $userdetails["password"];
$loggedInUser->display_username = $userdetails["username"];
$loggedInUser->clean_username = $userdetails["username_clean"];
$loggedInUser->remember_me = $remember_choice;
$loggedInUser->remember_me_sessid = generateHash(uniqid(rand(), true));
$loggedInUser->remember_me = $remember_choice;
$loggedInUser->remember_me_sessid = generateHash(uniqid(rand(), true));

//Update last sign in
$loggedInUser->updatelast_sign_in();

if($loggedInUser->remember_me == 0)
$_SESSION["userPieUser"] = $loggedInUser;
else if($loggedInUser->remember_me == 1) {
$db->sql_query("INSERT INTO ".$db_table_prefix."sessions VALUES('".time()."', '".serialize($loggedInUser)."', '".$loggedInUser->remember_me_sessid."')");
setcookie("userPieUser", $loggedInUser->remember_me_sessid, time()+parseLength($remember_me_length));
}
if($loggedInUser->remember_me == 0) {
$_SESSION["userPieUser"] = $loggedInUser;
} else if($loggedInUser->remember_me == 1) {
$db->sql_query("INSERT INTO ".$db_table_prefix."sessions VALUES('".time()."', '".serialize($loggedInUser)."', '".$loggedInUser->remember_me_sessid."')");
setcookie("userPieUser", $loggedInUser->remember_me_sessid, time()+parseLength($remember_me_length));
}

//Redirect to user account page
header("Location: index.php");
Expand Down Expand Up @@ -128,12 +128,12 @@
} }
?>

<?php if(($_GET['status']) == "success")
{

echo "<p>Your account was created successfully. Please login.</p>";
<?php

}
if( !empty( $_GET['status'] ) && ( $_GET['status'] ) == "success" ) {
echo "<p>Your account was created successfully. Please login.</p>";
}

?>


Expand Down
6 changes: 5 additions & 1 deletion models/class.mail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ public function sendMail($email,$subject,$msg = NULL)
if($msg == NULL)
$msg = $this->contents;

$message .= $msg;
if( !empty( $message ) ) {
$message .= $msg;
} else {
$message = $msg;
}

$message = wordwrap($message, 70);

Expand Down
5 changes: 5 additions & 0 deletions models/funcs.user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,11 @@ function isUserLoggedIn()
{
global $loggedInUser,$db,$db_table_prefix;

// ensure loggedInUser is not null before attempting to use it
if( empty( $loggedInUser ) ) {
return false;
}

$sql = "SELECT user_id,
password
FROM ".$db_table_prefix."users
Expand Down
14 changes: 9 additions & 5 deletions register.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,15 @@



<div id="success">

<p><?php echo $message ?></p>

</div>
<div id="success"> <?php
if( !empty( $_POST ) ) {
if( count( $errors ) > 0 ) {
errorBlock( $errors );
} else {
echo '<p>' . $message . '</p>';
}
} ?>
</div>

<div id="regbox">
<form name="newUser" action="<?php echo $_SERVER['PHP_SELF'] ?>" method="post">
Expand Down