WIP

ushahidi · Jul 5, 2017 · 2062e61 · 2062e61
1 parent 78ffe17
commit 2062e61
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/src/App/Formatter/JSON.php b/src/App/Formatter/JSON.php
@@ -21,8 +21,7 @@ class JSON implements Formatter, OutputFormatter
 	protected function getOptions()
 	{
 		// Are we in development environment?
-		$dev_env = Kohana::$environment === Kohana::DEVELOPMENT;
-		return $dev_env ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : null;
+		return env('APP_DEBUG', false) ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : null;
 	}
 
 	// Formatter

diff --git a/src/App/Formatter/Media.php b/src/App/Formatter/Media.php
@@ -22,10 +22,10 @@ class Media extends API
 	protected function addMetadata(array $data, Entity $media)
 	{
 		// Set image dimensions from the config file
-		$medium_width     = Kohana::$config->load('media.image_medium_width');
-		$medium_height    = Kohana::$config->load('media.image_medium_height');
-		$thumbnail_width  = Kohana::$config->load('media.image_thumbnail_width');
-		$thumbnail_height = Kohana::$config->load('media.image_thumbnail_height');
+		// $medium_width     = Kohana::$config->load('media.image_medium_width');
+		// $medium_height    = Kohana::$config->load('media.image_medium_height');
+		// $thumbnail_width  = Kohana::$config->load('media.image_thumbnail_width');
+		// $thumbnail_height = Kohana::$config->load('media.image_thumbnail_height');
 
 		return $data + [
 			// Add additional URLs and sizes

diff --git a/src/App/Listener/PostSetListener.php b/src/App/Listener/PostSetListener.php
@@ -34,7 +34,6 @@ public function handle(EventInterface $event, $set_id = null, $post_id = null)
 			'set'  => $set_id,
 			'post' => $post_id
 		];
-
 		$entity = $this->repo->getEntity();
 		$entity->setState($state);
 		$this->repo->create($entity);

diff --git a/src/App/Repository/Config/data-provider.php b/src/App/Repository/Config/data-provider.php
@@ -11,10 +11,15 @@
 
 return array(
 	'default_providers' => array(
-		Message_Type::SMS => 'smssync',
-		Message_Type::IVR => false,
-		Message_Type::EMAIL => 'email',
-		Message_Type::TWITTER => 'twitter'
+		// Message_Type::SMS => 'smssync',
+		// Message_Type::IVR => false,
+		// Message_Type::EMAIL => 'email',
+		// Message_Type::TWITTER => 'twitter'
+
+		'sms' => 'smssync',
+		'ivr' => false,
+		'email' => 'email',
+		'twitter' => 'twitter'
 	),
 	'providers' => array(
 		// List of data providers key=provider value=enabled

diff --git a/application/media/images/smssync.png → tests/datasets/ushahidi/smssync.png b/application/media/images/smssync.png → tests/datasets/ushahidi/smssync.png
diff --git a/application/media/test.geojson → tests/datasets/ushahidi/test.geojson b/application/media/test.geojson → tests/datasets/ushahidi/test.geojson