@@ -23,7 +23,7 @@ |
||
| 23 | 23 | |
| 24 | 24 | if ($folderName) { |
| 25 | 25 | $folderName = $dir; |
| 26 | - }else{ |
|
| 26 | + } else{ |
|
| 27 | 27 | $folderName = (int) ($photoid / $collectionNum); |
| 28 | 28 | $folderName++; |
| 29 | 29 | $folderName = $type.'/'.$folderName.'/'; |
@@ -59,13 +59,19 @@ |
||
| 59 | 59 | $defaultDimensions = $dimensions ? $dimensions : $GLOBALS['settings']['image'][$type]['dimensions']; |
| 60 | 60 | foreach ($defaultDimensions as $keys=>$dimension) |
| 61 | 61 | { |
| 62 | - if(!isset($dimension[2])) $dimension[2] = 100; // quality |
|
| 63 | - if(!isset($dimension[4])) $dimension[4] = 'jpg'; // quality |
|
| 62 | + if(!isset($dimension[2])) { |
|
| 63 | + $dimension[2] = 100; |
|
| 64 | + } |
|
| 65 | + // quality |
|
| 66 | + if(!isset($dimension[4])) { |
|
| 67 | + $dimension[4] = 'jpg'; |
|
| 68 | + } |
|
| 69 | + // quality |
|
| 64 | 70 | |
| 65 | 71 | $destUrl = $dest.'/'.getImageDirName($photoid,$type).getImageFileName($photoid,$keys,$type); |
| 66 | 72 | if(isset($dimension[3]) && $dimension[3] == true){ |
| 67 | 73 | $image = $this->zoomCrop($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]); |
| 68 | - }else { |
|
| 74 | + } else { |
|
| 69 | 75 | $image = $this->cropResize($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]); |
| 70 | 76 | } |
| 71 | 77 | // $image = $this->cropResize($src,trim($destUrl),$dimension[0], $dimension[1], $dimension[2],$dimension[4]); |