arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Fixed errors and bugs with school login and school information update.

Browse Source
This commit is contained in:
Armanveer Gill 2025-01-19 22:44:42 -05:00
parent 1739b5dbe6
commit 0b36f20e86
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helper.inc.php
View File

@ -50,6 +50,12 @@ function show_pdo_errors_if_any($pdo)
} }
} }
function check_for_pdo_errors($pdo){
$errorInfo = $pdo->errorInfo();
if ($errorInfo[0] != '00000') return true;
else return false;
}
function add_or_initialize(mixed $ar, mixed $key, mixed $increment = 1, mixed $initial = 0) : mixed { function add_or_initialize(mixed $ar, mixed $key, mixed $increment = 1, mixed $initial = 0) : mixed {
return isset($ar[$key]) ? ($ar[$key] += $increment) : $initial; return isset($ar[$key]) ? ($ar[$key] += $increment) : $initial;
} }

17
schoolaccess.php
View File

@ -2,7 +2,10 @@
require_once('common.inc.php'); require_once('common.inc.php');
require_once('user.inc.php'); require_once('user.inc.php');
if($_POST['schoolid'] && $_POST['accesscode']) $happymsg = null;
$errormsg = null;
if(get_value_from_array($_POST, 'schoolid') && get_value_from_array($_POST, 'accesscode'))
{ {
$q=$pdo->prepare("SELECT * FROM schools WHERE id='".$_POST['schoolid']."' AND accesscode='".$_POST['accesscode']."' AND year='".$config['FAIRYEAR']."'"); $q=$pdo->prepare("SELECT * FROM schools WHERE id='".$_POST['schoolid']."' AND accesscode='".$_POST['accesscode']."' AND year='".$config['FAIRYEAR']."'");
$q->execute(); $q->execute();
@ -18,7 +21,7 @@ if($_POST['schoolid'] && $_POST['accesscode'])
$errormsg="Invalid School ID or Access Code"; $errormsg="Invalid School ID or Access Code";
} }
if($_GET['action']=="logout") if(get_value_from_array($_GET, 'action')=="logout")
{ {
unset($_SESSION['schoolid']); unset($_SESSION['schoolid']);
unset($_SESSION['schoolaccesscode']); unset($_SESSION['schoolaccesscode']);
@ -28,14 +31,14 @@ send_header("School Access");
if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode']) if(get_value_from_array($_SESSION, 'schoolid') && $_SESSION['schoolaccesscode'])
{ {
$q=$pdo->prepare("SELECT * FROM schools WHERE id='".$_SESSION['schoolid']."' AND accesscode='".$_SESSION['schoolaccesscode']."' AND year='".$config['FAIRYEAR']."'"); $q=$pdo->prepare("SELECT * FROM schools WHERE id='".$_SESSION['schoolid']."' AND accesscode='".$_SESSION['schoolaccesscode']."' AND year='".$config['FAIRYEAR']."'");
$q->execute(); $q->execute();
show_pdo_errors_if_any($pdo); show_pdo_errors_if_any($pdo);
$school=$q->fetch(PDO::FETCH_OBJ); $school=$q->fetch(PDO::FETCH_OBJ);
if($school) { if($school) {
if($_POST['action']=="save") { if(get_value_from_array($_POST, 'action')=="save") {
/* Get info about science head */ /* Get info about science head */
$sciencehead_update = ''; $sciencehead_update = '';
@ -81,7 +84,7 @@ if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode'])
$stmt->execute(); $stmt->execute();
show_pdo_errors_if_any($pdo); show_pdo_errors_if_any($pdo);
if($pdo->errorInfo()) if(check_for_pdo_errors($pdo))
echo error(i18n("An Error occured trying to save the school information")); echo error(i18n("An Error occured trying to save the school information"));
else else
echo happy(i18n("School information successfully updated")); echo happy(i18n("School information successfully updated"));
@ -116,11 +119,11 @@ if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode'])
$sh = array(); $sh = array();
$sh_email = ($sh['email'] != '' && $sh['email'][0] != '*') ? $sh['email'] : ''; $sh_email = ($sh['email'] != '' && $sh['email'][0] != '*') ? $sh['email'] : '';
if($_POST['action']=="feedback") if(get_value_from_array($_POST, 'action')=="feedback")
{ {
$body=""; $body="";
$body.=date("r")."\n"; $body.=date("r")."\n";
$body.=$_SERVER['REMOTE_ADDR']." (".$_SERVER['REMOTE_HOST'].")\n"; $body.=get_value_from_array($_SERVER,'REMOTE_ADDR')." (".get_value_from_array($_SERVER, 'REMOTE_HOST').")\n";
$body.="School ID: $school->id\n"; $body.="School ID: $school->id\n";
$body.="School Name: $school->school\n"; $body.="School Name: $school->school\n";
if($sh['name']) $body.="Science Teacher: {$sh['name']}\n"; if($sh['name']) $body.="Science Teacher: {$sh['name']}\n";

4
user_new.php
View File

@ -34,8 +34,8 @@
exit; exit;
} }
$action = $_GET['action']; $action = get_value_from_array($_GET, 'action');
if($action == '') $action = $_POST['action']; if($action == '') $action = get_value_from_array($_POST, 'action');
switch($type) { switch($type) {
case 'volunteer': case 'volunteer':