Remove photos on delete

francoisjacquet · May 1, 2022 · 59d8d02 · 59d8d02
1 parent 9ec77d8
commit 59d8d02
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -70,6 +70,7 @@ Changes in 9.0
 - Fix stored XSS security issue: decode HTML entities from URL in PreparePHP_SELF.fnc.php, thanks to @khanhchauminh
 - Accessibility: add hidden input label using .a11y-hidden class in ReportCardComments.php
 - Two Lists on same page: export only first, no search in Eligibility/Student.php
+- Remove photos on delete in Student.php & User.php, thank to @jo125ker
 
 Changes in 8.9.5
 ----------------

diff --git a/modules/Students/Student.php b/modules/Students/Student.php
@@ -573,6 +573,17 @@
 
 		DBQuery( $delete_sql );
 
+		// Remove photos on delete.
+		$old_photo_files = glob( $StudentPicturesPath . '*/' . $_REQUEST['student_id'] . '.*jpg' );
+
+		foreach ( $old_photo_files as $old_photo_file )
+		{
+			if ( $old_photo_file !== $new_photo_file )
+			{
+				unlink( $old_photo_file );
+			}
+		}
+
 		// Hook.
 		do_action( 'Students/Student.php|delete_student' );
 

diff --git a/modules/Users/User.php b/modules/Users/User.php
@@ -569,6 +569,17 @@
 
 		DBQuery( $delete_sql );
 
+		// Remove photos on delete.
+		$old_photo_files = glob( $UserPicturesPath . UserSyear() . '/' . $_REQUEST['staff_id'] . '.*jpg' );
+
+		foreach ( $old_photo_files as $old_photo_file )
+		{
+			if ( $old_photo_file !== $new_photo_file )
+			{
+				unlink( $old_photo_file );
+			}
+		}
+
 		// Hook.
 		do_action( 'Users/User.php|delete_user' );