From 6c9b2ec0639f91bbca71c7b422a4840570e4e5cd Mon Sep 17 00:00:00 2001
From: Armanveer Gill <contact@science-ation.ca>
Date: Wed, 1 Jan 2025 17:23:20 -0500
Subject: [PATCH] Resolved the issue of warnings showing up when trying to add
 a new shool under school management.

---
 .gitignore                        |   1 +
 admin/registration_webconsent.php |  56 ++++++++++++++++--------------
 admin/schools.php                 |  25 +++++++++++--
 data/logo-100.png                 | Bin 17224 -> 17224 bytes
 data/logo-200.png                 | Bin 50642 -> 50642 bytes
 data/logo-500.png                 | Bin 196587 -> 196587 bytes
 data/logo.png                     | Bin 82632 -> 82632 bytes
 7 files changed, 53 insertions(+), 29 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..adbb97d2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+data/
\ No newline at end of file
diff --git a/admin/registration_webconsent.php b/admin/registration_webconsent.php
index 2be6a613..491f2f54 100644
--- a/admin/registration_webconsent.php
+++ b/admin/registration_webconsent.php
@@ -45,20 +45,24 @@
 			$webfirst=get_value_from_2d_array($_POST,'webfirst', $id)=="yes"?"yes":"no";
 			$weblast=get_value_from_2d_array($_POST, 'weblast', $id)=="yes"?"yes":"no";
 			$webphoto=get_value_from_2d_array($_POST, 'webphoto', $id)=="yes"?"yes":"no";
+
 			$stmt = $pdo->prepare("UPDATE students SET 
 					webfirst='$webfirst',
 					weblast='$weblast',
 					webphoto='$webphoto'
 					WHERE
 					id='$id'");
+			$stmt->execute();
 		}
 	}
- 	if($numchanged==1)
+
+ 	if($numchanged==1) {
 		echo happy(i18n("1 student record updated"));
-	else if($numchanged>1)
+	} else if($numchanged>1) {
 		echo happy(i18n("%1 student records updated",array($numchanged)));
-	else
+	} else {
 		echo error(i18n("No student records where changed"));
+	}
 }
  ?>
  <script type="text/javascript">
@@ -71,28 +75,28 @@
 
  <?
 
-		$sq=$pdo->prepare("SELECT students.firstname,
-					students.lastname,
-					students.id,
-					projects.projectnumber,
-					students.webfirst,
-					students.weblast,
-					students.webphoto
-				FROM
-					students,
-					registrations,
-					projects
-				WHERE
-				 	students.registrations_id=registrations.id
-				AND	( registrations.status = 'complete' OR registrations.status='paymentpending' )
-				AND	projects.registrations_id=registrations.id
-				AND 	registrations.year='".$config['FAIRYEAR']."' 
-				AND 	projects.year='".$config['FAIRYEAR']."' 
-				AND 	students.year='".$config['FAIRYEAR']."' 
-				ORDER BY projectnumber
-				");
-		$sq->execute();
-		show_pdo_errors_if_any($pdo);
+	$sq=$pdo->prepare("SELECT students.firstname,
+				students.lastname,
+				students.id,
+				projects.projectnumber,
+				students.webfirst,
+				students.weblast,
+				students.webphoto
+			FROM
+				students,
+				registrations,
+				projects
+			WHERE
+				students.registrations_id=registrations.id
+			AND	( registrations.status = 'complete' OR registrations.status='paymentpending' )
+			AND	projects.registrations_id=registrations.id
+			AND 	registrations.year='".$config['FAIRYEAR']."' 
+			AND 	projects.year='".$config['FAIRYEAR']."' 
+			AND 	students.year='".$config['FAIRYEAR']."' 
+			ORDER BY projectnumber
+			");
+	$sq->execute();
+	show_pdo_errors_if_any($pdo);
 
 	echo "<form method=\"post\" action=\"registration_webconsent.php\">";
 	echo "<table class=\"tableview\">";
@@ -121,5 +125,5 @@
 	echo "<input type=\"submit\" value=\"".i18n("Save Changes")."\">";
 	echo "</form>";
 
- send_footer();
+ 	send_footer();
 ?>
diff --git a/admin/schools.php b/admin/schools.php
index 88ce4302..892fb73a 100644
--- a/admin/schools.php
+++ b/admin/schools.php
@@ -54,10 +54,21 @@
 
 		$principal_update = '';
 		$sciencehead_update = '';
-		list($first, $last) = explode(' ', get_value_from_array($_POST,'principal') ?? '', 2);
+	
+		// list($first, $last)
+		$split =  explode(' ', get_value_from_array($_POST,'principal') ?? '', 2);
+		
+		if(count($split) === 2){
+			list($first, $last) = $split;
+		}
+		else{
+			$first = $split[0];
+			$last = '';
+		}
+		
 		/* Load existing entry if it exists, else make an entry if
 		 * there is data, else, do nothing */
-		if($i['principal_uid'] > 0) 
+		if(get_value_from_array($i, 'principal_uid') > 0) 
 			$pl = user_load_by_uid($i['principal_uid']);
 		else if($first != '' && $last != '') {
 			$pl = user_create('principal', "*$first$last".user_generate_password());
@@ -84,7 +95,15 @@
 
 		/* Get info about science head */
 		// FIX ME
-		list($first, $last) = explode(' ', get_value_from_array($_POST, 'sciencehead', ''), 2);
+		$split =  explode(' ', get_value_from_array($_POST,'principal') ?? '', 2);
+		
+		if(count($split) === 2){
+			list($first, $last) = $split;
+		}
+		else{
+			$first = $split[0];
+			$last = '';
+		}
 		$em = get_value_from_array($_POST,'scienceheademail');
 		if($em == '' && ($first != '' || $last != '')) $em = "*$first$last".user_generate_password();
 		/* Load existing record, or create new if there's something
diff --git a/data/logo-100.png b/data/logo-100.png
index ce6964def576f6ee068ae75d286d9d3940a6ec8c..00bdb209694db8be2ec451a8972ca15518ba4285 100644
GIT binary patch
delta 74
zcmX@n#(1KQaY8k_um-Q|`9#KzP32BPhL%<)23Cef+6D$z1_tL}at2K1c9xez72daH
R;~NGb@O1TaS?83{1OQR?7BK(-

delta 74
zcmX@n#(1KQaY8jaqcGFAgeTiJHkCUG85mj_T3Q(xY8x0>85mSNU3OqHx3jz)sxapc
Rxf%u_@O1TaS?83{1OS|57Ht3k

diff --git a/data/logo-200.png b/data/logo-200.png
index d5f97d9dcefc584513442f020e70567e3ea47a55..156d81cf2c6b73332f0112e841ed89a276673f92 100644
GIT binary patch
delta 74
zcmccA&3vhwc|tY2um-Q|`9#KzO^io{3@xop46F=|v<(cb3=Gb{<P4ZR^{BiYs_?!o
R8{aShfv2mV%Q~loCIEo&7i<6k

delta 74
zcmccA&3vhwc|tWiqcGFAgeTiJHZdL*GBC6<w6roX)HX1%GBBuky6nK@sYm7IP=z^n
R$ki|afv2mV%Q~loCIHJ`7pMRL

diff --git a/data/logo-500.png b/data/logo-500.png
index ba72de399e70c2fbc1446348f706206205723dcd..db46d4a74c24bbbe742935dbe42a2b8b09196e07 100644
GIT binary patch
delta 81
zcmaF;pZoQH?g`cG!Wz7;=Mxzln_8O~w>B|J{TDK{v@$WUGBnaQFt9Q(IRBC}VEVfM
YO!9K5;`_F2e8T_)p00i_>zopr0Itd#Qvd(}

delta 81
zcmaF;pZoQH?g`cGjKWOc5}s^pY-(*{+}gw>^<T)q(8|!#%D_<Dz`)ADpyKJW1Jl?2
YXOfpg73bU`SHl1Vp00i_>zopr00QhAj{pDw

diff --git a/data/logo.png b/data/logo.png
index 70665c40da85dce23c9bbe5d547a2dec9eff761d..f905f52fa8ef56f65aaff77741a1feb2505f081c 100644
GIT binary patch
delta 78
zcmX@n%6g)ebwV|}um-Q|`9#LXrmank-yMYvEv-xptPG8`4GgRd49>sg44B^S#3(O^
VD!y;a#y1Q=;OXk;vd$@?2>{>~7(xI5

delta 78
zcmX@n%6g)ebwV{eqcGFAgeTh?o3=JFes>fyFtjqXv@$T%HZZU<FsOLC?7;MHCq{WW
VRB_H7ay1M<;OXk;vd$@?2>>u(7=8c%