Merge pull request #1369 from tevin-otieno/max-upload

Admin can change max size for reports

Author: kamaulynder

application/controllers/admin/settings.php

@@ -63,6 +63,7 @@ public function site()
 			'allow_alerts' => '',
 			'allow_reports' => '',
 			'allow_comments' => '',
+			'max_upload_size' => '',
 			'allow_feed' => '',
 			'allow_feed_category' => '',
 			'feed_geolocation_user' => '',
@@ -108,6 +109,7 @@ public function site()
 			$post->add_rules('blocks_per_row','required','numeric');
 			$post->add_rules('allow_alerts','required','between[0,1]');
 			$post->add_rules('allow_reports','required','between[0,1]');
+			$post->add_rules('max_upload_size','length[0,50]', 'alpha_numeric');
 			$post->add_rules('allow_comments','required','between[0,2]');
 			$post->add_rules('allow_feed','required','between[0,1]');
 			$post->add_rules('allow_feed_category','required','between[0,1]');
@@ -264,6 +266,7 @@ public function site()
 				'allow_alerts' => $settings['allow_alerts'],
 				'allow_reports' => $settings['allow_reports'],
 				'allow_comments' => $settings['allow_comments'],
+				'max_upload_size' => $settings['max_upload_size'],
 				'allow_feed' => $settings['allow_feed'],
 				'allow_feed_category' => $settings['allow_feed_category'],
 				'feed_geolocation_user' => isset($settings['feed_geolocation_user']) ? $settings['feed_geolocation_user'] : null,

application/helpers/reports.php

@@ -110,7 +110,8 @@ public static function validate(array & $post)
 		}
 
 		// Validate photo uploads
-		$post->add_rules('incident_photo', 'upload::valid', 'upload::type[gif,jpg,png,jpeg]', 'upload::size[2M]');
+		$max_upload_size = Kohana::config('settings.max_upload_size');
+		$post->add_rules('incident_photo', 'upload::valid', 'upload::type[gif,jpg,png,jpeg]', "upload::size[".$max_upload_size."M]");
 
 
 		// Validate Personal Information

application/views/admin/settings/site.php

@@ -134,6 +134,13 @@
 							<span class="sel-holder">
 								<?php print form::dropdown('allow_reports', $yesno_array, $form['allow_reports']); ?>
 							</span>
+						</div>
+						 <!--Adding max file upload setting-->
+						<div class="row">
+						 <h4><a href="#" class="tooltip" title="<?php echo Kohana::lang("tooltips.settings_max_upload_size"); ?>"><?php echo Kohana::lang('settings.site.max_upload_size');?></a></h4>
+						 	<span class="sel-holder">
+						 		<?php print form::input('max_upload_size', $form['max_upload_size'], ' class="text long2"', 'id = max_upload_size'); ?>
+						 	</span>
 						</div>
 						<div class="row">
 							<h4><a href="#" class="tooltip" title="<?php echo Kohana::lang("tooltips.settings_allow_alerts"); ?>"><?php echo Kohana::lang('settings.site.allow_alerts');?></a></h4>

sql/upgrade117-118.sql

@@ -0,0 +1,5 @@
+-- Add max_upload_size as a setting
+INSERT into settings(`key`, `value`) values('max_upload_size', '10');
+
+-- UPDATE db_version
+UPDATE `settings` SET `value` = 118 WHERE `key` = 'db_version';

sql/ushahidi.sql

@@ -1401,7 +1401,9 @@ VALUES
   (63,'manually_approve_users','0'),
   (64,'enable_timeline','0'),
   (65,'feed_geolocation_user', ''),
-  (66,'allow_feed_category', '0');
+  (66,'allow_feed_category', '0'),
+  (67, 'max_upload_size', '10');
+
 -- --------------------------------------------------------
 
 /**

themes/default/views/reports/submit.php

@@ -293,6 +293,7 @@
 				<!-- Photo Fields -->
 				<div id="divPhoto" class="report_row">
 					<h4><?php echo Kohana::lang('ui_main.reports_photos'); ?></h4>
+					<span class="allowed-html"><?php echo Kohana::lang('ui_main.maximum_filesize'),": ", Kohana::config('settings.max_upload_size'), "Mb"; ?></span>
 					<?php 
 						// Initialize the counter
 						$i = (empty($form['incident_photo']['name'][0])) ? 1 : 0;