Merge pull request #1051 from itflow-org/allow-clear-avatar

Allow users to clear their avatar
itflow-org · Sep 12, 2024 · 86f1beb · 86f1beb
2 parents 412eed7 + 80884ba
commit 86f1beb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/post/profile.php b/post/profile.php
@@ -49,10 +49,10 @@
     }
 
     // Check to see if a file is attached
-    if ($_FILES['file']['tmp_name'] != '') {
-        if ($new_file_name = checkFileUpload($_FILES['file'], array('jpg', 'jpeg', 'gif', 'png'))) {
+    if ($_FILES['avatar']['tmp_name'] != '') {
+        if ($new_file_name = checkFileUpload($_FILES['avatar'], array('jpg', 'jpeg', 'gif', 'png'))) {
 
-            $file_tmp_path = $_FILES['file']['tmp_name'];
+            $file_tmp_path = $_FILES['avatar']['tmp_name'];
 
             // directory in which the uploaded file will be moved
             $upload_file_dir = "uploads/users/$session_user_id/";
@@ -66,10 +66,9 @@
             mysqli_query($mysqli,"UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $session_user_id");
 
             // Extended Logging
-            $extended_log_description .= ", profile picture updated";
+            $extended_log_description .= ", avatar updated";
 
-            $_SESSION['alert_message'] = 'File successfully uploaded.';
-        }else{
+        } else {
             $_SESSION['alert_type'] = "error";
             $_SESSION['alert_message'] = 'There was an error moving the file to upload directory. Please make sure the upload directory is writable by web server.';
         }
@@ -90,6 +89,15 @@
     }
 }
 
+if (isset($_GET['clear_your_user_avatar'])) {
+    validateCSRFToken($_GET['csrf_token']);
+
+    mysqli_query($mysqli,"UPDATE users SET user_avatar = NULL WHERE user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Avatar cleared";
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
+
 if (isset($_POST['edit_your_user_password'])) {
 
     // CSRF Check
@@ -199,7 +207,7 @@
 
 }
 
-if(isset($_POST['enable_2fa'])){
+if (isset($_POST['enable_2fa'])){
 
     // CSRF Check
     validateCSRFToken($_POST['csrf_token']);
@@ -220,7 +228,7 @@
 
 }
 
-if(isset($_POST['disable_2fa'])){
+if (isset($_POST['disable_2fa'])){
 
     // CSRF Check
     validateCSRFToken($_POST['csrf_token']);

diff --git a/user_details.php b/user_details.php
@@ -45,7 +45,11 @@
 
             <div class="form-group">
                 <label>Your Avatar</label>
-                <input type="file" class="form-control-file" accept="image/*;capture=camera" name="file">
+                <?php if ($session_avatar) { ?>
+                    <br><a href="post.php?clear_your_user_avatar&csrf_token=<?= $_SESSION['csrf_token'] ?>">Avatar is set, click to clear</a>
+                <?php } else { ?>
+                    <input type="file" class="form-control-file" accept="image/*;capture=camera" name="avatar">
+                <?php } ?>
             </div>
 
             <button type="submit" name="edit_your_user_details" class="btn btn-primary btn-block mt-3"><i class="fas fa-check mr-2"></i>Save</button>