Merge pull request #371 from fermionic/option-to-limit-max-image-pixel-length

add ability to set maximum pixel length of uploaded pictures

2 files changed, 24 insertions, 0 deletions

diff --git a/boot.php b/boot.php
index 1983f44e7..4c42f19a7 100644
--- a/boot.php
+++ b/boot.php
@@ -34,6 +34,24 @@ define ( 'JPEG_QUALITY',            100  );
  */
 define ( 'PNG_QUALITY',             8  );
 
+/**
+ *
+ * An alternate way of limiting picture upload sizes. Specify the maximum pixel
+ * length that pictures are allowed to be (for non-square pictures, it will apply
+ * to the longest side). Pictures longer than this length will be resized to be
+ * this length (on the longest side, the other side will be scaled appropriately).
+ * Modify this value using
+ *
+ *    $a->config['system']['max_image_length'] = n;
+ *
+ * in .htconfig.php
+ *
+ * If you don't want to set a maximum length, set to -1. The default value is
+ * defined by 'MAX_IMAGE_LENGTH' below.
+ *
+ */
+define ( 'MAX_IMAGE_LENGTH',        -1  );
+
 
 /**
  * Not yet used
diff --git a/mod/photos.php b/mod/photos.php
index ea4d7f81f..624f0bdca 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -743,6 +743,12 @@ function photos_post(&$a) {
 	$ph->orient($src);
 	@unlink($src);
 
+	$max_length = get_config('system','max_image_length');
+	if(! $max_length)
+		$max_length = MAX_IMAGE_LENGTH;
+	if($max_length > 0)
+		$ph->scaleImage($max_length);
+
 	$width  = $ph->getWidth();
 	$height = $ph->getHeight();