mirror/php-cimage
1
0
Fork 0
mirror of https://github.com/mosbth/cimage.git synced 2025-08-06 16:16:39 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ascii

Browse Source
This commit is contained in:
Mikael Roos
2015-09-01 16:49:30 +02:00
parent c94027a752 cf8bb8973d
commit d8090e7531
7 changed files with 194 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
CHttpGet.php
View File

@@ -21,6 +21,33 @@ class CHttpGet
/**
* Build an encoded url.
*
* @param string $baseUrl This is the original url which will be merged.
* @param string $merge Thse parts should be merged into the baseUrl,
* the format is as parse_url.
*
* @return string $url as the modified url.
*/
public function buildUrl($baseUrl, $merge)
{
$parts = parse_url($baseUrl);
$parts = array_merge($parts, $merge);
$url = $parts['scheme'];
$url .= "://";
$url .= $parts['host'];
$url .= isset($parts['port'])
? ":" . $parts['port']
: "" ;
$url .= $parts['path'];
return $url;
}
/** /**
* Set the url for the request. * Set the url for the request.
* *
@@ -30,6 +57,18 @@ class CHttpGet
*/ */
public function setUrl($url) public function setUrl($url)
{ {
$parts = parse_url($url);
$path = "";
if (isset($parts['path'])) {
$pathParts = explode('/', $parts['path']);
unset($pathParts[0]);
foreach ($pathParts as $value) {
$path .= "/" . rawurlencode($value);
}
}
$url = $this->buildUrl($url, array("path" => $path));
$this->request['url'] = $url; $this->request['url'] = $url;
return $this; return $this;
} }
@@ -93,6 +132,8 @@ class CHttpGet
* *
* @param boolean $debug set to true to dump headers. * @param boolean $debug set to true to dump headers.
* *
* @throws Exception when curl fails to retrieve url.
*
* @return boolean * @return boolean
*/ */
public function doGet($debug = false) public function doGet($debug = false)
@@ -115,7 +156,7 @@ class CHttpGet
$response = curl_exec($ch); $response = curl_exec($ch);
if (!$response) { if (!$response) {
return false; throw new Exception("Failed retrieving url, details follows: " . curl_error($ch));
} }
$headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE); $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);

6
CRemoteImage.php
View File

@@ -147,7 +147,7 @@ class CRemoteImage
*/ */
public function setHeaderFields() public function setHeaderFields()
{ {
$this->http->setHeader("User-Agent", "CImage/0.7.0 (PHP/". phpversion() . " cURL)"); $this->http->setHeader("User-Agent", "CImage/0.7.2 (PHP/". phpversion() . " cURL)");
$this->http->setHeader("Accept", "image/jpeg,image/png,image/gif"); $this->http->setHeader("Accept", "image/jpeg,image/png,image/gif");
if ($this->useCache) { if ($this->useCache) {
@@ -226,6 +226,8 @@ class CRemoteImage
* *
* @param string $url a remote url. * @param string $url a remote url.
* *
* @throws Exception when status code does not match 200 or 304.
*
* @return string as path to downloaded file or false if failed. * @return string as path to downloaded file or false if failed.
*/ */
public function download($url) public function download($url)
@@ -258,7 +260,7 @@ class CRemoteImage
return $this->updateCacheDetails(); return $this->updateCacheDetails();
} }
return false; throw new Exception("Unknown statuscode when downloading remote image: " . $this->status);
} }

6
REVISION.md
View File

@@ -5,6 +5,12 @@ Revision history
[![Build Status](https://scrutinizer-ci.com/g/mosbth/cimage/badges/build.png?b=master)](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/master) [![Build Status](https://scrutinizer-ci.com/g/mosbth/cimage/badges/build.png?b=master)](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/master)
v0.7.2 (2015-08-17)
-------------------------------------
* Allow space in remote filenames, fix #98.
v0.7.1 (2015-07-25) v0.7.1 (2015-07-25)
------------------------------------- -------------------------------------

2
webroot/img.php
View File

@@ -8,7 +8,7 @@
* *
*/ */
$version = "v0.7.1 (2015-07-25)"; $version = "v0.7.2 (2015-08-17)";

51
webroot/imgd.php
View File

@@ -58,6 +58,33 @@ class CHttpGet
/**
* Build an encoded url.
*
* @param string $baseUrl This is the original url which will be merged.
* @param string $merge Thse parts should be merged into the baseUrl,
* the format is as parse_url.
*
* @return string $url as the modified url.
*/
public function buildUrl($baseUrl, $merge)
{
$parts = parse_url($baseUrl);
$parts = array_merge($parts, $merge);
$url = $parts['scheme'];
$url .= "://";
$url .= $parts['host'];
$url .= isset($parts['port'])
? ":" . $parts['port']
: "" ;
$url .= $parts['path'];
return $url;
}
/** /**
* Set the url for the request. * Set the url for the request.
* *
@@ -67,6 +94,18 @@ class CHttpGet
*/ */
public function setUrl($url) public function setUrl($url)
{ {
$parts = parse_url($url);
$path = "";
if (isset($parts['path'])) {
$pathParts = explode('/', $parts['path']);
unset($pathParts[0]);
foreach ($pathParts as $value) {
$path .= "/" . rawurlencode($value);
}
}
$url = $this->buildUrl($url, array("path" => $path));
$this->request['url'] = $url; $this->request['url'] = $url;
return $this; return $this;
} }
@@ -130,6 +169,8 @@ class CHttpGet
* *
* @param boolean $debug set to true to dump headers. * @param boolean $debug set to true to dump headers.
* *
* @throws Exception when curl fails to retrieve url.
*
* @return boolean * @return boolean
*/ */
public function doGet($debug = false) public function doGet($debug = false)
@@ -152,7 +193,7 @@ class CHttpGet
$response = curl_exec($ch); $response = curl_exec($ch);
if (!$response) { if (!$response) {
return false; throw new Exception("Failed retrieving url, details follows: " . curl_error($ch));
} }
$headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE); $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
@@ -435,7 +476,7 @@ class CRemoteImage
*/ */
public function setHeaderFields() public function setHeaderFields()
{ {
$this->http->setHeader("User-Agent", "CImage/0.7.0 (PHP/". phpversion() . " cURL)"); $this->http->setHeader("User-Agent", "CImage/0.7.2 (PHP/". phpversion() . " cURL)");
$this->http->setHeader("Accept", "image/jpeg,image/png,image/gif"); $this->http->setHeader("Accept", "image/jpeg,image/png,image/gif");
if ($this->useCache) { if ($this->useCache) {
@@ -514,6 +555,8 @@ class CRemoteImage
* *
* @param string $url a remote url. * @param string $url a remote url.
* *
* @throws Exception when status code does not match 200 or 304.
*
* @return string as path to downloaded file or false if failed. * @return string as path to downloaded file or false if failed.
*/ */
public function download($url) public function download($url)
@@ -546,7 +589,7 @@ class CRemoteImage
return $this->updateCacheDetails(); return $this->updateCacheDetails();
} }
return false; throw new Exception("Unknown statuscode when downloading remote image: " . $this->status);
} }
@@ -3101,7 +3144,7 @@ class CWhitelist
* *
*/ */
$version = "v0.7.1 (2015-07-25)"; $version = "v0.7.2 (2015-08-17)";

51
webroot/imgp.php
View File

@@ -58,6 +58,33 @@ class CHttpGet
/**
* Build an encoded url.
*
* @param string $baseUrl This is the original url which will be merged.
* @param string $merge Thse parts should be merged into the baseUrl,
* the format is as parse_url.
*
* @return string $url as the modified url.
*/
public function buildUrl($baseUrl, $merge)
{
$parts = parse_url($baseUrl);
$parts = array_merge($parts, $merge);
$url = $parts['scheme'];
$url .= "://";
$url .= $parts['host'];
$url .= isset($parts['port'])
? ":" . $parts['port']
: "" ;
$url .= $parts['path'];
return $url;
}
/** /**
* Set the url for the request. * Set the url for the request.
* *
@@ -67,6 +94,18 @@ class CHttpGet
*/ */
public function setUrl($url) public function setUrl($url)
{ {
$parts = parse_url($url);
$path = "";
if (isset($parts['path'])) {
$pathParts = explode('/', $parts['path']);
unset($pathParts[0]);
foreach ($pathParts as $value) {
$path .= "/" . rawurlencode($value);
}
}
$url = $this->buildUrl($url, array("path" => $path));
$this->request['url'] = $url; $this->request['url'] = $url;
return $this; return $this;
} }
@@ -130,6 +169,8 @@ class CHttpGet
* *
* @param boolean $debug set to true to dump headers. * @param boolean $debug set to true to dump headers.
* *
* @throws Exception when curl fails to retrieve url.
*
* @return boolean * @return boolean
*/ */
public function doGet($debug = false) public function doGet($debug = false)
@@ -152,7 +193,7 @@ class CHttpGet
$response = curl_exec($ch); $response = curl_exec($ch);
if (!$response) { if (!$response) {
return false; throw new Exception("Failed retrieving url, details follows: " . curl_error($ch));
} }
$headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE); $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
@@ -435,7 +476,7 @@ class CRemoteImage
*/ */
public function setHeaderFields() public function setHeaderFields()
{ {
$this->http->setHeader("User-Agent", "CImage/0.7.0 (PHP/". phpversion() . " cURL)"); $this->http->setHeader("User-Agent", "CImage/0.7.2 (PHP/". phpversion() . " cURL)");
$this->http->setHeader("Accept", "image/jpeg,image/png,image/gif"); $this->http->setHeader("Accept", "image/jpeg,image/png,image/gif");
if ($this->useCache) { if ($this->useCache) {
@@ -514,6 +555,8 @@ class CRemoteImage
* *
* @param string $url a remote url. * @param string $url a remote url.
* *
* @throws Exception when status code does not match 200 or 304.
*
* @return string as path to downloaded file or false if failed. * @return string as path to downloaded file or false if failed.
*/ */
public function download($url) public function download($url)
@@ -546,7 +589,7 @@ class CRemoteImage
return $this->updateCacheDetails(); return $this->updateCacheDetails();
} }
return false; throw new Exception("Unknown statuscode when downloading remote image: " . $this->status);
} }
@@ -3101,7 +3144,7 @@ class CWhitelist
* *
*/ */
$version = "v0.7.1 (2015-07-25)"; $version = "v0.7.2 (2015-08-17)";

51
webroot/imgs.php
View File

@@ -58,6 +58,33 @@ class CHttpGet
/**
* Build an encoded url.
*
* @param string $baseUrl This is the original url which will be merged.
* @param string $merge Thse parts should be merged into the baseUrl,
* the format is as parse_url.
*
* @return string $url as the modified url.
*/
public function buildUrl($baseUrl, $merge)
{
$parts = parse_url($baseUrl);
$parts = array_merge($parts, $merge);
$url = $parts['scheme'];
$url .= "://";
$url .= $parts['host'];
$url .= isset($parts['port'])
? ":" . $parts['port']
: "" ;
$url .= $parts['path'];
return $url;
}
/** /**
* Set the url for the request. * Set the url for the request.
* *
@@ -67,6 +94,18 @@ class CHttpGet
*/ */
public function setUrl($url) public function setUrl($url)
{ {
$parts = parse_url($url);
$path = "";
if (isset($parts['path'])) {
$pathParts = explode('/', $parts['path']);
unset($pathParts[0]);
foreach ($pathParts as $value) {
$path .= "/" . rawurlencode($value);
}
}
$url = $this->buildUrl($url, array("path" => $path));
$this->request['url'] = $url; $this->request['url'] = $url;
return $this; return $this;
} }
@@ -130,6 +169,8 @@ class CHttpGet
* *
* @param boolean $debug set to true to dump headers. * @param boolean $debug set to true to dump headers.
* *
* @throws Exception when curl fails to retrieve url.
*
* @return boolean * @return boolean
*/ */
public function doGet($debug = false) public function doGet($debug = false)
@@ -152,7 +193,7 @@ class CHttpGet
$response = curl_exec($ch); $response = curl_exec($ch);
if (!$response) { if (!$response) {
return false; throw new Exception("Failed retrieving url, details follows: " . curl_error($ch));
} }
$headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE); $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
@@ -435,7 +476,7 @@ class CRemoteImage
*/ */
public function setHeaderFields() public function setHeaderFields()
{ {
$this->http->setHeader("User-Agent", "CImage/0.7.0 (PHP/". phpversion() . " cURL)"); $this->http->setHeader("User-Agent", "CImage/0.7.2 (PHP/". phpversion() . " cURL)");
$this->http->setHeader("Accept", "image/jpeg,image/png,image/gif"); $this->http->setHeader("Accept", "image/jpeg,image/png,image/gif");
if ($this->useCache) { if ($this->useCache) {
@@ -514,6 +555,8 @@ class CRemoteImage
* *
* @param string $url a remote url. * @param string $url a remote url.
* *
* @throws Exception when status code does not match 200 or 304.
*
* @return string as path to downloaded file or false if failed. * @return string as path to downloaded file or false if failed.
*/ */
public function download($url) public function download($url)
@@ -546,7 +589,7 @@ class CRemoteImage
return $this->updateCacheDetails(); return $this->updateCacheDetails();
} }
return false; throw new Exception("Unknown statuscode when downloading remote image: " . $this->status);
} }
@@ -3101,7 +3144,7 @@ class CWhitelist
* *
*/ */
$version = "v0.7.1 (2015-07-25)"; $version = "v0.7.2 (2015-08-17)";