diff options
| author | Cash Costello <cash.costello@gmail.com> | 2009-05-13 00:32:08 +0000 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2009-05-13 00:32:08 +0000 |
| commit | a80882a24895f9e2fd7447ca46d089d94d217c46 (patch) | |
| tree | 6ac1955e7f69ef426028981ab441a9f16276fb96 | |
| parent | f270541e427fddcfa7afcda0944277d825cafdfd (diff) | |
| download | elgg-a80882a24895f9e2fd7447ca46d089d94d217c46.tar.gz elgg-a80882a24895f9e2fd7447ca46d089d94d217c46.tar.bz2 | |
image sizes are now defined in the settings object
| -rw-r--r-- | actions/upload.php | 33 | ||||
| -rw-r--r-- | settings.php | 16 |
2 files changed, 43 insertions, 6 deletions
diff --git a/actions/upload.php b/actions/upload.php index de7c35324..b31921483 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -67,15 +67,24 @@ //TODO: This code needs a complete rewrite - hardcoded to ~2.5 MB
if (filesize($file->getFilenameOnFilestore())<= 2500000) {
try {
- $thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false);
+ $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(),
+ $CONFIG->tidypics->image_large_width,
+ $CONFIG->tidypics->image_large_height,
+ false);
} catch (Exception $e) { $thumblarge = false; }
try {
- $thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true);
+ $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(),
+ $CONFIG->tidypics->image_small_width,
+ $CONFIG->tidypics->image_small_height,
+ true);
} catch (Exception $e) { $thumbsmall = false; }
try {
- $thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true);
+ $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(),
+ $CONFIG->tidypics->image_thumb_width,
+ $CONFIG->tidypics->image_thumb_height,
+ true);
} catch (Exception $e) { $thumbnail = false; }
}
@@ -127,13 +136,25 @@ $username = $user->username;
try {
- $thumblarge = tp_resize($file->getFilenameOnFilestore(), "largethumb", 600, 600, false);
+ $thumblarge = tp_resize($file->getFilenameOnFilestore(),
+ "largethumb",
+ $CONFIG->tidypics->image_large_width,
+ $CONFIG->tidypics->image_large_height,
+ false);
} catch (Exception $e) { $thumblarge = false; }
try {
- $thumbsmall = tp_resize($file->getFilenameOnFilestore(), "smallthumb", 153, 153, true);
+ $thumbsmall = tp_resize($file->getFilenameOnFilestore(),
+ "smallthumb",
+ $CONFIG->tidypics->image_small_width,
+ $CONFIG->tidypics->image_small_height,
+ true);
} catch (Exception $e) { $thumbsmall = false; }
try {
- $thumbnail = tp_resize($file->getFilenameOnFilestore(), "thumb", 60, 60, true);
+ $thumbnail = tp_resize($file->getFilenameOnFilestore(),
+ "thumb",
+ $CONFIG->tidypics->image_thumb_width,
+ $CONFIG->tidypics->image_thumb_height,
+ true);
} catch (Exception $e) { $thumbnail = false; }
if ($thumbnail) {
diff --git a/settings.php b/settings.php index a45d44034..0367eebff 100644 --- a/settings.php +++ b/settings.php @@ -1,2 +1,18 @@ <?php
+
+/////////////////////////////////////////////////////////////////////
+// Image sizes - Tidypics makes 3 views of an image:
+// Large - displayed when viewing the image alone
+// Small - displayed on an album page
+// Thumb - used for the activity log
+// There is also the original image that is available for download
+ $CONFIG->tidypics->image_large_width = 600;
+ $CONFIG->tidypics->image_large_height = 600;
+
+ $CONFIG->tidypics->image_small_width = 153;
+ $CONFIG->tidypics->image_small_height = 153;
+
+ $CONFIG->tidypics->image_thumb_width = 60;
+ $CONFIG->tidypics->image_thumb_height = 60;
+
?>
\ No newline at end of file |