From cce7d93023325685ae46416ab30873165771e8e7 Mon Sep 17 00:00:00 2001
From: Armanveer Gill <contact@science-ation.ca>
Date: Wed, 18 Dec 2024 14:27:47 -0500
Subject: [PATCH] Fix usage of get_value_from_array

---
 admin/cms.php                        |  2 +-
 admin/committees.php                 |  4 ++--
 admin/donors.php                     |  2 +-
 admin/fair_stats.php                 |  2 +-
 admin/fundraising.php                |  2 +-
 admin/registration_receivedforms.php |  6 +++---
 admin/schools.php                    | 22 +++++++++++-----------
 admin/user_list.php                  |  6 +++---
 config/backuprestore.php             |  2 +-
 config/categories.php                | 18 +++++++++---------
 config/dates.php                     |  2 +-
 config/divisions.php                 | 16 ++++++++--------
 config/images.php                    |  4 ++--
 config/languagepacks.php             |  4 ++--
 config/rolloverfiscal.php            |  2 +-
 config/signaturepage.php             |  2 +-
 config/subdivisions.php              | 18 +++++++++---------
 config/versionchecker.php            |  2 +-
 config_editor.inc.php                |  2 +-
 user.inc.php                         |  6 ++++--
 20 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/admin/cms.php b/admin/cms.php
index ecd787f..3076762 100644
--- a/admin/cms.php
+++ b/admin/cms.php
@@ -36,7 +36,7 @@
             "website_content_management"
 			);
 
- if(get_value_from_array($_POST, 'action',"save"))
+ if(get_value_from_array($_POST, 'action')=="save")
  {
 	 $err=false;
 	foreach($config['languages'] AS $lang=>$langname) {
diff --git a/admin/committees.php b/admin/committees.php
index 317c5c3..ef3ab54 100644
--- a/admin/committees.php
+++ b/admin/committees.php
@@ -172,7 +172,7 @@ if(get_value_from_array($_POST,'committees_id') && get_value_from_array($_POST,'
 
 }
 
-if(get_value_from_array($_POST, 'action', "assign"))
+if(get_value_from_array($_POST, 'action')=="assign")
 {
 	if(get_value_from_array($_POST, 'committees_id') && get_vaue_from_array($_POST,'users_uid')) {
 		$cid = intval($_POST['committees_id']);
@@ -199,7 +199,7 @@ if(get_value_from_array($_GET, 'deletecommittee')) {
 	echo happy(i18n("Committee removed"));
 }
 
-if(get_value_from_array($_POST, 'action',"remove")) {
+if(get_value_from_array($_POST, 'action')=="remove") {
 	/* user_delete takes care of unlinking the user in other tables */
 	user_delete($uid, 'committee');
 	echo happy(i18n("Committee member deleted"));
diff --git a/admin/donors.php b/admin/donors.php
index d49620f..888fbda 100644
--- a/admin/donors.php
+++ b/admin/donors.php
@@ -1293,7 +1293,7 @@ echo "<hr />";
 </div>
 <?
 
-if(get_value_from_array($_GET,'action',"add")) {
+if(get_value_from_array($_GET,'action')=="add") {
 ?>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/admin/fair_stats.php b/admin/fair_stats.php
index cdbe5f3..26cebbd 100644
--- a/admin/fair_stats.php
+++ b/admin/fair_stats.php
@@ -30,7 +30,7 @@
  require_once('curl.inc.php');
 
  /* Hack so we can jump right to YSC stats */
- if(get_value_from_array($_GET,'abbrv','YSC')) {
+ if(get_value_from_array($_GET,'abbrv')=='YSC') {
  	$q = $pdo->prepare("SELECT id FROM fairs WHERE abbrv='YSC'");
 	$q->execute();
 	$r = $q->fetch(PDO::FETCH_ASSOC);
diff --git a/admin/fundraising.php b/admin/fundraising.php
index 9bbdbac..616a6f7 100644
--- a/admin/fundraising.php
+++ b/admin/fundraising.php
@@ -26,7 +26,7 @@
 
  user_auth_required('committee', 'admin');
 
-if(get_value_from_array($_GET,'action',"refresh")) {
+if(get_value_from_array($_GET,'action') == "refresh") {
 ?>
 
 <h3><?=i18n("Fundraising Purposes and Progress Year to Date")?></h3>
diff --git a/admin/registration_receivedforms.php b/admin/registration_receivedforms.php
index ff4cd57..9e01f60 100644
--- a/admin/registration_receivedforms.php
+++ b/admin/registration_receivedforms.php
@@ -209,7 +209,7 @@ echo $pdo->errorInfo();
  	
 
  }
- else if((get_value_from_array($_POST,'action',"receivedyes") || get_value_from_array($_POST,'action',"receivedyesnocash")) && get_value_from_array($_POST, 'registration_number')) {
+ else if((get_value_from_array($_POST,'action') =="receivedyes" || get_value_from_array($_POST,'action') == "receivedyesnocash") && get_value_from_array($_POST, 'registration_number')) {
  	
 	$regnum = intval($_POST['registration_number']);
  	$checkNumQuery=$pdo->prepare("SELECT projectnumber
@@ -285,12 +285,12 @@ echo $pdo->errorInfo();
  		echo happy(i18n("Registration of form %1 marked as payment pending",array($regnum)));
  	}
  }
- else if(get_value_from_array($_POST, 'action',"receivedno") && get_value_from_array($_POST, 'registration_number'))
+ else if(get_value_from_array($_POST, 'action') == "receivedno" && get_value_from_array($_POST, 'registration_number'))
  {
  	echo notice(i18n("Registration of form %1 cancelled",array($_POST['registration_number'])));
 
  }
- else if(get_value_from_array($_GET,'action',"unregister") && get_value_from_array($_GET, 'registration_number')) {
+ else if(get_value_from_array($_GET,'action') == "unregister" && get_value_from_array($_GET, 'registration_number')) {
  	$reg_num=intval(trim($_GET['registration_number']));
  	$q=$pdo-prepare("SELECT registrations.id AS reg_id, projects.id AS proj_id FROM projects,registrations WHERE projects.registrations_id=registrations.id AND registrations.year='{$config['FAIRYEAR']}' AND registrations.num='$reg_num'");
 	$q->execute();
diff --git a/admin/schools.php b/admin/schools.php
index 5c3aaec..39e1673 100644
--- a/admin/schools.php
+++ b/admin/schools.php
@@ -27,9 +27,9 @@
  user_auth_required('committee', 'admin');
 
 
-	if(get_value_from_array($_POST,'save',"edit") || get_value_from_array($_POST,'save',"add"))
+	if(get_value_from_array($_POST,'save') == "edit" || get_value_from_array($_POST,'save') == "add")
 	{
-		if(get_value_from_array($_POST,'save',"add"))
+		if(get_value_from_array($_POST,'save') == "add")
 		{
 			$q=$pdo->prepare("INSERT INTO schools (year) VALUES ('".$config['FAIRYEAR']."')");
 			$q->execute();
@@ -148,27 +148,27 @@
 		$stmt->execute();
 		show_pdo_errors_if_any($pdo);
 
-		if(get_value_from_array($_POST,'save',"add"))
+		if(get_value_from_array($_POST,'save') == "add")
 			$notice = 'added';
 		else
 			$notice = 'saved';
 	}
 
-	if(get_value_from_array($_GET,'action',"delete") && get_value_from_array($_GET, 'delete', ''))
+	if(get_value_from_array($_GET,'action') == "delete" && get_value_from_array($_GET, 'delete', ''))
 	{
 		$stmt = $pdo->prepare("DELETE FROM schools WHERE id='".$_GET['delete']."'");
 		$stmt->execute();
 		$notice = 'deleted';
 	}
 
-	if(get_value_from_array($_GET,'action',"clearaccesscodes"))
+	if(get_value_from_array($_GET,'action') == "clearaccesscodes")
 	{
 		$stmt = $pdo->prepare("UPDATE schools SET accesscode=NULL WHERE year='{$config['FAIRYEAR']}'");
 		$stmt->execute();
 		$notice = 'clearaccess';
 	}
 
-	if(get_value_from_array($_GET,'action',"makeaccesscodes"))
+	if(get_value_from_array($_GET,'action') == "makeaccesscodes")
 	{
 		$q=$pdo->prepare("SELECT id FROM schools WHERE year='{$config['FAIRYEAR']}' AND (accesscode IS NULL OR accesscode='')");
 		$q->execute();
@@ -182,23 +182,23 @@
 		$notice = 'makeaccess';
 	}
 
-	if(get_value_from_array($_GET,'action',"edit") || get_value_from_array($_GET,'action',"add"))
+	if(get_value_from_array($_GET,'action') == "edit" || get_value_from_array($_GET,'action') == "add")
 	{
 
- 		send_header(get_value_from_array($_GET, 'action', 'edit') ? "Edit School" : "Add New School",
+ 		send_header(get_value_from_array($_GET, 'action') == 'edit' ? "Edit School" : "Add New School",
  		array('Committee Main' => 'committee_main.php',
 			'Administration' => 'admin/index.php',
 			'School Management' => 'admin/schools.php'),
             "schools_management"
 				);
-		if(get_value_from_array($_GET,'action',"edit"))
+		if(get_value_from_array($_GET,'action') == "edit")
 		{
 			$buttontext="Save School";
 			$q=$pdo->prepare("SELECT * FROM schools WHERE id='".get_value_from_array($_GET, 'edit', '')."'");
 			$q->execute();
 			$r=$q->fetch(PDO::FETCH_OBJ);
 		}
-		else if(get_value_from_array($_GET, 'action',"add"))
+		else if(get_value_from_array($_GET, 'action') == "add")
 		{
 			$buttontext="Add School";
 		}
@@ -207,7 +207,7 @@
 		echo "<form method=\"post\" action=\"schools.php\">\n";
 		echo "<input type=\"hidden\" name=\"save\" value=\"".get_value_from_array($_GET, 'action')."\">\n";
 
-		if(get_value_from_array($_GET,'action',"edit"))
+		if(get_value_from_array($_GET,'action') == "edit")
 			echo "<input type=\"hidden\" name=\"id\" value=\"".get_value_from_array($_GET,'edit', '')."\">\n";
 
 		echo "<table>\n";
diff --git a/admin/user_list.php b/admin/user_list.php
index 633ff9e..f3d2b75 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -37,12 +37,12 @@
  $show_types = $_GET['show_types'];
  if(user_valid_type($show_types) == false) $show_types = array('judge');
 
- $show_complete = (get_value_from_array($_GET,'show_complete','yes')) ? 'yes' : 'no';
- $show_year = get_value_from_array($_GET,'show_year','current') ? 'current' : 'all';
+ $show_complete = (get_value_from_array($_GET,'show_complete') == 'yes') ? 'yes' : 'no';
+ $show_year = get_value_from_array($_GET,'show_year') == 'current' ? 'current' : 'all';
 
  $uid = intval(get_value_from_array($_GET,'uid'));
 
- if(get_value_from_array($_GET,'action','remove')) {
+ if(get_value_from_array($_GET,'action') == 'remove') {
 	if(!$uid) {
 		echo "Invalid uid for delete";
 		exit;
diff --git a/config/backuprestore.php b/config/backuprestore.php
index 5dea7bd..edbe939 100644
--- a/config/backuprestore.php
+++ b/config/backuprestore.php
@@ -32,7 +32,7 @@ if(!file_exists("../data/backuprestore"))
  	file_put_contents("../data/backuprestore/.htaccess","Order Deny,Allow\r\nDeny From All\r\n");
 
 
-if(get_value_from_array($_GET,'action',"backup")) {
+if(get_value_from_array($_GET,'action') == "backup") {
 $ts=time();
 $dump="#SFIAB SQL BACKUP: ".date("r",$ts)."\n";
 $dump.="#SFIAB VERSION: ".$config['version']."\n";
diff --git a/config/categories.php b/config/categories.php
index 8c3929f..add31ed 100644
--- a/config/categories.php
+++ b/config/categories.php
@@ -27,8 +27,8 @@
  require_once('../helper.inc.php');
  user_auth_required('committee', 'config');
 
- if(get_value_from_array($_GET, 'action',"edit") || get_value_from_array($_GET,'action',"new")) {
- 	send_header((get_value_from_array($_GET, 'action',"edit")) ? 'Edit Category' : 'New Category',
+ if(get_value_from_array($_GET, 'action') == "edit" || get_value_from_array($_GET,'action') == "new") {
+ 	send_header((get_value_from_array($_GET, 'action') == "edit") ? 'Edit Category' : 'New Category',
  		array('Committee Main' => 'committee_main.php',
 			'SFIAB Configuration' => 'config/index.php',
 			'Age Categories' => 'config/categories.php'),"project_age_categories");
@@ -38,7 +38,7 @@
 			'SFIAB Configuration' => 'config/index.php'),"project_age_categories");
  }
 
- if(get_value_from_array($_POST, 'action', "edit"))
+ if(get_value_from_array($_POST, 'action') == "edit")
  {
  	//ues isset($_POST['mingrade']) instead of just $_POST['mingrade'] to allow entering 0 for kindergarden
  	if(get_value_from_array($_POST, 'id') && get_value_from_array($_POST, 'category') && isset($_POST['mingrade']) && $_POST['maxgrade'])
@@ -69,7 +69,7 @@
 	}
  }
 
- if(get_value_from_array($_POST, 'action', "new"))
+ if(get_value_from_array($_POST, 'action') == "new")
  {
  	//ues isset($_POST['mingrade']) instead of just $_POST['mingrade'] to allow entering 0 for kindergarden
  	if(get_value_from_array($_POST, 'id') && $_POST['category'] && isset($_POST['mingrade']) && $_POST['maxgrade'])
@@ -100,7 +100,7 @@
 	}
  }
 
- if(get_value_from_array($_GET, 'action',"remove") && get_value_from_array($_GET, 'remove'))
+ if(get_value_from_array($_GET, 'action') == "remove" && get_value_from_array($_GET, 'remove'))
  {
  	//###### Feature Specific - filtering divisions by category - not conditional, cause even if they have the filtering turned off..if any links
 	//for this division exist they should be deleted
@@ -114,7 +114,7 @@
 
  echo "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 
- if(! get_value_from_array($_GET, 'action', "edit" ) || get_value_from_array($_GET, 'action',"new") )
+ if(! get_value_from_array($_GET, 'action') == "edit"  || get_value_from_array($_GET, 'action') == "new") 
 	echo "<a href=\"".$_SERVER['PHP_SELF']."?action=new\">".i18n("Add new age category")."</a>\n";
 
  echo "<table class=\"summarytable\">";
@@ -127,10 +127,10 @@
  echo "<th>".i18n("Actions")."</th>\n";
  echo "</tr>";
 
- if(get_value_from_array($_GET, 'action', "edit") || get_value_from_array($_GET, 'action', "new"))
+ if(get_value_from_array($_GET, 'action') == "edit") || get_value_from_array($_GET, 'action') == "new")
  {
  	echo "<input type=\"hidden\" name=\"action\" value=\"".get_value_from_array($_GET,'action')."\">\n";	
- 	if(get_value_from_array($_GET,'action',"edit"))
+ 	if(get_value_from_array($_GET,'action') == "edit")
 	{
  		echo "<input type=\"hidden\" name=\"saveid\" value=\"".get_value_from_array($_GET, 'edit')."\">\n";	
 		$q=$pdo->prepare("SELECT * FROM projectcategories WHERE id='".get_value_from_array($_GET, 'edit')."' AND year='".$config['FAIRYEAR']."'");
@@ -138,7 +138,7 @@
 		$categoryr=$q->fetch(PDO::FETCH_OBJ);
 		$buttontext="Save";
 	}
-	else if(get_value_from_array($_GET,'action',"new"))
+	else if(get_value_from_array($_GET,'action') == "new")
 	{
 		$buttontext="Add";
 	}
diff --git a/config/dates.php b/config/dates.php
index c534750..ba6304c 100644
--- a/config/dates.php
+++ b/config/dates.php
@@ -50,7 +50,7 @@ $(document).ready(function() {
 
 $error_ids = array();
 
- if(get_value_from_array($_POST, 'action', "save")) {
+ if(get_value_from_array($_POST, 'action') == "save") {
  	if($_POST['savedates']) {
 		foreach($_POST['savedates'] as $key=>$val) {
             //put the date and time back together
diff --git a/config/divisions.php b/config/divisions.php
index db956d6..8409325 100644
--- a/config/divisions.php
+++ b/config/divisions.php
@@ -27,8 +27,8 @@
  require_once('../helper.inc.php');
  user_auth_required('committee', 'config');
 
-if(get_value_from_array($_GET, 'action',"edit") || get_value_from_array($_GET,'action',"new")) {
-	send_header(get_value_from_array($_GET,'action',"edit") ? "Edit Division" : "New Division",
+if(get_value_from_array($_GET, 'action') == "edit" || get_value_from_array($_GET,'action') == "new") {
+	send_header(get_value_from_array($_GET,'action') == "edit" ? "Edit Division" : "New Division",
 			array('Committee Main' => 'committee_main.php',
 				'SFIAB Configuration' => 'config/index.php',
 				'Project Divisions' => 'config/divisions.php'),
@@ -41,7 +41,7 @@ if(get_value_from_array($_GET, 'action',"edit") || get_value_from_array($_GET,'a
  }
 
  
- if(get_value_from_array($_POST,'action',"edit"))
+ if(get_value_from_array($_POST,'action') == "edit")
  {
  	if(get_value_from_array($_POST, 'id') && get_value_from_array($_POST, 'division' ))
 	{
@@ -87,7 +87,7 @@ if(get_value_from_array($_GET, 'action',"edit") || get_value_from_array($_GET,'a
 	}
  }
 
- if(get_value_from_array($_POST, 'action',"new"))
+ if(get_value_from_array($_POST, 'action') == "new")
  {
  	if(get_value_from_array($_POST, 'id') && get_value_from_array($_POST, 'division'))
 	{
@@ -126,7 +126,7 @@ if(get_value_from_array($_GET, 'action',"edit") || get_value_from_array($_GET,'a
 	}
  }
 
- if(get_value_from_array($_GET,'action',"remove") && get_value_from_array($_GET, 'remove'))
+ if(get_value_from_array($_GET,'action') == "remove") && get_value_from_array($_GET, 'remove'))
  {
  	//###### Feature Specific - filtering divisions by category - not conditional, cause even if they have the filtering turned off..if any links
 	//for this division exist they should be deleted
@@ -139,7 +139,7 @@ if(get_value_from_array($_GET, 'action',"edit") || get_value_from_array($_GET,'a
 
  echo "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 
- if(! get_value_from_array($_GET, 'action',"edit") || get_value_from_array($_GET,'action',"new") )
+ if(! get_value_from_array($_GET, 'action') == "edit"|| get_value_from_array($_GET,'action') == "new") 
 	echo "<a href=\"".$_SERVER['PHP_SELF']."?action=new\">".i18n("Add new division")."</a>\n";
 
  echo "<table class=\"summarytable\">";
@@ -154,10 +154,10 @@ if(get_value_from_array($_GET, 'action',"edit") || get_value_from_array($_GET,'a
  echo "<th>".i18n("Actions")."</th>\n";
  echo "</tr>";
 
- if(get_value_from_array($_GET, 'action', "edit") ||get_value_from_array( $_GET,'action',"new"))
+ if(get_value_from_array($_GET, 'action') == "edit" ||get_value_from_array( $_GET,'action') == "new")
  {
  	echo "<input type=\"hidden\" name=\"action\" value=\"".get_value_from_array($_GET, 'action')."\">\n";	
- 	if(get_value_from_array($_GET,'action',"edit"))
+ 	if(get_value_from_array($_GET,'action') == "edit")
 	{
  		echo "<input type=\"hidden\" name=\"saveid\" value=\"".get_value_from_array($_GET,'edit')."\">\n";	
 		$q=$pdo->prepare("SELECT * FROM projectdivisions WHERE id='".get_value_from_array($_GET,'edit')."' AND year='".$config['FAIRYEAR']."'");
diff --git a/config/images.php b/config/images.php
index c9fdcfc..272d6ab 100644
--- a/config/images.php
+++ b/config/images.php
@@ -30,7 +30,7 @@ send_header("Fair Logo Image",
 			'SFIAB Configuration' => 'config/index.php'),
             "images");
 
-if(get_value_from_array($_POST,'action',"addimage")) {
+if(get_value_from_array($_POST,'action') == "addimage") {
 	if($_FILES['image']['error']==UPLOAD_ERR_OK) {
 		//make sure its a JPEG
 		$imagesize=getimagesize($_FILES['image']['tmp_name']);
@@ -96,7 +96,7 @@ if(get_value_from_array($_POST,'action',"addimage")) {
 		echo error(i18n("Error uploading Logo Image").": ".$_FILES['image']['error']);
 }
 
-if(get_value_from_array($_POST,'action',"delimage")) {
+if(get_value_from_array($_POST,'action') == "delimage") {
 	@unlink("../data/logo.gif");
 	@unlink("../data/logo-100.gif");
 	@unlink("../data/logo-200.gif");
diff --git a/config/languagepacks.php b/config/languagepacks.php
index 569e912..76fe8fc 100644
--- a/config/languagepacks.php
+++ b/config/languagepacks.php
@@ -62,7 +62,7 @@
 
  }
 
- if(get_value_from_array($_GET,'action',"check"))
+ if(get_value_from_array($_GET,'action') == "check"))
  {
  	$packs=loadLanguagePacks();
 
@@ -92,7 +92,7 @@
 	}
  }
 
- if(get_value_from_array($_GET,'action',"install") && get_value_from_array($_GET,'install'))
+ if(get_value_from_array($_GET,'action') == "install" && get_value_from_array($_GET,'install'))
  {
  	$packs=loadLanguagePacks();
 	$loaded=0;
diff --git a/config/rolloverfiscal.php b/config/rolloverfiscal.php
index 4d157eb..c10c09d 100644
--- a/config/rolloverfiscal.php
+++ b/config/rolloverfiscal.php
@@ -75,7 +75,7 @@ function draw_body(){
 }
 
 function rolloverfiscalyear($newYear){
-	global $config;
+	global $config, $pdo;
 	$oldYear = $config['FISCALYEAR'];
 	$yearDiff = $newYear - $oldYear;
 
diff --git a/config/signaturepage.php b/config/signaturepage.php
index 3051c2d..1e9c32a 100644
--- a/config/signaturepage.php
+++ b/config/signaturepage.php
@@ -32,7 +32,7 @@
             ,"exhibitor_signature_page"
 			);
 
- if(get_value_from_array($_POST,'action',"save"))
+ if(get_value_from_array($_POST,'action') == "save")
  {
  	if(get_value_from_array($_POST, 'useexhibitordeclaration')) $useex="1"; else $useex="0";
  	if(get_value_from_array($_POST, 'useparentdeclaration')) $usepg="1"; else $usepg="0";
diff --git a/config/subdivisions.php b/config/subdivisions.php
index fd058dc..8f779e9 100644
--- a/config/subdivisions.php
+++ b/config/subdivisions.php
@@ -25,8 +25,8 @@
  require("../common.inc.php");
  require_once("../user.inc.php");
  user_auth_required('committee', 'config');
- if(get_value_from_array($_GET,'action',"edit") || get_value_from_array($_GET,'action',"new")) {
-	 send_header(get_value_from_array($_GET,'action',"edit") ? "Edit Sub-Division" : "New Sub-Division",
+ if(get_value_from_array($_GET,'action') == "edit" || get_value_from_array($_GET,'action') == "new") {
+	 send_header(get_value_from_array($_GET,'action') == "edit" ? "Edit Sub-Division" : "New Sub-Division",
  		array('Committee Main' => 'committee_main.php',
 			'SFIAB Configuration' => 'config/index.php',
 			'Project Sub-Divisions' => 'config/subdivisions.php'),
@@ -38,7 +38,7 @@
             "project_sub_divisions");
  }
 
- if(get_value_from_array($_POST,'action',"edit"))
+ if(get_value_from_array($_POST,'action') == "edit")
  {
  	if(get_value_from_array($_POST,'id' )&& get_value_from_array($_POST,'projectdivisions_id') && get_value_from_array($_POST,'subdivision') )
 	{
@@ -65,7 +65,7 @@
 	}
  }
 
- if(get_value_from_array($_POST,'action',"new"))
+ if(get_value_from_array($_POST,'action') == "new")
  {
  	if(get_value_from_array($_POST, 'projectdivisions_id') && get_value_from_array($_POST,'subdivision'))
 	{
@@ -103,7 +103,7 @@
 	}
  }
 
- if(get_value_from_array($_GET,'action',"remove") && get_value_from_array($_GET,'remove'))
+ if(get_value_from_array($_GET,'action') == "remove") && get_value_from_array($_GET,'remove'))
  {
 	$stmt = $pdo->prepare("DELETE FROM projectsubdivisions WHERE id='".$_GET['remove']."'");
 	$stmt->execute();
@@ -112,7 +112,7 @@
 
  echo "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 
- if(! (get_value_from_array($_GET,'action',"edit") || get_value_from_array($_GET,'action',"new")) )
+ if(! (get_value_from_array($_GET,'action') == "edit" || get_value_from_array($_GET,'action') == "new")) 
 	echo "<a href=\"".$_SERVER['PHP_SELF']."?action=new\">".i18n("Add new sub-division")."</a>\n";
 
  echo "<table class=\"summarytable\">";
@@ -123,10 +123,10 @@
  echo "<th>".i18n("Actions")."</th>\n";
  echo "</tr>";
 
- if(get_value_from_array($_GET,'action',"edit") || get_value_from_array($_GET, 'action',"new"))
+ if(get_value_from_array($_GET,'action') == "edit" || get_value_from_array($_GET, 'action') == "new")
  {
  	echo "<input type=\"hidden\" name=\"action\" value=\"".get_value_from_array($_GET,'action')."\">\n";	
- 	if(get_value_from_array($_GET,'action',"edit"))
+ 	if(get_value_from_array($_GET,'action') == "edit")
 	{
  		echo "<input type=\"hidden\" name=\"saveid\" value=\"".get_value_from_array($_GET, 'edit')."\">\n";	
 		$q=$pdo->prepare("SELECT * FROM projectsubdivisions WHERE id='".get_value_from_array($_GET,'edit')."' AND year='".$config['FAIRYEAR']."'");
@@ -187,7 +187,7 @@ echo $pdo->errorInfo();
 	 }
  }
  echo "</table>";
-if(get_value_from_array($_GET,'action',"new"))
+if(get_value_from_array($_GET,'action') == "new")
 	echo "&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;".i18n("Leave ID field blank to auto-assign next available ID");
  echo "</form>";
 
diff --git a/config/versionchecker.php b/config/versionchecker.php
index f14a3db..84ebcfc 100644
--- a/config/versionchecker.php
+++ b/config/versionchecker.php
@@ -53,7 +53,7 @@
 	return $ret;
  }
 
- if(get_value_from_array($_GET, 'action',"check"))
+ if(get_value_from_array($_GET, 'action') == "check")
  {
  	$v=loadVersions();
 	echo i18n("Newest version available: <b>%1</b> (%2)",array($v['version'],$v['date']));
diff --git a/config_editor.inc.php b/config_editor.inc.php
index dd4bfd1..76a700c 100644
--- a/config_editor.inc.php
+++ b/config_editor.inc.php
@@ -141,7 +141,7 @@ function config_editor_handle_actions($category, $year, $array_name)
 	
 	$config_editor_actions_done = true;
 	$updated = false;
-	if(get_value_from_array($_POST, 'action', "update")) {
+	if(get_value_from_array($_POST, 'action') == "update") {
 		$var = config_editor_parse_from_http_headers($array_name);
 		$varkeys = array_keys($var);
 		foreach($varkeys as $k) {
diff --git a/user.inc.php b/user.inc.php
index cb26e7e..9cc66e7 100644
--- a/user.inc.php
+++ b/user.inc.php
@@ -381,7 +381,8 @@ function user_save_type_list($u, $db, $fields)
 		$stmt->execute();
 		if($pdo->errorInfo()) {
 			show_pdo_errors_if_any($pdo);
-			echo error("Full query: $query");
+			//FIXME Take advantage of this function
+			//echo error("Full query: $query");
 		}
 	}
 }
@@ -584,7 +585,8 @@ function user_delete($u, $type=false)
 
 	if(!is_array($u)) {
 		$u = user_load($u);
-	}  
+	}
+
 	if($type != false) {
 		if(!in_array($type, $u['types'])) {
 			/* Hum, type specified, but the user is not this type,