samayo /
bulletproof
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | */ |
| 10 | 10 | namespace Bulletproof; |
| 11 | 11 | |
| 12 | - function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight){
|
|
| 12 | + function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight) {
|
|
| 13 | 13 | |
| 14 | 14 | switch ($mimeType) {
|
| 15 | 15 | case "jpg": |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | // Can't crop to a bigger size, ex: |
| 38 | 38 | // an image with 100X100 can not be cropped to 200X200. Image can only be cropped to smaller size. |
| 39 | 39 | if ($widthTrim < 0 && $heightTrim < 0) {
|
| 40 | - return ; |
|
| 40 | + return; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | $temp = imagecreatetruecolor($newWidth, $newHeight); |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | namespace Bulletproof; |
| 11 | 11 | |
| 12 | - function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight){
|
|
| 12 | + function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight) { |
|
| 13 | 13 | |
| 14 | 14 | switch ($mimeType) {
|
| 15 | 15 | case "jpg": |
@@ -11,57 +11,57 @@ |
||
| 11 | 11 | |
| 12 | 12 | function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight){
|
| 13 | 13 | |
| 14 | - switch ($mimeType) {
|
|
| 15 | - case "jpg": |
|
| 16 | - case "jpeg": |
|
| 17 | - $imageCreate = imagecreatefromjpeg($image); |
|
| 18 | - break; |
|
| 14 | + switch ($mimeType) {
|
|
| 15 | + case "jpg": |
|
| 16 | + case "jpeg": |
|
| 17 | + $imageCreate = imagecreatefromjpeg($image); |
|
| 18 | + break; |
|
| 19 | 19 | |
| 20 | - case "png": |
|
| 21 | - $imageCreate = imagecreatefrompng($image); |
|
| 22 | - break; |
|
| 20 | + case "png": |
|
| 21 | + $imageCreate = imagecreatefrompng($image); |
|
| 22 | + break; |
|
| 23 | 23 | |
| 24 | - case "gif": |
|
| 25 | - $imageCreate = imagecreatefromgif($image); |
|
| 26 | - break; |
|
| 24 | + case "gif": |
|
| 25 | + $imageCreate = imagecreatefromgif($image); |
|
| 26 | + break; |
|
| 27 | 27 | |
| 28 | - default: |
|
| 29 | - throw new \Exception(" Only gif, jpg, jpeg and png files can be cropped ");
|
|
| 30 | - break; |
|
| 31 | - } |
|
| 28 | + default: |
|
| 29 | + throw new \Exception(" Only gif, jpg, jpeg and png files can be cropped ");
|
|
| 30 | + break; |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - // The image offsets/coordination to crop the image. |
|
| 34 | - $widthTrim = ceil(($imgWidth - $newWidth) / 2); |
|
| 35 | - $heightTrim = ceil(($imgHeight - $newHeight) / 2); |
|
| 33 | + // The image offsets/coordination to crop the image. |
|
| 34 | + $widthTrim = ceil(($imgWidth - $newWidth) / 2); |
|
| 35 | + $heightTrim = ceil(($imgHeight - $newHeight) / 2); |
|
| 36 | 36 | |
| 37 | - // Can't crop to a bigger size, ex: |
|
| 38 | - // an image with 100X100 can not be cropped to 200X200. Image can only be cropped to smaller size. |
|
| 39 | - if ($widthTrim < 0 && $heightTrim < 0) {
|
|
| 40 | - return ; |
|
| 41 | - } |
|
| 37 | + // Can't crop to a bigger size, ex: |
|
| 38 | + // an image with 100X100 can not be cropped to 200X200. Image can only be cropped to smaller size. |
|
| 39 | + if ($widthTrim < 0 && $heightTrim < 0) {
|
|
| 40 | + return ; |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - $temp = imagecreatetruecolor($newWidth, $newHeight); |
|
| 44 | - imageAlphaBlending($temp, false); |
|
| 45 | - imageSaveAlpha($temp, true); |
|
| 46 | - imagecopyresampled( |
|
| 47 | - $temp, |
|
| 48 | - $imageCreate, |
|
| 49 | - 0, |
|
| 50 | - 0, |
|
| 51 | - $widthTrim, |
|
| 52 | - $heightTrim, |
|
| 53 | - $newWidth, |
|
| 54 | - $newHeight, |
|
| 55 | - $newWidth, |
|
| 56 | - $newHeight |
|
| 57 | - ); |
|
| 43 | + $temp = imagecreatetruecolor($newWidth, $newHeight); |
|
| 44 | + imageAlphaBlending($temp, false); |
|
| 45 | + imageSaveAlpha($temp, true); |
|
| 46 | + imagecopyresampled( |
|
| 47 | + $temp, |
|
| 48 | + $imageCreate, |
|
| 49 | + 0, |
|
| 50 | + 0, |
|
| 51 | + $widthTrim, |
|
| 52 | + $heightTrim, |
|
| 53 | + $newWidth, |
|
| 54 | + $newHeight, |
|
| 55 | + $newWidth, |
|
| 56 | + $newHeight |
|
| 57 | + ); |
|
| 58 | 58 | |
| 59 | 59 | |
| 60 | - if (!$temp) {
|
|
| 61 | - throw new \Exception("Failed to crop image. Please pass the right parameters");
|
|
| 62 | - } else {
|
|
| 63 | - imagejpeg($temp, $image); |
|
| 64 | - } |
|
| 60 | + if (!$temp) {
|
|
| 61 | + throw new \Exception("Failed to crop image. Please pass the right parameters");
|
|
| 62 | + } else {
|
|
| 63 | + imagejpeg($temp, $image); |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | 66 | } |
| 67 | 67 | |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | namespace Bulletproof; |
| 11 | 11 | |
| 12 | -function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE){
|
|
| 12 | +function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE) {
|
|
| 13 | 13 | |
| 14 | 14 | // First, calculate the height. |
| 15 | 15 | $height = intval($newWidth / $imgWidth * $imgHeight); |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | namespace Bulletproof; |
| 11 | 11 | |
| 12 | -function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE){
|
|
| 12 | +function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE) { |
|
| 13 | 13 | |
| 14 | 14 | // First, calculate the height. |
| 15 | 15 | $height = intval($newWidth / $imgWidth * $imgHeight); |
@@ -11,79 +11,79 @@ |
||
| 11 | 11 | |
| 12 | 12 | function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE){
|
| 13 | 13 | |
| 14 | - // First, calculate the height. |
|
| 15 | - $height = intval($newWidth / $imgWidth * $imgHeight); |
|
| 14 | + // First, calculate the height. |
|
| 15 | + $height = intval($newWidth / $imgWidth * $imgHeight); |
|
| 16 | 16 | |
| 17 | - // If the height is too large, set it to the maximum height and calculate the width. |
|
| 18 | - if ($height > $newHeight) {
|
|
| 17 | + // If the height is too large, set it to the maximum height and calculate the width. |
|
| 18 | + if ($height > $newHeight) {
|
|
| 19 | 19 | |
| 20 | - $height = $newHeight; |
|
| 21 | - $newWidth = intval($height / $imgHeight * $imgWidth); |
|
| 22 | - } |
|
| 20 | + $height = $newHeight; |
|
| 21 | + $newWidth = intval($height / $imgHeight * $imgWidth); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - // If we don't allow upsizing check if the new width or height are too big. |
|
| 25 | - if (!$upsize) {
|
|
| 26 | - // If the given width is larger then the image height, then resize it. |
|
| 27 | - if ($newWidth > $imgWidth) {
|
|
| 28 | - $newWidth = $imgWidth; |
|
| 29 | - $height = intval($newWidth / $imgWidth * $imgHeight); |
|
| 30 | - } |
|
| 24 | + // If we don't allow upsizing check if the new width or height are too big. |
|
| 25 | + if (!$upsize) {
|
|
| 26 | + // If the given width is larger then the image height, then resize it. |
|
| 27 | + if ($newWidth > $imgWidth) {
|
|
| 28 | + $newWidth = $imgWidth; |
|
| 29 | + $height = intval($newWidth / $imgWidth * $imgHeight); |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | - // If the given height is larger then the image height, then resize it. |
|
| 33 | - if ($height > $imgHeight) {
|
|
| 34 | - $height = $imgHeight; |
|
| 35 | - $newWidth = intval($height / $imgHeight * $imgWidth); |
|
| 36 | - } |
|
| 37 | - } |
|
| 32 | + // If the given height is larger then the image height, then resize it. |
|
| 33 | + if ($height > $imgHeight) {
|
|
| 34 | + $height = $imgHeight; |
|
| 35 | + $newWidth = intval($height / $imgHeight * $imgWidth); |
|
| 36 | + } |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - if ($ratio == true) |
|
| 40 | - {
|
|
| 41 | - $source_aspect_ratio = $imgWidth / $imgHeight; |
|
| 42 | - $thumbnail_aspect_ratio = $newWidth / $newHeight; |
|
| 43 | - if ($imgWidth <= $newWidth && $imgHeight <= $newHeight) {
|
|
| 44 | - $newWidth = $imgWidth; |
|
| 45 | - $newHeight = $imgHeight; |
|
| 46 | - } elseif ($thumbnail_aspect_ratio > $source_aspect_ratio) {
|
|
| 47 | - $newWidth = (int) ($newHeight * $source_aspect_ratio); |
|
| 48 | - $newHeight = $newHeight; |
|
| 49 | - } else {
|
|
| 50 | - $newWidth = $newWidth; |
|
| 51 | - $newHeight = (int) ($newWidth / $source_aspect_ratio); |
|
| 52 | - } |
|
| 53 | - } |
|
| 39 | + if ($ratio == true) |
|
| 40 | + {
|
|
| 41 | + $source_aspect_ratio = $imgWidth / $imgHeight; |
|
| 42 | + $thumbnail_aspect_ratio = $newWidth / $newHeight; |
|
| 43 | + if ($imgWidth <= $newWidth && $imgHeight <= $newHeight) {
|
|
| 44 | + $newWidth = $imgWidth; |
|
| 45 | + $newHeight = $imgHeight; |
|
| 46 | + } elseif ($thumbnail_aspect_ratio > $source_aspect_ratio) {
|
|
| 47 | + $newWidth = (int) ($newHeight * $source_aspect_ratio); |
|
| 48 | + $newHeight = $newHeight; |
|
| 49 | + } else {
|
|
| 50 | + $newWidth = $newWidth; |
|
| 51 | + $newHeight = (int) ($newWidth / $source_aspect_ratio); |
|
| 52 | + } |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - $imgString = file_get_contents($image); |
|
| 55 | + $imgString = file_get_contents($image); |
|
| 56 | 56 | |
| 57 | - $imageFromString = imagecreatefromstring($imgString); |
|
| 58 | - $tmp = imagecreatetruecolor($newWidth, $newHeight); |
|
| 59 | - imagecopyresampled( |
|
| 60 | - $tmp, |
|
| 61 | - $imageFromString, |
|
| 62 | - 0, |
|
| 63 | - 0, |
|
| 64 | - 0, |
|
| 65 | - 0, |
|
| 66 | - $newWidth, |
|
| 67 | - $newHeight, |
|
| 68 | - $imgWidth, |
|
| 69 | - $imgHeight |
|
| 70 | - ); |
|
| 57 | + $imageFromString = imagecreatefromstring($imgString); |
|
| 58 | + $tmp = imagecreatetruecolor($newWidth, $newHeight); |
|
| 59 | + imagecopyresampled( |
|
| 60 | + $tmp, |
|
| 61 | + $imageFromString, |
|
| 62 | + 0, |
|
| 63 | + 0, |
|
| 64 | + 0, |
|
| 65 | + 0, |
|
| 66 | + $newWidth, |
|
| 67 | + $newHeight, |
|
| 68 | + $imgWidth, |
|
| 69 | + $imgHeight |
|
| 70 | + ); |
|
| 71 | 71 | |
| 72 | - switch ($mimeType) {
|
|
| 73 | - case "jpeg": |
|
| 74 | - case "jpg": |
|
| 75 | - imagejpeg($tmp, $image, 90); |
|
| 76 | - break; |
|
| 77 | - case "png": |
|
| 78 | - imagepng($tmp, $image, 0); |
|
| 79 | - break; |
|
| 80 | - case "gif": |
|
| 81 | - imagegif($tmp, $image); |
|
| 82 | - break; |
|
| 83 | - default: |
|
| 84 | - throw new \Exception(" Only jpg, jpeg, png and gif files can be resized ");
|
|
| 85 | - break; |
|
| 86 | - } |
|
| 72 | + switch ($mimeType) {
|
|
| 73 | + case "jpeg": |
|
| 74 | + case "jpg": |
|
| 75 | + imagejpeg($tmp, $image, 90); |
|
| 76 | + break; |
|
| 77 | + case "png": |
|
| 78 | + imagepng($tmp, $image, 0); |
|
| 79 | + break; |
|
| 80 | + case "gif": |
|
| 81 | + imagegif($tmp, $image); |
|
| 82 | + break; |
|
| 83 | + default: |
|
| 84 | + throw new \Exception(" Only jpg, jpeg, png and gif files can be resized ");
|
|
| 85 | + break; |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | 88 | } |
| 89 | 89 | |
@@ -11,86 +11,86 @@ |
||
| 11 | 11 | |
| 12 | 12 | function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center"){
|
| 13 | 13 | |
| 14 | - // Calculate the watermark position |
|
| 15 | - switch ($position) {
|
|
| 16 | - case "center": |
|
| 17 | - $marginBottom = round($imgHeight / 2); |
|
| 18 | - $marginRight = round($imgWidth / 2) - round($watermarkWidth / 2); |
|
| 19 | - break; |
|
| 20 | - |
|
| 21 | - case "top-left": |
|
| 22 | - $marginBottom = round($imgHeight - $watermarkHeight); |
|
| 23 | - $marginRight = round($imgWidth - $watermarkWidth); |
|
| 24 | - break; |
|
| 25 | - |
|
| 26 | - case "bottom-left": |
|
| 27 | - $marginBottom = 5; |
|
| 28 | - $marginRight = round($imgWidth - $watermarkWidth); |
|
| 29 | - break; |
|
| 30 | - |
|
| 31 | - case "top-right": |
|
| 32 | - $marginBottom = round($imgHeight - $watermarkHeight); |
|
| 33 | - $marginRight = 5; |
|
| 34 | - break; |
|
| 35 | - |
|
| 36 | - default: |
|
| 37 | - $marginBottom = 2; |
|
| 38 | - $marginRight = 2; |
|
| 39 | - break; |
|
| 40 | - } |
|
| 41 | - |
|
| 42 | - |
|
| 43 | - $watermark = imagecreatefrompng($watermark); |
|
| 44 | - |
|
| 45 | - switch ($mimeType) {
|
|
| 46 | - case "jpeg": |
|
| 47 | - case "jpg": |
|
| 48 | - $createImage = imagecreatefromjpeg($image); |
|
| 49 | - break; |
|
| 50 | - |
|
| 51 | - case "png": |
|
| 52 | - $createImage = imagecreatefrompng($image); |
|
| 53 | - break; |
|
| 54 | - |
|
| 55 | - case "gif": |
|
| 56 | - $createImage = imagecreatefromgif($image); |
|
| 57 | - break; |
|
| 58 | - |
|
| 59 | - default: |
|
| 60 | - $createImage = imagecreatefromjpeg($image); |
|
| 61 | - break; |
|
| 62 | - } |
|
| 63 | - |
|
| 64 | - $sx = imagesx($watermark); |
|
| 65 | - $sy = imagesy($watermark); |
|
| 66 | - imagecopy( |
|
| 67 | - $createImage, |
|
| 68 | - $watermark, |
|
| 69 | - imagesx($createImage) - $sx - $marginRight, |
|
| 70 | - imagesy($createImage) - $sy - $marginBottom, |
|
| 71 | - 0, |
|
| 72 | - 0, |
|
| 73 | - imagesx($watermark), |
|
| 74 | - imagesy($watermark) |
|
| 75 | - ); |
|
| 76 | - |
|
| 77 | - |
|
| 78 | - switch ($mimeType) {
|
|
| 79 | - case "jpeg": |
|
| 80 | - case "jpg": |
|
| 81 | - imagejpeg($createImage, $image); |
|
| 82 | - break; |
|
| 83 | - |
|
| 84 | - case "png": |
|
| 85 | - imagepng($createImage, $image); |
|
| 86 | - break; |
|
| 87 | - |
|
| 88 | - case "gif": |
|
| 89 | - imagegif($createImage, $image); |
|
| 90 | - break; |
|
| 91 | - |
|
| 92 | - default: |
|
| 93 | - throw new \Exception("A watermark can only be applied to: jpeg, jpg, gif, png images ");
|
|
| 94 | - break; |
|
| 95 | - } |
|
| 14 | + // Calculate the watermark position |
|
| 15 | + switch ($position) {
|
|
| 16 | + case "center": |
|
| 17 | + $marginBottom = round($imgHeight / 2); |
|
| 18 | + $marginRight = round($imgWidth / 2) - round($watermarkWidth / 2); |
|
| 19 | + break; |
|
| 20 | + |
|
| 21 | + case "top-left": |
|
| 22 | + $marginBottom = round($imgHeight - $watermarkHeight); |
|
| 23 | + $marginRight = round($imgWidth - $watermarkWidth); |
|
| 24 | + break; |
|
| 25 | + |
|
| 26 | + case "bottom-left": |
|
| 27 | + $marginBottom = 5; |
|
| 28 | + $marginRight = round($imgWidth - $watermarkWidth); |
|
| 29 | + break; |
|
| 30 | + |
|
| 31 | + case "top-right": |
|
| 32 | + $marginBottom = round($imgHeight - $watermarkHeight); |
|
| 33 | + $marginRight = 5; |
|
| 34 | + break; |
|
| 35 | + |
|
| 36 | + default: |
|
| 37 | + $marginBottom = 2; |
|
| 38 | + $marginRight = 2; |
|
| 39 | + break; |
|
| 40 | + } |
|
| 41 | + |
|
| 42 | + |
|
| 43 | + $watermark = imagecreatefrompng($watermark); |
|
| 44 | + |
|
| 45 | + switch ($mimeType) {
|
|
| 46 | + case "jpeg": |
|
| 47 | + case "jpg": |
|
| 48 | + $createImage = imagecreatefromjpeg($image); |
|
| 49 | + break; |
|
| 50 | + |
|
| 51 | + case "png": |
|
| 52 | + $createImage = imagecreatefrompng($image); |
|
| 53 | + break; |
|
| 54 | + |
|
| 55 | + case "gif": |
|
| 56 | + $createImage = imagecreatefromgif($image); |
|
| 57 | + break; |
|
| 58 | + |
|
| 59 | + default: |
|
| 60 | + $createImage = imagecreatefromjpeg($image); |
|
| 61 | + break; |
|
| 62 | + } |
|
| 63 | + |
|
| 64 | + $sx = imagesx($watermark); |
|
| 65 | + $sy = imagesy($watermark); |
|
| 66 | + imagecopy( |
|
| 67 | + $createImage, |
|
| 68 | + $watermark, |
|
| 69 | + imagesx($createImage) - $sx - $marginRight, |
|
| 70 | + imagesy($createImage) - $sy - $marginBottom, |
|
| 71 | + 0, |
|
| 72 | + 0, |
|
| 73 | + imagesx($watermark), |
|
| 74 | + imagesy($watermark) |
|
| 75 | + ); |
|
| 76 | + |
|
| 77 | + |
|
| 78 | + switch ($mimeType) {
|
|
| 79 | + case "jpeg": |
|
| 80 | + case "jpg": |
|
| 81 | + imagejpeg($createImage, $image); |
|
| 82 | + break; |
|
| 83 | + |
|
| 84 | + case "png": |
|
| 85 | + imagepng($createImage, $image); |
|
| 86 | + break; |
|
| 87 | + |
|
| 88 | + case "gif": |
|
| 89 | + imagegif($createImage, $image); |
|
| 90 | + break; |
|
| 91 | + |
|
| 92 | + default: |
|
| 93 | + throw new \Exception("A watermark can only be applied to: jpeg, jpg, gif, png images ");
|
|
| 94 | + break; |
|
| 95 | + } |
|
| 96 | 96 | } |
| 97 | 97 | \ No newline at end of file |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | namespace Bulletproof; |
| 11 | 11 | |
| 12 | - function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center"){
|
|
| 12 | + function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center") {
|
|
| 13 | 13 | |
| 14 | 14 | // Calculate the watermark position |
| 15 | 15 | switch ($position) {
|
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | namespace Bulletproof; |
| 11 | 11 | |
| 12 | - function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center"){
|
|
| 12 | + function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center") { |
|
| 13 | 13 | |
| 14 | 14 | // Calculate the watermark position |
| 15 | 15 | switch ($position) {
|
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | * |
| 122 | 122 | * @param mixed $offset |
| 123 | 123 | * |
| 124 | - * @return bool|mixed |
|
| 124 | + * @return string|boolean |
|
| 125 | 125 | */ |
| 126 | 126 | public function offsetGet($offset) |
| 127 | 127 | {
|
@@ -140,8 +140,6 @@ discard block |
||
| 140 | 140 | /** |
| 141 | 141 | * Renames image |
| 142 | 142 | * |
| 143 | - * @param null $isNameGiven if null, image will be auto-generated |
|
| 144 | - * |
|
| 145 | 143 | * @return $this |
| 146 | 144 | */ |
| 147 | 145 | public function setName($isNameProvided = null) |
@@ -318,7 +316,7 @@ discard block |
||
| 318 | 316 | /** |
| 319 | 317 | * Returns error string or false if no errors occurred |
| 320 | 318 | * |
| 321 | - * @return string|bool |
|
| 319 | + * @return string|false |
|
| 322 | 320 | */ |
| 323 | 321 | public function getError(){
|
| 324 | 322 | return $this->error != "" ? $this->error : false; |
@@ -430,7 +428,7 @@ discard block |
||
| 430 | 428 | * Final upload method to be called, isolated for testing purposes |
| 431 | 429 | * |
| 432 | 430 | * @param $tmp_name int the temporary location of the image file |
| 433 | - * @param $destination int upload destination |
|
| 431 | + * @param string $destination int upload destination |
|
| 434 | 432 | * |
| 435 | 433 | * @return bool |
| 436 | 434 | */ |
@@ -16,89 +16,89 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | class Image implements \ArrayAccess |
| 18 | 18 | {
|
| 19 | - /** |
|
| 20 | - * @var string The new image name, to be provided or will be generated. |
|
| 21 | - */ |
|
| 22 | - protected $name; |
|
| 23 | - |
|
| 24 | - /** |
|
| 25 | - * @var int The image width in pixels |
|
| 26 | - */ |
|
| 27 | - protected $width; |
|
| 28 | - |
|
| 29 | - /** |
|
| 30 | - * @var int The image height in pixels |
|
| 31 | - */ |
|
| 32 | - protected $height; |
|
| 33 | - |
|
| 34 | - /** |
|
| 35 | - * @var string The image mime type (extension) |
|
| 36 | - */ |
|
| 37 | - protected $mime; |
|
| 38 | - |
|
| 39 | - /** |
|
| 40 | - * @var string The full image path (dir + image + mime) |
|
| 41 | - */ |
|
| 42 | - protected $fullPath; |
|
| 43 | - |
|
| 44 | - /** |
|
| 45 | - * @var string The folder or image storage location |
|
| 46 | - */ |
|
| 47 | - protected $location; |
|
| 48 | - |
|
| 49 | - /** |
|
| 50 | - * @var array A json format of all information about an image |
|
| 51 | - */ |
|
| 52 | - protected $serialize = array(); |
|
| 53 | - |
|
| 54 | - /** |
|
| 55 | - * @var array The min and max image size allowed for upload (in bytes) |
|
| 56 | - */ |
|
| 57 | - protected $size = array(100, 50000); |
|
| 58 | - |
|
| 59 | - /** |
|
| 60 | - * @var array The max height and width image allowed |
|
| 61 | - */ |
|
| 62 | - protected $dimensions = array(500, 5000); |
|
| 63 | - |
|
| 64 | - /** |
|
| 65 | - * @var array The mime types allowed for upload |
|
| 66 | - */ |
|
| 67 | - protected $mimeTypes = array("jpeg", "png", "gif");
|
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * @var array list of known image types |
|
| 71 | - */ |
|
| 72 | - protected $imageMimes = array( |
|
| 73 | - 1 => "gif", "jpeg", "png", "swf", "psd", |
|
| 74 | - "bmp", "tiff", "tiff", "jpc", "jp2", "jpx", |
|
| 75 | - "jb2", "swc", "iff", "wbmp", "xbm", "ico" |
|
| 76 | - ); |
|
| 77 | - |
|
| 78 | - /** |
|
| 79 | - * @var array storage for the $_FILES global array |
|
| 80 | - */ |
|
| 81 | - private $_files = array(); |
|
| 82 | - |
|
| 83 | - /** |
|
| 84 | - * @var string storage for any errors |
|
| 85 | - */ |
|
| 86 | - private $error = ""; |
|
| 87 | - |
|
| 88 | - /** |
|
| 89 | - * @var array error messages strings |
|
| 90 | - */ |
|
| 91 | - private $error_messages = array( |
|
| 19 | + /** |
|
| 20 | + * @var string The new image name, to be provided or will be generated. |
|
| 21 | + */ |
|
| 22 | + protected $name; |
|
| 23 | + |
|
| 24 | + /** |
|
| 25 | + * @var int The image width in pixels |
|
| 26 | + */ |
|
| 27 | + protected $width; |
|
| 28 | + |
|
| 29 | + /** |
|
| 30 | + * @var int The image height in pixels |
|
| 31 | + */ |
|
| 32 | + protected $height; |
|
| 33 | + |
|
| 34 | + /** |
|
| 35 | + * @var string The image mime type (extension) |
|
| 36 | + */ |
|
| 37 | + protected $mime; |
|
| 38 | + |
|
| 39 | + /** |
|
| 40 | + * @var string The full image path (dir + image + mime) |
|
| 41 | + */ |
|
| 42 | + protected $fullPath; |
|
| 43 | + |
|
| 44 | + /** |
|
| 45 | + * @var string The folder or image storage location |
|
| 46 | + */ |
|
| 47 | + protected $location; |
|
| 48 | + |
|
| 49 | + /** |
|
| 50 | + * @var array A json format of all information about an image |
|
| 51 | + */ |
|
| 52 | + protected $serialize = array(); |
|
| 53 | + |
|
| 54 | + /** |
|
| 55 | + * @var array The min and max image size allowed for upload (in bytes) |
|
| 56 | + */ |
|
| 57 | + protected $size = array(100, 50000); |
|
| 58 | + |
|
| 59 | + /** |
|
| 60 | + * @var array The max height and width image allowed |
|
| 61 | + */ |
|
| 62 | + protected $dimensions = array(500, 5000); |
|
| 63 | + |
|
| 64 | + /** |
|
| 65 | + * @var array The mime types allowed for upload |
|
| 66 | + */ |
|
| 67 | + protected $mimeTypes = array("jpeg", "png", "gif");
|
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * @var array list of known image types |
|
| 71 | + */ |
|
| 72 | + protected $imageMimes = array( |
|
| 73 | + 1 => "gif", "jpeg", "png", "swf", "psd", |
|
| 74 | + "bmp", "tiff", "tiff", "jpc", "jp2", "jpx", |
|
| 75 | + "jb2", "swc", "iff", "wbmp", "xbm", "ico" |
|
| 76 | + ); |
|
| 77 | + |
|
| 78 | + /** |
|
| 79 | + * @var array storage for the $_FILES global array |
|
| 80 | + */ |
|
| 81 | + private $_files = array(); |
|
| 82 | + |
|
| 83 | + /** |
|
| 84 | + * @var string storage for any errors |
|
| 85 | + */ |
|
| 86 | + private $error = ""; |
|
| 87 | + |
|
| 88 | + /** |
|
| 89 | + * @var array error messages strings |
|
| 90 | + */ |
|
| 91 | + private $error_messages = array( |
|
| 92 | 92 | 'upload' => array( |
| 93 | - UPLOAD_ERR_OK => "", |
|
| 94 | - UPLOAD_ERR_INI_SIZE => "Image is larger than the specified amount set by the server", |
|
| 95 | - UPLOAD_ERR_FORM_SIZE => "Image is larger than the specified amount specified by browser", |
|
| 96 | - UPLOAD_ERR_PARTIAL => "Image could not be fully uploaded. Please try again later", |
|
| 97 | - UPLOAD_ERR_NO_FILE => "Image is not found", |
|
| 98 | - UPLOAD_ERR_NO_TMP_DIR => "Can't write to disk, due to server configuration ( No tmp dir found )", |
|
| 99 | - UPLOAD_ERR_CANT_WRITE => "Failed to write file to disk. Please check you file permissions", |
|
| 100 | - UPLOAD_ERR_EXTENSION => "A PHP extension has halted this file upload process" |
|
| 101 | - ), |
|
| 93 | + UPLOAD_ERR_OK => "", |
|
| 94 | + UPLOAD_ERR_INI_SIZE => "Image is larger than the specified amount set by the server", |
|
| 95 | + UPLOAD_ERR_FORM_SIZE => "Image is larger than the specified amount specified by browser", |
|
| 96 | + UPLOAD_ERR_PARTIAL => "Image could not be fully uploaded. Please try again later", |
|
| 97 | + UPLOAD_ERR_NO_FILE => "Image is not found", |
|
| 98 | + UPLOAD_ERR_NO_TMP_DIR => "Can't write to disk, due to server configuration ( No tmp dir found )", |
|
| 99 | + UPLOAD_ERR_CANT_WRITE => "Failed to write file to disk. Please check you file permissions", |
|
| 100 | + UPLOAD_ERR_EXTENSION => "A PHP extension has halted this file upload process" |
|
| 101 | + ), |
|
| 102 | 102 | 'location' => "Folder %s could not be created", |
| 103 | 103 | 'mime_type' => "Invalid File! Only (%s) image types are allowed", |
| 104 | 104 | 'file_size' => "Image size should be atleast more than min: %s and less than max: %s kb", |
@@ -107,136 +107,136 @@ discard block |
||
| 107 | 107 | 'unknown' => "Upload failed, Unknown error occured" |
| 108 | 108 | ); |
| 109 | 109 | |
| 110 | - /** |
|
| 111 | - * @param array $_files represents the $_FILES array passed as dependancy |
|
| 112 | - */ |
|
| 113 | - public function __construct(array $_files = []) |
|
| 114 | - {
|
|
| 115 | - $this->_files = $_files; |
|
| 116 | - } |
|
| 117 | - |
|
| 118 | - /** |
|
| 119 | - * Gets the real image mime type |
|
| 120 | - * |
|
| 121 | - * @param $tmp_name string The upload tmp directory |
|
| 122 | - * |
|
| 123 | - * @return bool|string |
|
| 124 | - */ |
|
| 125 | - protected function getImageMime($tmp_name) |
|
| 126 | - {
|
|
| 127 | - if (isset($this->imageMimes[exif_imagetype($tmp_name)])) {
|
|
| 128 | - return $this->imageMimes [exif_imagetype($tmp_name)]; |
|
| 129 | - } |
|
| 130 | - return false; |
|
| 131 | - } |
|
| 132 | - |
|
| 133 | - /** |
|
| 134 | - * array offset \ArrayAccess |
|
| 135 | - * unused |
|
| 136 | - */ |
|
| 137 | - public function offsetSet($offset, $value){}
|
|
| 138 | - public function offsetExists($offset){}
|
|
| 139 | - public function offsetUnset($offset){}
|
|
| 140 | - |
|
| 141 | - /** |
|
| 142 | - * Gets array value \ArrayAccess |
|
| 143 | - * |
|
| 144 | - * @param mixed $offset |
|
| 145 | - * |
|
| 146 | - * @return bool|mixed |
|
| 147 | - */ |
|
| 148 | - public function offsetGet($offset) |
|
| 149 | - {
|
|
| 150 | - if ($offset == "error") {
|
|
| 151 | - return $this->error; |
|
| 152 | - } |
|
| 153 | - |
|
| 154 | - if (isset($this->_files[$offset]) && file_exists($this->_files[$offset]["tmp_name"])) {
|
|
| 155 | - $this->_files = $this->_files[$offset]; |
|
| 156 | - return true; |
|
| 157 | - } |
|
| 110 | + /** |
|
| 111 | + * @param array $_files represents the $_FILES array passed as dependancy |
|
| 112 | + */ |
|
| 113 | + public function __construct(array $_files = []) |
|
| 114 | + {
|
|
| 115 | + $this->_files = $_files; |
|
| 116 | + } |
|
| 117 | + |
|
| 118 | + /** |
|
| 119 | + * Gets the real image mime type |
|
| 120 | + * |
|
| 121 | + * @param $tmp_name string The upload tmp directory |
|
| 122 | + * |
|
| 123 | + * @return bool|string |
|
| 124 | + */ |
|
| 125 | + protected function getImageMime($tmp_name) |
|
| 126 | + {
|
|
| 127 | + if (isset($this->imageMimes[exif_imagetype($tmp_name)])) {
|
|
| 128 | + return $this->imageMimes [exif_imagetype($tmp_name)]; |
|
| 129 | + } |
|
| 130 | + return false; |
|
| 131 | + } |
|
| 132 | + |
|
| 133 | + /** |
|
| 134 | + * array offset \ArrayAccess |
|
| 135 | + * unused |
|
| 136 | + */ |
|
| 137 | + public function offsetSet($offset, $value){}
|
|
| 138 | + public function offsetExists($offset){}
|
|
| 139 | + public function offsetUnset($offset){}
|
|
| 140 | + |
|
| 141 | + /** |
|
| 142 | + * Gets array value \ArrayAccess |
|
| 143 | + * |
|
| 144 | + * @param mixed $offset |
|
| 145 | + * |
|
| 146 | + * @return bool|mixed |
|
| 147 | + */ |
|
| 148 | + public function offsetGet($offset) |
|
| 149 | + {
|
|
| 150 | + if ($offset == "error") {
|
|
| 151 | + return $this->error; |
|
| 152 | + } |
|
| 153 | + |
|
| 154 | + if (isset($this->_files[$offset]) && file_exists($this->_files[$offset]["tmp_name"])) {
|
|
| 155 | + $this->_files = $this->_files[$offset]; |
|
| 156 | + return true; |
|
| 157 | + } |
|
| 158 | 158 | |
| 159 | - return false; |
|
| 160 | - } |
|
| 161 | - |
|
| 162 | - /** |
|
| 163 | - * Renames image |
|
| 164 | - * |
|
| 165 | - * @param null $isNameGiven if null, image will be auto-generated |
|
| 166 | - * |
|
| 167 | - * @return $this |
|
| 168 | - */ |
|
| 169 | - public function setName($isNameProvided = null) |
|
| 170 | - {
|
|
| 171 | - if ($isNameProvided) {
|
|
| 172 | - $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING); |
|
| 173 | - } |
|
| 159 | + return false; |
|
| 160 | + } |
|
| 161 | + |
|
| 162 | + /** |
|
| 163 | + * Renames image |
|
| 164 | + * |
|
| 165 | + * @param null $isNameGiven if null, image will be auto-generated |
|
| 166 | + * |
|
| 167 | + * @return $this |
|
| 168 | + */ |
|
| 169 | + public function setName($isNameProvided = null) |
|
| 170 | + {
|
|
| 171 | + if ($isNameProvided) {
|
|
| 172 | + $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING); |
|
| 173 | + } |
|
| 174 | 174 | |
| 175 | - return $this; |
|
| 176 | - } |
|
| 177 | - |
|
| 178 | - /** |
|
| 179 | - * Define a mime type for uploading |
|
| 180 | - * |
|
| 181 | - * @param array $fileTypes |
|
| 182 | - * |
|
| 183 | - * @return $this |
|
| 184 | - */ |
|
| 185 | - public function setMime(array $fileTypes) |
|
| 186 | - {
|
|
| 187 | - $this->mimeTypes = $fileTypes; |
|
| 188 | - return $this; |
|
| 189 | - } |
|
| 190 | - |
|
| 191 | - /** |
|
| 192 | - * Define a min and max image size for uploading |
|
| 193 | - * |
|
| 194 | - * @param $min int minimum value in bytes |
|
| 195 | - * @param $max int maximum value in bytes |
|
| 196 | - * |
|
| 197 | - * @return $this |
|
| 198 | - */ |
|
| 199 | - public function setSize($min, $max) |
|
| 200 | - {
|
|
| 201 | - $this->size = array($min, $max); |
|
| 202 | - return $this; |
|
| 203 | - } |
|
| 204 | - |
|
| 205 | - /** |
|
| 206 | - * Creates a location for upload storage |
|
| 207 | - * |
|
| 208 | - * @param $dir string the folder name to create |
|
| 209 | - * @param int $permission chmod permission |
|
| 210 | - * |
|
| 211 | - * @return $this |
|
| 212 | - */ |
|
| 213 | - public function setLocation($dir = "bulletproof", $permission = 0666) |
|
| 214 | - {
|
|
| 215 | - if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
|
|
| 216 | - $createFolder = @mkdir("" . $dir, (int) $permission, true);
|
|
| 217 | - if (!$createFolder) {
|
|
| 218 | - $this->error = sprintf($this->error_messages['location'], $dir); |
|
| 219 | - return; |
|
| 220 | - } |
|
| 221 | - } |
|
| 222 | - |
|
| 223 | - $this->location = $dir; |
|
| 224 | - return $this; |
|
| 225 | - } |
|
| 226 | - |
|
| 227 | - /** |
|
| 228 | - * Sets acceptable max image height and width |
|
| 229 | - * |
|
| 230 | - * @param $maxWidth int max width value |
|
| 231 | - * @param $maxHeight int max height value |
|
| 232 | - * |
|
| 233 | - * @return $this |
|
| 234 | - */ |
|
| 235 | - public function setDimension($maxWidth, $maxHeight) |
|
| 236 | - {
|
|
| 237 | - $this->dimensions = array($maxWidth, $maxHeight); |
|
| 238 | - return $this; |
|
| 239 | - } |
|
| 175 | + return $this; |
|
| 176 | + } |
|
| 177 | + |
|
| 178 | + /** |
|
| 179 | + * Define a mime type for uploading |
|
| 180 | + * |
|
| 181 | + * @param array $fileTypes |
|
| 182 | + * |
|
| 183 | + * @return $this |
|
| 184 | + */ |
|
| 185 | + public function setMime(array $fileTypes) |
|
| 186 | + {
|
|
| 187 | + $this->mimeTypes = $fileTypes; |
|
| 188 | + return $this; |
|
| 189 | + } |
|
| 190 | + |
|
| 191 | + /** |
|
| 192 | + * Define a min and max image size for uploading |
|
| 193 | + * |
|
| 194 | + * @param $min int minimum value in bytes |
|
| 195 | + * @param $max int maximum value in bytes |
|
| 196 | + * |
|
| 197 | + * @return $this |
|
| 198 | + */ |
|
| 199 | + public function setSize($min, $max) |
|
| 200 | + {
|
|
| 201 | + $this->size = array($min, $max); |
|
| 202 | + return $this; |
|
| 203 | + } |
|
| 204 | + |
|
| 205 | + /** |
|
| 206 | + * Creates a location for upload storage |
|
| 207 | + * |
|
| 208 | + * @param $dir string the folder name to create |
|
| 209 | + * @param int $permission chmod permission |
|
| 210 | + * |
|
| 211 | + * @return $this |
|
| 212 | + */ |
|
| 213 | + public function setLocation($dir = "bulletproof", $permission = 0666) |
|
| 214 | + {
|
|
| 215 | + if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
|
|
| 216 | + $createFolder = @mkdir("" . $dir, (int) $permission, true);
|
|
| 217 | + if (!$createFolder) {
|
|
| 218 | + $this->error = sprintf($this->error_messages['location'], $dir); |
|
| 219 | + return; |
|
| 220 | + } |
|
| 221 | + } |
|
| 222 | + |
|
| 223 | + $this->location = $dir; |
|
| 224 | + return $this; |
|
| 225 | + } |
|
| 226 | + |
|
| 227 | + /** |
|
| 228 | + * Sets acceptable max image height and width |
|
| 229 | + * |
|
| 230 | + * @param $maxWidth int max width value |
|
| 231 | + * @param $maxHeight int max height value |
|
| 232 | + * |
|
| 233 | + * @return $this |
|
| 234 | + */ |
|
| 235 | + public function setDimension($maxWidth, $maxHeight) |
|
| 236 | + {
|
|
| 237 | + $this->dimensions = array($maxWidth, $maxHeight); |
|
| 238 | + return $this; |
|
| 239 | + } |
|
| 240 | 240 | |
| 241 | 241 | /** |
| 242 | 242 | * Replace error_messages array values with values of given array |
@@ -253,217 +253,217 @@ discard block |
||
| 253 | 253 | return $this; |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | - /** |
|
| 257 | - * Returns the image name |
|
| 258 | - * |
|
| 259 | - * @return string |
|
| 260 | - */ |
|
| 261 | - public function getName() |
|
| 262 | - {
|
|
| 263 | - if (!$this->name) {
|
|
| 264 | - return uniqid(true) . "_" . str_shuffle(implode(range("e", "q")));
|
|
| 265 | - } |
|
| 266 | - |
|
| 267 | - return $this->name; |
|
| 268 | - } |
|
| 269 | - |
|
| 270 | - /** |
|
| 271 | - * Returns the full path of the image ex "location/image.mime" |
|
| 272 | - * |
|
| 273 | - * @return string |
|
| 274 | - */ |
|
| 275 | - public function getFullPath() |
|
| 276 | - {
|
|
| 277 | - $this->fullPath = $this->location . "/" . $this->name . "." . $this->mime; |
|
| 278 | - return $this->fullPath; |
|
| 279 | - } |
|
| 280 | - |
|
| 281 | - /** |
|
| 282 | - * Returns the image size in bytes |
|
| 283 | - * |
|
| 284 | - * @return int |
|
| 285 | - */ |
|
| 286 | - public function getSize() |
|
| 287 | - {
|
|
| 288 | - return (int) $this->_files["size"]; |
|
| 289 | - } |
|
| 290 | - |
|
| 291 | - /** |
|
| 292 | - * Returns the image height in pixels |
|
| 293 | - * |
|
| 294 | - * @return int |
|
| 295 | - */ |
|
| 296 | - public function getHeight() |
|
| 297 | - {
|
|
| 298 | - if ($this->height != null) {
|
|
| 299 | - return $this->height; |
|
| 300 | - } |
|
| 301 | - |
|
| 302 | - list(, $height) = getImageSize($this->_files["tmp_name"]); |
|
| 303 | - return $height; |
|
| 304 | - } |
|
| 305 | - |
|
| 306 | - /** |
|
| 307 | - * Returns the image width |
|
| 308 | - * |
|
| 309 | - * @return int |
|
| 310 | - */ |
|
| 311 | - public function getWidth() |
|
| 312 | - {
|
|
| 313 | - if ($this->width != null) {
|
|
| 314 | - return $this->width; |
|
| 315 | - } |
|
| 316 | - |
|
| 317 | - list($width) = getImageSize($this->_files["tmp_name"]); |
|
| 318 | - return $width; |
|
| 319 | - } |
|
| 320 | - |
|
| 321 | - /** |
|
| 322 | - * Returns the storage / folder name |
|
| 323 | - * |
|
| 324 | - * @return string |
|
| 325 | - */ |
|
| 326 | - public function getLocation() |
|
| 327 | - {
|
|
| 328 | - if(!$this->location){
|
|
| 329 | - $this->setLocation(); |
|
| 330 | - } |
|
| 331 | - |
|
| 332 | - return $this->location; |
|
| 333 | - } |
|
| 334 | - |
|
| 335 | - /** |
|
| 336 | - * Returns a JSON format of the image width, height, name, mime ... |
|
| 337 | - * |
|
| 338 | - * @return string |
|
| 339 | - */ |
|
| 340 | - public function getJson() |
|
| 341 | - {
|
|
| 342 | - return json_encode($this->serialize); |
|
| 343 | - } |
|
| 344 | - |
|
| 345 | - /** |
|
| 346 | - * Returns the image mime type |
|
| 347 | - * |
|
| 348 | - * @return string |
|
| 349 | - */ |
|
| 350 | - public function getMime() |
|
| 351 | - {
|
|
| 352 | - return $this->mime; |
|
| 353 | - } |
|
| 354 | - |
|
| 355 | - /** |
|
| 356 | - * Returns error string or false if no errors occurred |
|
| 357 | - * |
|
| 358 | - * @return string|bool |
|
| 359 | - */ |
|
| 360 | - public function getError(){
|
|
| 361 | - return $this->error != "" ? $this->error : false; |
|
| 362 | - } |
|
| 363 | - |
|
| 364 | - /** |
|
| 365 | - * Checks for the common upload errors |
|
| 366 | - * |
|
| 367 | - * @param $e int error constant |
|
| 368 | - */ |
|
| 369 | - protected function uploadErrors($e) |
|
| 370 | - {
|
|
| 371 | - $errors = $this->error_messages['upload']; |
|
| 372 | - return $errors[$e]; |
|
| 373 | - } |
|
| 374 | - |
|
| 375 | - /** |
|
| 376 | - * Main upload method. |
|
| 377 | - * This is where all the monkey business happens |
|
| 378 | - * |
|
| 379 | - * @return $this|bool |
|
| 380 | - */ |
|
| 381 | - public function upload() |
|
| 382 | - {
|
|
| 383 | - /* modify variable names for convenience */ |
|
| 384 | - $image = $this; |
|
| 385 | - $files = $this->_files; |
|
| 386 | - |
|
| 387 | - /* initialize image properties */ |
|
| 388 | - $image->name = $image->getName(); |
|
| 389 | - $image->width = $image->getWidth(); |
|
| 390 | - $image->height = $image->getHeight(); |
|
| 391 | - $image->location = $image->getLocation(); |
|
| 392 | - |
|
| 393 | - /* get image sizes */ |
|
| 394 | - list($minSize, $maxSize) = $image->size; |
|
| 395 | - |
|
| 396 | - /* check for common upload errors */ |
|
| 397 | - if($image->error = $image->uploadErrors($files["error"])){
|
|
| 398 | - return ; |
|
| 399 | - } |
|
| 400 | - |
|
| 401 | - /* check image for valid mime types and return mime */ |
|
| 402 | - $image->mime = $image->getImageMime($files["tmp_name"]); |
|
| 403 | - |
|
| 404 | - /* validate image mime type */ |
|
| 405 | - if (!in_array($image->mime, $image->mimeTypes)) {
|
|
| 406 | - $ext = implode(", ", $image->mimeTypes);
|
|
| 407 | - $image->error = sprintf($this->error_messages['mime_type'], $ext); |
|
| 408 | - return ; |
|
| 409 | - } |
|
| 410 | - |
|
| 411 | - /* check image size based on the settings */ |
|
| 412 | - if ($files["size"] < $minSize || $files["size"] > $maxSize) {
|
|
| 413 | - $min = intval($minSize / 1000) ?: 1; $max = intval($maxSize / 1000); |
|
| 414 | - |
|
| 415 | - $image->error = sprintf($this->error_messages['file_size'], $min, $max); |
|
| 416 | - return ; |
|
| 417 | - } |
|
| 418 | - |
|
| 419 | - /* check image dimension */ |
|
| 420 | - list($allowedWidth, $allowedHeight) = $image->dimensions; |
|
| 421 | - |
|
| 422 | - if ($image->height > $allowedHeight || $image->width > $allowedWidth) {
|
|
| 423 | - $image->error = sprintf($this->error_messages['dimensions'], $allowedHeight, $allowedWidth); |
|
| 424 | - return ; |
|
| 425 | - } |
|
| 426 | - |
|
| 427 | - if($image->height < 4 || $image->width < 4){
|
|
| 428 | - $image->error = $this->error_messages['too_small']; |
|
| 429 | - return ; |
|
| 430 | - } |
|
| 256 | + /** |
|
| 257 | + * Returns the image name |
|
| 258 | + * |
|
| 259 | + * @return string |
|
| 260 | + */ |
|
| 261 | + public function getName() |
|
| 262 | + {
|
|
| 263 | + if (!$this->name) {
|
|
| 264 | + return uniqid(true) . "_" . str_shuffle(implode(range("e", "q")));
|
|
| 265 | + } |
|
| 266 | + |
|
| 267 | + return $this->name; |
|
| 268 | + } |
|
| 269 | + |
|
| 270 | + /** |
|
| 271 | + * Returns the full path of the image ex "location/image.mime" |
|
| 272 | + * |
|
| 273 | + * @return string |
|
| 274 | + */ |
|
| 275 | + public function getFullPath() |
|
| 276 | + {
|
|
| 277 | + $this->fullPath = $this->location . "/" . $this->name . "." . $this->mime; |
|
| 278 | + return $this->fullPath; |
|
| 279 | + } |
|
| 280 | + |
|
| 281 | + /** |
|
| 282 | + * Returns the image size in bytes |
|
| 283 | + * |
|
| 284 | + * @return int |
|
| 285 | + */ |
|
| 286 | + public function getSize() |
|
| 287 | + {
|
|
| 288 | + return (int) $this->_files["size"]; |
|
| 289 | + } |
|
| 290 | + |
|
| 291 | + /** |
|
| 292 | + * Returns the image height in pixels |
|
| 293 | + * |
|
| 294 | + * @return int |
|
| 295 | + */ |
|
| 296 | + public function getHeight() |
|
| 297 | + {
|
|
| 298 | + if ($this->height != null) {
|
|
| 299 | + return $this->height; |
|
| 300 | + } |
|
| 301 | + |
|
| 302 | + list(, $height) = getImageSize($this->_files["tmp_name"]); |
|
| 303 | + return $height; |
|
| 304 | + } |
|
| 305 | + |
|
| 306 | + /** |
|
| 307 | + * Returns the image width |
|
| 308 | + * |
|
| 309 | + * @return int |
|
| 310 | + */ |
|
| 311 | + public function getWidth() |
|
| 312 | + {
|
|
| 313 | + if ($this->width != null) {
|
|
| 314 | + return $this->width; |
|
| 315 | + } |
|
| 316 | + |
|
| 317 | + list($width) = getImageSize($this->_files["tmp_name"]); |
|
| 318 | + return $width; |
|
| 319 | + } |
|
| 320 | + |
|
| 321 | + /** |
|
| 322 | + * Returns the storage / folder name |
|
| 323 | + * |
|
| 324 | + * @return string |
|
| 325 | + */ |
|
| 326 | + public function getLocation() |
|
| 327 | + {
|
|
| 328 | + if(!$this->location){
|
|
| 329 | + $this->setLocation(); |
|
| 330 | + } |
|
| 331 | + |
|
| 332 | + return $this->location; |
|
| 333 | + } |
|
| 334 | + |
|
| 335 | + /** |
|
| 336 | + * Returns a JSON format of the image width, height, name, mime ... |
|
| 337 | + * |
|
| 338 | + * @return string |
|
| 339 | + */ |
|
| 340 | + public function getJson() |
|
| 341 | + {
|
|
| 342 | + return json_encode($this->serialize); |
|
| 343 | + } |
|
| 344 | + |
|
| 345 | + /** |
|
| 346 | + * Returns the image mime type |
|
| 347 | + * |
|
| 348 | + * @return string |
|
| 349 | + */ |
|
| 350 | + public function getMime() |
|
| 351 | + {
|
|
| 352 | + return $this->mime; |
|
| 353 | + } |
|
| 354 | + |
|
| 355 | + /** |
|
| 356 | + * Returns error string or false if no errors occurred |
|
| 357 | + * |
|
| 358 | + * @return string|bool |
|
| 359 | + */ |
|
| 360 | + public function getError(){
|
|
| 361 | + return $this->error != "" ? $this->error : false; |
|
| 362 | + } |
|
| 363 | + |
|
| 364 | + /** |
|
| 365 | + * Checks for the common upload errors |
|
| 366 | + * |
|
| 367 | + * @param $e int error constant |
|
| 368 | + */ |
|
| 369 | + protected function uploadErrors($e) |
|
| 370 | + {
|
|
| 371 | + $errors = $this->error_messages['upload']; |
|
| 372 | + return $errors[$e]; |
|
| 373 | + } |
|
| 374 | + |
|
| 375 | + /** |
|
| 376 | + * Main upload method. |
|
| 377 | + * This is where all the monkey business happens |
|
| 378 | + * |
|
| 379 | + * @return $this|bool |
|
| 380 | + */ |
|
| 381 | + public function upload() |
|
| 382 | + {
|
|
| 383 | + /* modify variable names for convenience */ |
|
| 384 | + $image = $this; |
|
| 385 | + $files = $this->_files; |
|
| 386 | + |
|
| 387 | + /* initialize image properties */ |
|
| 388 | + $image->name = $image->getName(); |
|
| 389 | + $image->width = $image->getWidth(); |
|
| 390 | + $image->height = $image->getHeight(); |
|
| 391 | + $image->location = $image->getLocation(); |
|
| 392 | + |
|
| 393 | + /* get image sizes */ |
|
| 394 | + list($minSize, $maxSize) = $image->size; |
|
| 395 | + |
|
| 396 | + /* check for common upload errors */ |
|
| 397 | + if($image->error = $image->uploadErrors($files["error"])){
|
|
| 398 | + return ; |
|
| 399 | + } |
|
| 400 | + |
|
| 401 | + /* check image for valid mime types and return mime */ |
|
| 402 | + $image->mime = $image->getImageMime($files["tmp_name"]); |
|
| 403 | + |
|
| 404 | + /* validate image mime type */ |
|
| 405 | + if (!in_array($image->mime, $image->mimeTypes)) {
|
|
| 406 | + $ext = implode(", ", $image->mimeTypes);
|
|
| 407 | + $image->error = sprintf($this->error_messages['mime_type'], $ext); |
|
| 408 | + return ; |
|
| 409 | + } |
|
| 410 | + |
|
| 411 | + /* check image size based on the settings */ |
|
| 412 | + if ($files["size"] < $minSize || $files["size"] > $maxSize) {
|
|
| 413 | + $min = intval($minSize / 1000) ?: 1; $max = intval($maxSize / 1000); |
|
| 414 | + |
|
| 415 | + $image->error = sprintf($this->error_messages['file_size'], $min, $max); |
|
| 416 | + return ; |
|
| 417 | + } |
|
| 418 | + |
|
| 419 | + /* check image dimension */ |
|
| 420 | + list($allowedWidth, $allowedHeight) = $image->dimensions; |
|
| 421 | + |
|
| 422 | + if ($image->height > $allowedHeight || $image->width > $allowedWidth) {
|
|
| 423 | + $image->error = sprintf($this->error_messages['dimensions'], $allowedHeight, $allowedWidth); |
|
| 424 | + return ; |
|
| 425 | + } |
|
| 426 | + |
|
| 427 | + if($image->height < 4 || $image->width < 4){
|
|
| 428 | + $image->error = $this->error_messages['too_small']; |
|
| 429 | + return ; |
|
| 430 | + } |
|
| 431 | 431 | |
| 432 | - /* set and get folder name */ |
|
| 433 | - $image->fullPath = $image->location. "/" . $image->name . "." . $image->mime; |
|
| 434 | - |
|
| 435 | - /* gather image info for json storage */ |
|
| 436 | - $image->serialize = array( |
|
| 437 | - "name" => $image->name, |
|
| 438 | - "mime" => $image->mime, |
|
| 439 | - "height" => $image->height, |
|
| 440 | - "width" => $image->width, |
|
| 441 | - "size" => $files["size"], |
|
| 442 | - "location" => $image->location, |
|
| 443 | - "fullpath" => $image->fullPath |
|
| 444 | - ); |
|
| 445 | - |
|
| 446 | - if ($image->error === "") {
|
|
| 447 | - $moveUpload = $image->moveUploadedFile($files["tmp_name"], $image->fullPath); |
|
| 448 | - if (false !== $moveUpload) {
|
|
| 449 | - return $image; |
|
| 450 | - } |
|
| 451 | - } |
|
| 452 | - |
|
| 453 | - $image->error = $this->error_messages['unknown']; |
|
| 454 | - return false; |
|
| 455 | - } |
|
| 456 | - |
|
| 457 | - /** |
|
| 458 | - * Final upload method to be called, isolated for testing purposes |
|
| 459 | - * |
|
| 460 | - * @param $tmp_name int the temporary location of the image file |
|
| 461 | - * @param $destination int upload destination |
|
| 462 | - * |
|
| 463 | - * @return bool |
|
| 464 | - */ |
|
| 465 | - public function moveUploadedFile($tmp_name, $destination) |
|
| 466 | - {
|
|
| 467 | - return move_uploaded_file($tmp_name, $destination); |
|
| 468 | - } |
|
| 432 | + /* set and get folder name */ |
|
| 433 | + $image->fullPath = $image->location. "/" . $image->name . "." . $image->mime; |
|
| 434 | + |
|
| 435 | + /* gather image info for json storage */ |
|
| 436 | + $image->serialize = array( |
|
| 437 | + "name" => $image->name, |
|
| 438 | + "mime" => $image->mime, |
|
| 439 | + "height" => $image->height, |
|
| 440 | + "width" => $image->width, |
|
| 441 | + "size" => $files["size"], |
|
| 442 | + "location" => $image->location, |
|
| 443 | + "fullpath" => $image->fullPath |
|
| 444 | + ); |
|
| 445 | + |
|
| 446 | + if ($image->error === "") {
|
|
| 447 | + $moveUpload = $image->moveUploadedFile($files["tmp_name"], $image->fullPath); |
|
| 448 | + if (false !== $moveUpload) {
|
|
| 449 | + return $image; |
|
| 450 | + } |
|
| 451 | + } |
|
| 452 | + |
|
| 453 | + $image->error = $this->error_messages['unknown']; |
|
| 454 | + return false; |
|
| 455 | + } |
|
| 456 | + |
|
| 457 | + /** |
|
| 458 | + * Final upload method to be called, isolated for testing purposes |
|
| 459 | + * |
|
| 460 | + * @param $tmp_name int the temporary location of the image file |
|
| 461 | + * @param $destination int upload destination |
|
| 462 | + * |
|
| 463 | + * @return bool |
|
| 464 | + */ |
|
| 465 | + public function moveUploadedFile($tmp_name, $destination) |
|
| 466 | + {
|
|
| 467 | + return move_uploaded_file($tmp_name, $destination); |
|
| 468 | + } |
|
| 469 | 469 | } |
@@ -134,9 +134,9 @@ discard block |
||
| 134 | 134 | * array offset \ArrayAccess |
| 135 | 135 | * unused |
| 136 | 136 | */ |
| 137 | - public function offsetSet($offset, $value){}
|
|
| 138 | - public function offsetExists($offset){}
|
|
| 139 | - public function offsetUnset($offset){}
|
|
| 137 | + public function offsetSet($offset, $value) {}
|
|
| 138 | + public function offsetExists($offset) {}
|
|
| 139 | + public function offsetUnset($offset) {}
|
|
| 140 | 140 | |
| 141 | 141 | /** |
| 142 | 142 | * Gets array value \ArrayAccess |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | public function setLocation($dir = "bulletproof", $permission = 0666) |
| 214 | 214 | {
|
| 215 | 215 | if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
|
| 216 | - $createFolder = @mkdir("" . $dir, (int) $permission, true);
|
|
| 216 | + $createFolder = @mkdir("".$dir, (int) $permission, true);
|
|
| 217 | 217 | if (!$createFolder) {
|
| 218 | 218 | $this->error = sprintf($this->error_messages['location'], $dir); |
| 219 | 219 | return; |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | */ |
| 248 | 248 | public function setErrorMessages($new_error_messages) |
| 249 | 249 | {
|
| 250 | - if($new_array = array_replace_recursive($this->error_messages, $new_error_messages)) {
|
|
| 250 | + if ($new_array = array_replace_recursive($this->error_messages, $new_error_messages)) {
|
|
| 251 | 251 | $this->error_messages = $new_array; |
| 252 | 252 | }; |
| 253 | 253 | return $this; |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | public function getName() |
| 262 | 262 | {
|
| 263 | 263 | if (!$this->name) {
|
| 264 | - return uniqid(true) . "_" . str_shuffle(implode(range("e", "q")));
|
|
| 264 | + return uniqid(true)."_".str_shuffle(implode(range("e", "q")));
|
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | return $this->name; |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | */ |
| 275 | 275 | public function getFullPath() |
| 276 | 276 | {
|
| 277 | - $this->fullPath = $this->location . "/" . $this->name . "." . $this->mime; |
|
| 277 | + $this->fullPath = $this->location."/".$this->name.".".$this->mime; |
|
| 278 | 278 | return $this->fullPath; |
| 279 | 279 | } |
| 280 | 280 | |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | */ |
| 326 | 326 | public function getLocation() |
| 327 | 327 | {
|
| 328 | - if(!$this->location){
|
|
| 328 | + if (!$this->location) {
|
|
| 329 | 329 | $this->setLocation(); |
| 330 | 330 | } |
| 331 | 331 | |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | * |
| 358 | 358 | * @return string|bool |
| 359 | 359 | */ |
| 360 | - public function getError(){
|
|
| 360 | + public function getError() {
|
|
| 361 | 361 | return $this->error != "" ? $this->error : false; |
| 362 | 362 | } |
| 363 | 363 | |
@@ -394,8 +394,8 @@ discard block |
||
| 394 | 394 | list($minSize, $maxSize) = $image->size; |
| 395 | 395 | |
| 396 | 396 | /* check for common upload errors */ |
| 397 | - if($image->error = $image->uploadErrors($files["error"])){
|
|
| 398 | - return ; |
|
| 397 | + if ($image->error = $image->uploadErrors($files["error"])) {
|
|
| 398 | + return; |
|
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | /* check image for valid mime types and return mime */ |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | if (!in_array($image->mime, $image->mimeTypes)) {
|
| 406 | 406 | $ext = implode(", ", $image->mimeTypes);
|
| 407 | 407 | $image->error = sprintf($this->error_messages['mime_type'], $ext); |
| 408 | - return ; |
|
| 408 | + return; |
|
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | /* check image size based on the settings */ |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | $min = intval($minSize / 1000) ?: 1; $max = intval($maxSize / 1000); |
| 414 | 414 | |
| 415 | 415 | $image->error = sprintf($this->error_messages['file_size'], $min, $max); |
| 416 | - return ; |
|
| 416 | + return; |
|
| 417 | 417 | } |
| 418 | 418 | |
| 419 | 419 | /* check image dimension */ |
@@ -421,16 +421,16 @@ discard block |
||
| 421 | 421 | |
| 422 | 422 | if ($image->height > $allowedHeight || $image->width > $allowedWidth) {
|
| 423 | 423 | $image->error = sprintf($this->error_messages['dimensions'], $allowedHeight, $allowedWidth); |
| 424 | - return ; |
|
| 424 | + return; |
|
| 425 | 425 | } |
| 426 | 426 | |
| 427 | - if($image->height < 4 || $image->width < 4){
|
|
| 427 | + if ($image->height < 4 || $image->width < 4) {
|
|
| 428 | 428 | $image->error = $this->error_messages['too_small']; |
| 429 | - return ; |
|
| 429 | + return; |
|
| 430 | 430 | } |
| 431 | 431 | |
| 432 | 432 | /* set and get folder name */ |
| 433 | - $image->fullPath = $image->location. "/" . $image->name . "." . $image->mime; |
|
| 433 | + $image->fullPath = $image->location."/".$image->name.".".$image->mime; |
|
| 434 | 434 | |
| 435 | 435 | /* gather image info for json storage */ |
| 436 | 436 | $image->serialize = array( |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | |
| 453 | - $image->error = $this->error_messages['unknown']; |
|
| 453 | + $image->error = $this->error_messages['unknown']; |
|
| 454 | 454 | return false; |
| 455 | 455 | } |
| 456 | 456 | |
@@ -110,8 +110,7 @@ discard block |
||
| 110 | 110 | /** |
| 111 | 111 | * @param array $_files represents the $_FILES array passed as dependancy |
| 112 | 112 | */ |
| 113 | - public function __construct(array $_files = []) |
|
| 114 | - {
|
|
| 113 | + public function __construct(array $_files = []) { |
|
| 115 | 114 | $this->_files = $_files; |
| 116 | 115 | } |
| 117 | 116 | |
@@ -122,8 +121,7 @@ discard block |
||
| 122 | 121 | * |
| 123 | 122 | * @return bool|string |
| 124 | 123 | */ |
| 125 | - protected function getImageMime($tmp_name) |
|
| 126 | - {
|
|
| 124 | + protected function getImageMime($tmp_name) { |
|
| 127 | 125 | if (isset($this->imageMimes[exif_imagetype($tmp_name)])) {
|
| 128 | 126 | return $this->imageMimes [exif_imagetype($tmp_name)]; |
| 129 | 127 | } |
@@ -145,8 +143,7 @@ discard block |
||
| 145 | 143 | * |
| 146 | 144 | * @return bool|mixed |
| 147 | 145 | */ |
| 148 | - public function offsetGet($offset) |
|
| 149 | - {
|
|
| 146 | + public function offsetGet($offset) { |
|
| 150 | 147 | if ($offset == "error") {
|
| 151 | 148 | return $this->error; |
| 152 | 149 | } |
@@ -166,8 +163,7 @@ discard block |
||
| 166 | 163 | * |
| 167 | 164 | * @return $this |
| 168 | 165 | */ |
| 169 | - public function setName($isNameProvided = null) |
|
| 170 | - {
|
|
| 166 | + public function setName($isNameProvided = null) { |
|
| 171 | 167 | if ($isNameProvided) {
|
| 172 | 168 | $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING); |
| 173 | 169 | } |
@@ -182,8 +178,7 @@ discard block |
||
| 182 | 178 | * |
| 183 | 179 | * @return $this |
| 184 | 180 | */ |
| 185 | - public function setMime(array $fileTypes) |
|
| 186 | - {
|
|
| 181 | + public function setMime(array $fileTypes) { |
|
| 187 | 182 | $this->mimeTypes = $fileTypes; |
| 188 | 183 | return $this; |
| 189 | 184 | } |
@@ -196,8 +191,7 @@ discard block |
||
| 196 | 191 | * |
| 197 | 192 | * @return $this |
| 198 | 193 | */ |
| 199 | - public function setSize($min, $max) |
|
| 200 | - {
|
|
| 194 | + public function setSize($min, $max) { |
|
| 201 | 195 | $this->size = array($min, $max); |
| 202 | 196 | return $this; |
| 203 | 197 | } |
@@ -210,8 +204,7 @@ discard block |
||
| 210 | 204 | * |
| 211 | 205 | * @return $this |
| 212 | 206 | */ |
| 213 | - public function setLocation($dir = "bulletproof", $permission = 0666) |
|
| 214 | - {
|
|
| 207 | + public function setLocation($dir = "bulletproof", $permission = 0666) { |
|
| 215 | 208 | if (!file_exists($dir) && !is_dir($dir) && !$this->location) {
|
| 216 | 209 | $createFolder = @mkdir("" . $dir, (int) $permission, true);
|
| 217 | 210 | if (!$createFolder) {
|
@@ -232,8 +225,7 @@ discard block |
||
| 232 | 225 | * |
| 233 | 226 | * @return $this |
| 234 | 227 | */ |
| 235 | - public function setDimension($maxWidth, $maxHeight) |
|
| 236 | - {
|
|
| 228 | + public function setDimension($maxWidth, $maxHeight) { |
|
| 237 | 229 | $this->dimensions = array($maxWidth, $maxHeight); |
| 238 | 230 | return $this; |
| 239 | 231 | } |
@@ -245,8 +237,7 @@ discard block |
||
| 245 | 237 | * |
| 246 | 238 | * @return $this |
| 247 | 239 | */ |
| 248 | - public function setErrorMessages($new_error_messages) |
|
| 249 | - {
|
|
| 240 | + public function setErrorMessages($new_error_messages) { |
|
| 250 | 241 | if($new_array = array_replace_recursive($this->error_messages, $new_error_messages)) {
|
| 251 | 242 | $this->error_messages = $new_array; |
| 252 | 243 | }; |
@@ -258,8 +249,7 @@ discard block |
||
| 258 | 249 | * |
| 259 | 250 | * @return string |
| 260 | 251 | */ |
| 261 | - public function getName() |
|
| 262 | - {
|
|
| 252 | + public function getName() { |
|
| 263 | 253 | if (!$this->name) {
|
| 264 | 254 | return uniqid(true) . "_" . str_shuffle(implode(range("e", "q")));
|
| 265 | 255 | } |
@@ -272,8 +262,7 @@ discard block |
||
| 272 | 262 | * |
| 273 | 263 | * @return string |
| 274 | 264 | */ |
| 275 | - public function getFullPath() |
|
| 276 | - {
|
|
| 265 | + public function getFullPath() { |
|
| 277 | 266 | $this->fullPath = $this->location . "/" . $this->name . "." . $this->mime; |
| 278 | 267 | return $this->fullPath; |
| 279 | 268 | } |
@@ -283,8 +272,7 @@ discard block |
||
| 283 | 272 | * |
| 284 | 273 | * @return int |
| 285 | 274 | */ |
| 286 | - public function getSize() |
|
| 287 | - {
|
|
| 275 | + public function getSize() { |
|
| 288 | 276 | return (int) $this->_files["size"]; |
| 289 | 277 | } |
| 290 | 278 | |
@@ -293,8 +281,7 @@ discard block |
||
| 293 | 281 | * |
| 294 | 282 | * @return int |
| 295 | 283 | */ |
| 296 | - public function getHeight() |
|
| 297 | - {
|
|
| 284 | + public function getHeight() { |
|
| 298 | 285 | if ($this->height != null) {
|
| 299 | 286 | return $this->height; |
| 300 | 287 | } |
@@ -308,8 +295,7 @@ discard block |
||
| 308 | 295 | * |
| 309 | 296 | * @return int |
| 310 | 297 | */ |
| 311 | - public function getWidth() |
|
| 312 | - {
|
|
| 298 | + public function getWidth() { |
|
| 313 | 299 | if ($this->width != null) {
|
| 314 | 300 | return $this->width; |
| 315 | 301 | } |
@@ -323,8 +309,7 @@ discard block |
||
| 323 | 309 | * |
| 324 | 310 | * @return string |
| 325 | 311 | */ |
| 326 | - public function getLocation() |
|
| 327 | - {
|
|
| 312 | + public function getLocation() { |
|
| 328 | 313 | if(!$this->location){
|
| 329 | 314 | $this->setLocation(); |
| 330 | 315 | } |
@@ -337,8 +322,7 @@ discard block |
||
| 337 | 322 | * |
| 338 | 323 | * @return string |
| 339 | 324 | */ |
| 340 | - public function getJson() |
|
| 341 | - {
|
|
| 325 | + public function getJson() { |
|
| 342 | 326 | return json_encode($this->serialize); |
| 343 | 327 | } |
| 344 | 328 | |
@@ -347,8 +331,7 @@ discard block |
||
| 347 | 331 | * |
| 348 | 332 | * @return string |
| 349 | 333 | */ |
| 350 | - public function getMime() |
|
| 351 | - {
|
|
| 334 | + public function getMime() { |
|
| 352 | 335 | return $this->mime; |
| 353 | 336 | } |
| 354 | 337 | |
@@ -357,7 +340,7 @@ discard block |
||
| 357 | 340 | * |
| 358 | 341 | * @return string|bool |
| 359 | 342 | */ |
| 360 | - public function getError(){
|
|
| 343 | + public function getError() { |
|
| 361 | 344 | return $this->error != "" ? $this->error : false; |
| 362 | 345 | } |
| 363 | 346 | |
@@ -366,8 +349,7 @@ discard block |
||
| 366 | 349 | * |
| 367 | 350 | * @param $e int error constant |
| 368 | 351 | */ |
| 369 | - protected function uploadErrors($e) |
|
| 370 | - {
|
|
| 352 | + protected function uploadErrors($e) { |
|
| 371 | 353 | $errors = $this->error_messages['upload']; |
| 372 | 354 | return $errors[$e]; |
| 373 | 355 | } |
@@ -378,8 +360,7 @@ discard block |
||
| 378 | 360 | * |
| 379 | 361 | * @return $this|bool |
| 380 | 362 | */ |
| 381 | - public function upload() |
|
| 382 | - {
|
|
| 363 | + public function upload() { |
|
| 383 | 364 | /* modify variable names for convenience */ |
| 384 | 365 | $image = $this; |
| 385 | 366 | $files = $this->_files; |
@@ -462,8 +443,7 @@ discard block |
||
| 462 | 443 | * |
| 463 | 444 | * @return bool |
| 464 | 445 | */ |
| 465 | - public function moveUploadedFile($tmp_name, $destination) |
|
| 466 | - {
|
|
| 446 | + public function moveUploadedFile($tmp_name, $destination) { |
|
| 467 | 447 | return move_uploaded_file($tmp_name, $destination); |
| 468 | 448 | } |
| 469 | 449 | } |
