From 8aeda2e4822d7d11dc57d513a1ed271ef47664e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Trob=C3=A4ck?= <martintk@axis.com>
Date: Mon, 28 Sep 2015 16:46:34 +0200
Subject: [PATCH 1/2] Increased readability

---
 api.php | 84 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 47 insertions(+), 37 deletions(-)

diff --git a/api.php b/api.php
index 5a8bf30..f331a7f 100644
--- a/api.php
+++ b/api.php
@@ -6,63 +6,74 @@ $js = $_GET['js'];
 $resizewidth = $_GET['width'];
 $cache = preg_replace("/[^A-Za-z0-9 ]/", '', $_GET['cache']);
 $onfail = rawurldecode($_GET['onfail']);
-if(!$onfail)
+
+if (!$onfail) {
 	$onfail = 'https://http2pic.haschek.at/img/failed.jpg';
+}
+
 $url = rawurldecode($_GET['url']);
-if(isBase64($url))
+if (isBase64($url)) {
 	$url = base64_decode($url);
+}
 
-if(!$timeout || !is_numeric($timeout) || ($timeout>30 || $timeout<1))
+if (!$timeout || !is_numeric($timeout) || ($timeout>30 || $timeout<1)) {
 	$timeout = 10;
+}
 
-if($viewport)
-{
-	$a=explode('x', $viewport);
-	$w = $a[0];
-	$h = $a[1];
-	if($w)
-		$vp = "--width $w ";
-	if($h)
-		$vp.= "--height $h ";
-
+if ($viewport) {
+	$a = explode('x', $viewport);
+	$width = $a[0];
+	$height = $a[1];
+	if ($width) {
+		$vp = "--width $width ";
+	}
+	if ($height) {
+		$vp.= "--height $height ";
+	}
 }	
 
-if($js=='no')
+if ($js == 'no') {
 	$jsp = '-n ';
+}
 
 switch ($type) {
 	case 'png':
-		$ft = $type;
+		$fileType = $type;
 		header('Content-Type: image/png');
-	break;
-
+		break;
 	case 'jpg':
 	case 'jpeg':
 	default:
-		$ft = 'jpg';
+		$fileType = 'jpg';
 		header('Content-Type: image/jpeg');
 }
 
 
 
-$hash = $cache.'-'.preg_replace("/[^A-Za-z0-9 ]/", '', $url).'.'.$ft;
-if(!$cache)
+$hash = $cache.'-'.preg_replace("/[^A-Za-z0-9 ]/", '', $url).'.'.$fileType;
+
+if (!$cache) {
 	$hash = md5(time().rand(1,2000)).$hash;
+}
 
-if(!is_dir(__DIR__.'/cache/'))
+if (!is_dir(__DIR__.'/cache/')) {
 	mkdir(__DIR__.'/cache/');
+}
+
 $file = __DIR__.'/cache/'.$hash;
-if(!file_exists($file))
-	shell_exec('timeout '.$timeout.' /usr/sbin/wkhtmltoimage '.escapeshellcmd($vp.$jsp.'-f '.$ft.' '.$url.' '.$file));
 
-if(filesize($file)==0 && $onfail)
+if (!file_exists($file)) {
+	shell_exec('timeout '.$timeout.' /usr/sbin/wkhtmltoimage '.escapeshellcmd($vp.$jsp.'-f '.$fileType.' '.$url.' '.$file));
+}
+
+if (filesize($file)==0 && $onfail) {
 	@file_put_contents($file, file_get_contents($onfail));
+}
 
-if($resizewidth)
-{
+if ($resizewidth) {
 	list($width_orig, $height_orig) = getimagesize($file);
-	if($width_orig!=$resizewidth) 
-	{
+
+	if ($width_orig!=$resizewidth) {
 		$ratio_orig = $width_orig/$height_orig;
 		$height = $resizewidth/$ratio_orig;
 
@@ -75,13 +86,11 @@ if($resizewidth)
 }
 
 
-if($ft=='jpg')
-{
+if ($fileType === 'jpg') {
 	$res = imagecreatefromjpeg($file);
 	imagejpeg($res,NULL,100);
 }
-else if($ft=='png')
-{
+else if ($fileType ==='png') {
 	$res = imagecreatefrompng($file);
 	imagepng($res,NULL,9);
 }
@@ -89,13 +98,14 @@ else if($ft=='png')
 
 imagedestroy($res);
 
-if(!$cache)
+if (!$cache) {
 	unlink($file);
+}
 
-function isBase64($data)
-{
-	if ( base64_encode(base64_decode($data, true)) === $data)
+function isBase64($data) {
+	if ( base64_encode(base64_decode($data, true)) === $data) {
 		return true;
-	else 
+	} else {
 		return false;
+	}
 }
\ No newline at end of file

From dca7348b4e68a5caf4d247e6f9647179e65e8949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Trob=C3=A4ck?= <martintk@axis.com>
Date: Mon, 28 Sep 2015 16:54:29 +0200
Subject: [PATCH 2/2] Further increase in readability

---
 api.php | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/api.php b/api.php
index f331a7f..6a0c5e3 100644
--- a/api.php
+++ b/api.php
@@ -16,19 +16,19 @@ if (isBase64($url)) {
 	$url = base64_decode($url);
 }
 
-if (!$timeout || !is_numeric($timeout) || ($timeout>30 || $timeout<1)) {
+if (!$timeout || !is_numeric($timeout) || ($timeout > 30 || $timeout < 1)) {
 	$timeout = 10;
 }
 
 if ($viewport) {
 	$a = explode('x', $viewport);
-	$width = $a[0];
-	$height = $a[1];
-	if ($width) {
-		$vp = "--width $width ";
+	$w = $a[0];
+	$h = $a[1];
+	if ($w) {
+		$vp = "--width $w ";
 	}
-	if ($height) {
-		$vp.= "--height $height ";
+	if ($h) {
+		$vp .= "--height $h ";
 	}
 }	
 
@@ -48,8 +48,6 @@ switch ($type) {
 		header('Content-Type: image/jpeg');
 }
 
-
-
 $hash = $cache.'-'.preg_replace("/[^A-Za-z0-9 ]/", '', $url).'.'.$fileType;
 
 if (!$cache) {
@@ -66,14 +64,14 @@ if (!file_exists($file)) {
 	shell_exec('timeout '.$timeout.' /usr/sbin/wkhtmltoimage '.escapeshellcmd($vp.$jsp.'-f '.$fileType.' '.$url.' '.$file));
 }
 
-if (filesize($file)==0 && $onfail) {
+if (filesize($file) == 0 && $onfail) {
 	@file_put_contents($file, file_get_contents($onfail));
 }
 
 if ($resizewidth) {
 	list($width_orig, $height_orig) = getimagesize($file);
 
-	if ($width_orig!=$resizewidth) {
+	if ($width_orig != $resizewidth) {
 		$ratio_orig = $width_orig/$height_orig;
 		$height = $resizewidth/$ratio_orig;
 
@@ -87,25 +85,24 @@ if ($resizewidth) {
 
 
 if ($fileType === 'jpg') {
-	$res = imagecreatefromjpeg($file);
-	imagejpeg($res,NULL,100);
+	$result = imagecreatefromjpeg($file);
+	imagejpeg($result, NULL, 100);
 }
-else if ($fileType ==='png') {
-	$res = imagecreatefrompng($file);
-	imagepng($res,NULL,9);
+else if ($fileType === 'png') {
+	$result = imagecreatefrompng($file);
+	imagepng($result, NULL, 9);
 }
 
 
-imagedestroy($res);
+imagedestroy($result);
 
 if (!$cache) {
 	unlink($file);
 }
 
 function isBase64($data) {
-	if ( base64_encode(base64_decode($data, true)) === $data) {
+	if (base64_encode(base64_decode($data, true)) === $data) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 }
\ No newline at end of file