fix user pictures

glpi-project · Apr 10, 2019 · 78c2f67 · 78c2f67
1 parent e8497df
commit 78c2f67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/front/document.send.php b/front/document.send.php
@@ -65,17 +65,17 @@
       $send = false;
       if (($splitter[0] == "_dumps")
           && Session::haveRight("backup", CREATE)) {
-         $send = true;
+         $send = GLPI_DUMP_DIR . '/' . $splitter[1];
       }
 
       if ($splitter[0] == "_pictures") {
-         if (Document::isImage(GLPI_DOC_DIR."/".$_GET['file'])) {
-            $send = true;
+         if (Document::isImage(GLPI_PICTURE_DIR . '/' . $splitter[1])) {
+            $send = GLPI_PICTURE_DIR . '/' . $splitter[1];
          }
       }
 
-      if ($send && file_exists(GLPI_DOC_DIR."/".$_GET["file"])) {
-         Toolbox::sendFile(GLPI_DOC_DIR."/".$_GET["file"], $splitter[1]);
+      if ($send && file_exists($send)) {
+         Toolbox::sendFile($send, $splitter[1]);
       } else {
          Html::displayErrorAndDie(__('Unauthorized access to this file'), true);
       }

diff --git a/inc/user.class.php b/inc/user.class.php
@@ -733,7 +733,7 @@ function prepareInputForUpdate($input) {
                $extension    = Toolbox::strtolower(array_pop($tmp));
                @mkdir(GLPI_PICTURE_DIR . "/$sub");
                $picture_path = GLPI_PICTURE_DIR  . "/$sub/${filename}.$extension";
-               self::dropPictureFiles($filename.".".$extension);
+               self::dropPictureFiles("$sub/${filename}.$extension");
 
                if (Document::isImage($fullpath)
                    && Document::renameForce($fullpath, $picture_path)) {
@@ -4747,7 +4747,7 @@ static function dropPictureFiles($picture) {
       if (!empty($picture)) {
          // unlink main file
          if (file_exists(GLPI_PICTURE_DIR."/$picture")) {
-            @unlink(GLPI_DOC_DIR."/_pictures/$picture");
+            @unlink(GLPI_PICTURE_DIR."/$picture");
          }
          // unlink Thunmnail
          $tmp = explode(".", $picture);