WebSVN – LeadersLinked - Services – Diff – /module/LeadersLinked/src/Library/Storage.php

     public function composePathToFilename($type, $code, $filename)
+    {
         $path = $this->getPathByType($type);
         $path = $path . DIRECTORY_SEPARATOR . $code;
         if (! file_exists($path)) {
-            @mkdir($path, 0775, true);
+            mkdir($path, 0775, true);
+        }
         return $path . DIRECTORY_SEPARATOR . $filename;
+    }
     public function composePathToDirectory($type, $code)
+    {
         $path = $this->getPathByType($type);
         $path = $path . DIRECTORY_SEPARATOR . $code;
         if (! file_exists($path)) {
-            @mkdir($path, 0775, true);
+            mkdir($path, 0775, true);
+        }
         return $path;
+    }
+    /**
-    /**
+     * Private helper to get a presigned URL for an entity's image/cover or its default.
+     *
-     *
+     * @param string $entityType The type of the entity (e.g., self::TYPE_USER).
+     * @param string $entityUuid The UUID of the entity.
+     * @param string|null $imageFilename The filename of the image/cover, if it exists.
-     * @param User $user
+     * @param string $defaultImageMethodName The name of the method in this class to get the full path to the default image.
-     * @return string
+     * @return string The presigned URL.
      */
-    public function getUserImage($user)
+    private function _getProcessedImageOrCoverUrl($entityType, $entityUuid, $imageFilename, $defaultImageMethodName)
     {
-        if ($user->image) {
+        if ($imageFilename) {
-            $remoto = $this->composePathToFilename(self::TYPE_USER, $user->uuid, $user->image);
+            $remoto = $this->composePathToFilename($entityType, $entityUuid, $imageFilename);
             if (file_exists($remoto)) {
                 return $this->getPresignedUrl($remoto);
+            }
+        }
+        // If imageFilename is null/empty, or the specific file doesn't exist, use the default.
+        $defaultFullPath = $this->$defaultImageMethodName();
+        return $this->getPresignedUrl($defaultFullPath);
+    }
+    /**
+     *
+     * @param User $user
-        }
+     * @return string
+     */
+    public function getUserImage($user)
         $remoto = $this->getFullPathImageUserDefault();
-        return $this->getPresignedUrl($remoto);
+        return $this->_getProcessedImageOrCoverUrl(self::TYPE_USER, $user->uuid, $user->image, 'getFullPathImageUserDefault');
+    }
     /**
+     *
      * @param User $user
      * @return string
-     */
-    public function getUserImageForCodeAndFilename($code, $filename)
+     */
-    {
-        if ($filename) {
-            $remoto = $this->composePathToFilename(self::TYPE_USER, $code, $filename);
-            if (file_exists($remoto)) {
-                return $this->getPresignedUrl($remoto);
-            }
     public function getUserImageForCodeAndFilename($code, $filename)
         $remoto = $this->getFullPathImageUserDefault();
-        return $this->getPresignedUrl($remoto);
+        return $this->_getProcessedImageOrCoverUrl(self::TYPE_USER, $code, $filename, 'getFullPathImageUserDefault');
+    }
     /**
+     *
      * @param User $user
      * @param UserProfile $userProfile
-     * @return string
-     */
+     * @return string
-    public function getUserProfileImage($user, $userProfile)
-    {
-        if ($userProfile->image) {
-            $remoto = $this->composePathToFilename(self::TYPE_USER, $user->uuid, $userProfile->image);
-            if (file_exists($remoto)) {
-                return $this->getPresignedUrl($remoto);
-            }
      */
     public function getUserProfileImage($user, $userProfile)
         $remoto = $this->getFullPathImageUserPofileDefault();
-        return $this->getPresignedUrl($remoto);
+        return $this->_getProcessedImageOrCoverUrl(self::TYPE_USER, $user->uuid, $userProfile->image, 'getFullPathImageUserPofileDefault');
+    }
     /**
+     *
      * @param User $user
-     * @param UserProfile $userProfile
-     * @return string
+     * @param UserProfile $userProfile
-     */
-    public function getUserProfileCover($user, $userProfile)
-    {
-        if ($userProfile->cover) {
-            $remoto = $this->composePathToFilename(self::TYPE_USER, $user->uuid, $userProfile->cover);
-            if (file_exists($remoto)) {
-                return $this->getPresignedUrl($remoto);
      * @return string
      */
     public function getUserProfileCover($user, $userProfile)
         $remoto = $this->getFullPathImageUserCoverDefault();
-        return $this->getPresignedUrl($remoto);
+        return $this->_getProcessedImageOrCoverUrl(self::TYPE_USER, $user->uuid, $userProfile->cover, 'getFullPathImageUserCoverDefault');
+    }
     /**
-     *
-     * @param Company $company
+     *
-     * @return string
-     */
-    public function getCompanyImage($company)
-    {
-        if ($company->image) {
-            $remoto = $this->composePathToFilename(self::TYPE_COMPANY, $company->uuid, $company->image);
-            if (file_exists($remoto)) {
-                return $this->getPresignedUrl($remoto);
+     * @param Company $company
      * @return string
      */
     public function getCompanyImage($company)
         $remoto = $this->getFullPathImageCompanyDefault();
-        return $this->getPresignedUrl($remoto);
+        return $this->_getProcessedImageOrCoverUrl(self::TYPE_COMPANY, $company->uuid, $company->image, 'getFullPathImageCompanyDefault');
+    }
     /**
-     *
-     * @param string $code
+     *
-     * @param string $filename
-     * @return string
-     */
-    public function getCompanyImageForCodeAndFilename($code, $filename)
-    {
-        if ($filename) {
-            $remoto = $this->composePathToFilename(self::TYPE_COMPANY, $code, $filename);
-            if (file_exists($remoto)) {
+     * @param string $code
-                return $this->getPresignedUrl($remoto);
+     * @param string $filename
      * @return string
      */
     public function getCompanyImageForCodeAndFilename($code, $filename)
         $remoto = $this->getFullPathImageCompanyDefault();
-        return $this->getPresignedUrl($remoto);
+        return $this->_getProcessedImageOrCoverUrl(self::TYPE_COMPANY, $code, $filename, 'getFullPathImageCompanyDefault');
+    }
-    /**
-     *
-     * @param Company $company
-     * @return string
-     */
-    public function getCompanyCover($company)
-    {
-        if ($company->cover) {
-            $remoto = $this->composePathToFilename(self::TYPE_COMPANY, $company->uuid, $company->cover);
+    /**
             if (file_exists($remoto)) {
-                return $this->getPresignedUrl($remoto);
+     * @param Company $company
      * @return string
      */
     public function getCompanyCover($company)
         $remoto = $this->getFullPathImageCompanyCoverDefault();
-        return $this->getPresignedUrl($remoto);
+        return $this->_getProcessedImageOrCoverUrl(self::TYPE_COMPANY, $company->uuid, $company->cover, 'getFullPathImageCompanyCoverDefault');
-    }
+    }
-    /**
-     *
-     * @param Group $group
-     * @return string
-     */
-    public function getGroupImage($group)
-    {
         if ($group->image) {
-            $remoto = $this->composePathToFilename(self::TYPE_GROUP, $group->uuid, $group->image);
+    /**
             if (file_exists($remoto)) {
-                return $this->getPresignedUrl($remoto);
+     * @param Group $group
      * @return string
      */
     public function getGroupImage($group)
         $remoto = $this->getFullPathImageGroupDefault();
-        return $this->getPresignedUrl($remoto);
+        return $this->_getProcessedImageOrCoverUrl(self::TYPE_GROUP, $group->uuid, $group->image, 'getFullPathImageGroupDefault');
-    }
+    }
-    /**
-     *
-     * @param string $code
-     * @param string $filename
-     * @return string
-     */
-    public function getGroupImageForCodeAndFilename($code, $filename)
-        if ($filename) {
+    /**
             $remoto = $this->composePathToFilename(self::TYPE_COMPANY, $code, $filename);
-            if (file_exists($remoto)) {
+     * @param string $code
-                return $this->getPresignedUrl($remoto);
+     * @param string $filename
      * @return string
      */
     public function getGroupImageForCodeAndFilename($code, $filename)
-        $remoto = $this->getFullPathImageGroupDefault();
-        return $this->getPresignedUrl($remoto);
+    {
-    }
-    /**
-     *
-     * @param Group $group
-     * @return string
-     */
-    public function getGroupCover($group)
+        return $this->_getProcessedImageOrCoverUrl(self::TYPE_COMPANY, $code, $filename, 'getFullPathImageGroupDefault');
+    }
         if ($group->cover) {
-            $remoto = $this->composePathToFilename(self::TYPE_COMPANY, $group->uuid, $group->cover);
+    /**
      * @return string
      */
     public function deleteFile($path, $code, $filename)
+    {
         $remoto = $path . DIRECTORY_SEPARATOR . $code . DIRECTORY_SEPARATOR . $filename;
-        if (file_exists($filename)) {
+        if (file_exists($remoto)) {
-            return @unlink($remoto);
+            return unlink($remoto);
         } else {
             return true;
+        }
+    }
                 if ($object != '.' && $object != '..') {
                     $s = $dir . DIRECTORY_SEPARATOR . $object;
                     if (is_dir($s) && ! is_link($s)) {
                         $this->deleteDirectoryRecursive($s);
                     } else {
-                        @unlink($s);
+                        unlink($s);
+                    }
+                }
+            }
-            @rmdir($dir);
+            rmdir($dir);
+        }
+    }
     /**
      * @param string $local_filename
      * @return boolean
      */
     public function putFile($source_file, $target_file)
+    {
-        return @rename($source_file, $target_file);
+        return rename($source_file, $target_file);
+    }
     /**
+     *
      * @param string $filename
      * @return boolean
      */
     public function moveUploadedFile($source_file, $target_file)
+    {
-        return @move_uploaded_file($source_file, $target_file);
+        return move_uploaded_file($source_file, $target_file);
+    }
     /**
+     *
      * @param string $filename
      * @return boolean
      */
     public function copyFile($source_file, $target_file)
+    {
-        return @copy($source_file, $target_file);
+        return copy($source_file, $target_file);
+    }
             return;
+        }
+    }
+    /**
+     * Creates a new GD image resource with transparency settings for PNG.
+     * @param int $width The width of the new image.
+     * @param int $height The height of the new image.
+     * @return \GdImage|false The image resource or false on failure.
+     */
+    private function _createImageCanvas($width, $height)
+    {
+        $new_image = imageCreateTrueColor($width, $height);
+        if ($new_image === false) {
+            error_log("_createImageCanvas: imageCreateTrueColor failed for dimensions {$width}x{$height}.");
+            return false;
+        }
+        imageAlphaBlending($new_image, False);
+        imageSaveAlpha($new_image, True);
+        $transparent = imageColorAllocateAlpha($new_image, 0, 0, 0, 127);
+        if ($transparent === false) {
+            error_log("_createImageCanvas: imageColorAllocateAlpha failed.");
+            imagedestroy($new_image);
+            return false;
+        }
+        imagefill($new_image, 0, 0, $transparent);
+        return $new_image;
+    }
+    /**
+     * Saves a GD image resource as PNG, unlinks source, and cleans up image resource.
+     * @param \GdImage $imageResource The GD image resource to save.
+     * @param string $targetFilename The path to save the PNG file to.
+     * @param string $sourceFilenameToUnlink The path to the source file to unlink.
+     * @return bool True on success, false on failure.
+     */
+    private function _savePngAndCleanup($imageResource, $targetFilename, $sourceFilenameToUnlink)
+    {
+        $save_success = imagepng($imageResource, $targetFilename);
+        imagedestroy($imageResource); // Clean up the image resource
+        if ($save_success) {
+            if ($sourceFilenameToUnlink && file_exists($sourceFilenameToUnlink)) {
+                unlink($sourceFilenameToUnlink);
+            }
+            return true;
+        } else {
+            error_log("_savePngAndCleanup: imagepng failed to save image to {$targetFilename}.");
+            return false;
+        }
+    }
     /**
+     *
      * @param string $source
      * @param string $target_filename
      * @param number $target_width
      * @param number $target_height
      * @return boolean
      */
     public function uploadImageResize($source_filename, $target_filename, $target_width, $target_height)
-    {
+    {
-        try {
         try {
             $data = file_get_contents($source_filename);
-            $img = imagecreatefromstring($data);
             $img = imagecreatefromstring($data);
-            if ($img) {
-                list($source_width, $source_height) = getimagesize($source_filename);
+            if ($img) {
                 list($source_width, $source_height) = getimagesize($source_filename);
                 $width_ratio = $target_width / $source_width;
                 } else {
                     $resized_height = $target_height;
                     $resized_width = $source_width * $height_ratio;
+                }
                 $resized_width = round($resized_width);
                 $resized_height = round($resized_height);
-                $new_image = imageCreateTrueColor($target_width, $target_height);
+                $new_image = $this->_createImageCanvas($target_width, $target_height);
-                imageAlphaBlending($new_image, False);
+                if ($new_image === false) {
-                imageSaveAlpha($new_image, True);
+                    imagedestroy($img);
-                $transparent = imageColorAllocateAlpha($new_image, 0, 0, 0, 127);
+                    unlink($source_filename);
-                imagefill($new_image, 0, 0, $transparent);
+                    return false;
-                imageCopyResampled($new_image, $img, 0, 0, 0, 0, $resized_width, $resized_height, $source_width, $source_height);
+                }
-                imagepng($new_image, $target_filename);
+                imageCopyResampled($new_image, $img, 0, 0, 0, 0, $resized_width, $resized_height, $source_width, $source_height);
+                imagedestroy($img); // Source image resource can be destroyed after resampling
                 // @unlink($source_filename); // Temporarily commented out for debugging
-                return true;
+                return $this->_savePngAndCleanup($new_image, $target_filename, $source_filename);
-            }
+            }
+            unlink($source_filename);
+            return false;
+        } catch (\Throwable $e) {
+            error_log($e->getTraceAsString());
-            // @unlink($source_filename); // Temporarily commented out for debugging
+            if (isset($img) && ($img instanceof \GdImage || is_resource($img))) {
-            return false;
+                imagedestroy($img);
+            }
+            if (isset($new_image) && ($new_image instanceof \GdImage || is_resource($new_image))) {
-        } catch (\Throwable $e) {
+                imagedestroy($new_image);
             error_log('Error in uploadImageResize: ' . $e->getMessage() . ' at ' . $e->getFile() . ':' . $e->getLine()); // More detailed log
-            error_log($e->getTraceAsString());
+            if (isset($source_filename) && file_exists($source_filename)) {
      * @return boolean
      */
     public function uploadImageCrop($source_filename, $target_filename, $target_width, $target_height)
-    {
+    {
-        try {
         try {
             $data = file_get_contents($source_filename);
-            $img = imagecreatefromstring($data);
             $img = imagecreatefromstring($data);
             if ($img) {
                 list($source_width, $source_height) = getimagesize($source_filename);
                 } else {
                     $resized_height = $target_height;
                     $resized_width = $source_width * $height_ratio;
+                }
                 $resized_width = round($resized_width);
                 $resized_height = round($resized_height);
+                $offset_width = round(($target_width - $resized_width) / 2);
+                $offset_height = round(($target_height - $resized_height) / 2);
+                $new_image = $this->_createImageCanvas($target_width, $target_height);
+                if ($new_image === false) {
+                    imagedestroy($img);
-                $offset_width = round(($target_width - $resized_width) / 2);
-                $offset_height = round(($target_height - $resized_height) / 2);
-                $new_image = imageCreateTrueColor($target_width, $target_height);
-                imageAlphaBlending($new_image, False);
+                    unlink($source_filename);
+                    return false;
-                imageSaveAlpha($new_image, True);
+                }
-                $transparent = imageColorAllocateAlpha($new_image, 0, 0, 0, 127);
-                imagefill($new_image, 0, 0, $transparent);
-                imageCopyResampled($new_image, $img, $offset_width, $offset_height, 0, 0, $resized_width, $resized_height, $source_width, $source_height);
-                imagepng($new_image, $target_filename);
+                imageCopyResampled($new_image, $img, $offset_width, $offset_height, 0, 0, $resized_width, $resized_height, $source_width, $source_height);
                 imagedestroy($img);
                 @unlink($source_filename);
-                return true;
+                return $this->_savePngAndCleanup($new_image, $target_filename, $source_filename);
+            }
+            unlink($source_filename);
+            return false;
+        } catch (\Throwable $e) {
-            }
+            error_log($e->getTraceAsString());
+            if (isset($img) && ($img instanceof \GdImage || is_resource($img))) {
+                imagedestroy($img);
+            }
-            @unlink($source_filename);
+            if (isset($new_image) && ($new_image instanceof \GdImage || is_resource($new_image))) {
-            return false;
+                imagedestroy($new_image);
         } catch (\Throwable $e) {
-            error_log($e->getTraceAsString());
+            if (isset($source_filename) && file_exists($source_filename)) {
      * @param string $target_filename
      * @return boolean
      */
     public function uploadImageWithOutChangeSize($source_filename, $target_filename)
+    {
         try {
             $data = file_get_contents($source_filename);
             $img = imagecreatefromstring($data);
             if ($img) {
                 list($source_width, $source_height) = getimagesize($source_filename);
-                $new_image = imageCreateTrueColor($source_width, $source_height);
+                $new_image = $this->_createImageCanvas($source_width, $source_height);
-                imageAlphaBlending($new_image, False);
+                if ($new_image === false) {
-                imageSaveAlpha($new_image, True);
+                    imagedestroy($img);
+                    unlink($source_filename);
+                    return false;
                 $transparent = imageColorAllocateAlpha($new_image, 0, 0, 0, 127);
-                imagefill($new_image, 0, 0, $transparent);
                 imageCopyResampled($new_image, $img, 0, 0, 0, 0, $source_width, $source_height, $source_width, $source_height);
-                imagepng($new_image, $target_filename);
                 imagedestroy($img);
-                @unlink($source_filename);
-                return true;
+                return $this->_savePngAndCleanup($new_image, $target_filename, $source_filename);
+            }
+            unlink($source_filename);
+            return false;
+        } catch (\Throwable $e) {
+            error_log($e->getTraceAsString());
+            if (isset($img) && ($img instanceof \GdImage || is_resource($img))) {
-            @unlink($source_filename);
+                imagedestroy($img);
+            }
-            return false;
+            if (isset($new_image) && ($new_image instanceof \GdImage || is_resource($new_image))) {
+                imagedestroy($new_image);
         } catch (\Throwable $e) {
-            error_log($e->getTraceAsString());
+            if (isset($source_filename) && file_exists($source_filename)) {
                 unlink($source_filename);
             @unlink($source_filename);

Proyectos de Subversion LeadersLinked - Services

(root)/module/LeadersLinked/src/Library/Storage.php – Rev 552 → 553