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

2010-07-12 Dario Rodriguez <dario.rodriguez@artica.es> 

* godmode/reporting/visual_console_builder.php: fixed error getting
	image size creating a map without background
	Fixes: #3014276



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2990 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2010-07-12 14:03:04 +00:00
parent 17cbecc5e8
commit 66801254f7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2010-07-12 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/reporting/visual_console_builder.php: fixed error getting
image size creating a map without background
Fixes: #3014276
2010-07-12 Miguel de Dios <miguel.dedios@artica.es> 2010-07-12 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/ver_agente.php: re-ordered the tabs. * operation/agentes/ver_agente.php: re-ordered the tabs.

4
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -51,7 +51,7 @@ switch ($activeTab) {
// If the background is changed the size is reseted // If the background is changed the size is reseted
$visualConsole = get_db_row_filter('tlayout', array('id' => $idVisualConsole)); $visualConsole = get_db_row_filter('tlayout', array('id' => $idVisualConsole));
$background_now = $visualConsole['background']; $background_now = $visualConsole['background'];
if($background_now != $background) { if($background_now != $background && $background) {
$sizeBackground = getimagesize($config['homedir'] . '/images/console/background/' . $background); $sizeBackground = getimagesize($config['homedir'] . '/images/console/background/' . $background);
$values['width'] = $sizeBackground[0]; $values['width'] = $sizeBackground[0];
$values['height'] = $sizeBackground[1]; $values['height'] = $sizeBackground[1];
@ -60,7 +60,7 @@ switch ($activeTab) {
switch ($action) { switch ($action) {
case 'update': case 'update':
$result = process_sql_update('tlayout', $values, array('id' => $idVisualConsole)); $result = process_sql_update('tlayout', $values, array('id' => $idVisualConsole));
if ($result !== false) { if ($result !== false && $values['background']) {
$action = 'edit'; $action = 'edit';
$statusProcessInDB = array('flag' => true, 'message' => '<h3 class="suc">'.__('Successfully update.').'</h3>'); $statusProcessInDB = array('flag' => true, 'message' => '<h3 class="suc">'.__('Successfully update.').'</h3>');
} }