tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Visual Console Refactor: bugfixes 

Former-commit-id: 09c2b268fd179f81f3041be774f199abe088b4f3
This commit is contained in:
Alejandro Gallardo Escobar 2019-04-23 09:56:02 +02:00
parent 8fc5951209
commit d6bd44d1c0
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/rest-api/models/VisualConsole/Items/Group.php
View File

@ -262,11 +262,7 @@ final class Group extends Item
// If the width or the height are equal to 0 we will extract them // If the width or the height are equal to 0 we will extract them
// from the real image size. // from the real image size.
if ((int) $data['width'] === 0 || (int) $data['height'] === 0) { if ((int) $data['width'] === 0 || (int) $data['height'] === 0) {
if (\is_metaconsole()) { $sizeImage = getimagesize($config['homedir'].'/'.$imagePath);
$imagePath = '../../'.$imagePath;
}
$sizeImage = getimagesize($imagePath);
$data['width'] = $sizeImage[0]; $data['width'] = $sizeImage[0];
$data['height'] = $sizeImage[1]; $data['height'] = $sizeImage[1];
} }

7
pandora_console/include/rest-api/models/VisualConsole/Items/Icon.php
View File

@ -118,12 +118,7 @@ final class Icon extends Item
// If the width or the height are equal to 0 we will extract them // If the width or the height are equal to 0 we will extract them
// from the real image size. // from the real image size.
if ((int) $data['width'] === 0 || (int) $data['height'] === 0) { if ((int) $data['width'] === 0 || (int) $data['height'] === 0) {
// Hack to retrieve the image from the metaconsole's index. $sizeImage = getimagesize($config['homedir'].'/'.$imagePath);
if (\is_metaconsole()) {
$imagePath = '../../'.$imagePath;
}
$sizeImage = getimagesize($imagePath);
$data['width'] = $sizeImage[0]; $data['width'] = $sizeImage[0];
$data['height'] = $sizeImage[1]; $data['height'] = $sizeImage[1];
} }

7
pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php
View File

@ -190,12 +190,7 @@ final class StaticGraph extends Item
// If the width or the height are equal to 0 we will extract them // If the width or the height are equal to 0 we will extract them
// from the real image size. // from the real image size.
if ((int) $data['width'] === 0 || (int) $data['height'] === 0) { if ((int) $data['width'] === 0 || (int) $data['height'] === 0) {
// Hack to retrieve the image from the metaconsole's index. $sizeImage = getimagesize($config['homedir'].'/'.$imagePath);
if (\is_metaconsole()) {
$imagePath = '../../'.$imagePath;
}
$sizeImage = getimagesize($imagePath);
$data['width'] = $sizeImage[0]; $data['width'] = $sizeImage[0];
$data['height'] = $sizeImage[1]; $data['height'] = $sizeImage[1];
} }