Skip to content

Added static call to set imbo configuration and return null if no imbo-config is defined #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sgulseth wants to merge 6 commits into
base: imbo-integration
Choose a base branch
from
Open

Added static call to set imbo configuration and return null if no imbo-config is defined #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
129e9f3
Upgraded imboclient
Dec 7, 2015
d2f651a
Return null if imbo-config is not set
Dec 7, 2015
4b0ac1d
Added static function to set imbo config
Dec 7, 2015
17fe61c
Cast transformations to an array
Feb 2, 2016
ad04d59
Ensure the original user in the IMBO url is maintained when resizing
aptomaKetil Apr 11, 2016
432dc96
Merge pull request #2 from aptomaKetil/preserve-users
sgulseth Apr 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"require": {
"imbo/imboclient": "~1.0"
"imbo/imboclient": "~2.0"
},
"autoload": {
"classmap": [
Expand Down
38 changes: 29 additions & 9 deletions lib/core/DrPublishApiClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,16 +641,27 @@ public static function resizeImboImage($src, $width, $height)
{
$imboUrl = ImboImageUrl::factory($src);
$imageIdentifier = $imboUrl->getImageIdentifier();
$transformations = $imboUrl->getQuery()->get('t');

$imboUrl = self::getImboClient()->getImageUrl($imageIdentifier);
foreach ($transformations as $transformation) {
if (strpos($transformation, 'maxSize') === false) {
$imboUrl->addTransformation($transformation);
$transformations = (array) $imboUrl->getQuery()->get('t');
$imboClient = self::getImboClient();

if ($imboClient) {
$user = $imboUrl->getUser();
$originalUser = $imboClient->getUser();
if (!empty($user)) {
$imboClient->setUser($user);
}
$imboUrl = $imboClient->getImageUrl($imageIdentifier);
$imboClient->setUser($originalUser);
foreach ($transformations as $transformation) {
if (strpos($transformation, 'maxSize') === false) {
$imboUrl->addTransformation($transformation);
}
}

return $imboUrl->maxSize($width, $height)->resize($width);
}

return $imboUrl->maxSize($width, $height)->resize($width);
return null;
}

public static function setImboClient($imboClient) {
Expand All @@ -660,13 +671,22 @@ public static function setImboClient($imboClient) {
public static function getImboClient() {
if (!self::$imboClient) {
$imboConfig = self::getConfigOption('imbo');
$imboClient = ImboClient\ImboClient::factory($imboConfig);
self::setImboClient($imboClient);
if ($imboConfig) {
$imboClient = ImboClient\ImboClient::factory($imboConfig);
self::setImboClient($imboClient);
}
}

return self::$imboClient;
}

public static function setImboConfig($config) {
if (!is_array(self::$configs)) {
self::$configs = array();
}
self::$configs['imbo'] = $config;
}

public function getCurlInfo()
{
return $this->curlInfo;
Expand Down