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

2011-08-11 Sergio Martin <sergio.martin@artica.es> 

* include/config_process.php
	godmode/setup/setup_visuals.php: Fixed flash charts setup editor
	and user editor and set priority between both



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4722 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-08-11 18:06:54 +00:00
parent c7cc8a5bdf
commit 5e8478b5fe
3 changed files with 12 additions and 3 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 @@
2011-08-11 Sergio Martin <sergio.martin@artica.es>
* include/config_process.php
godmode/setup/setup_visuals.php: Fixed flash charts setup editor
and user editor and set priority between both
2011-08-11 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php

4
pandora_console/godmode/setup/setup_visuals.php
View File

@ -86,8 +86,8 @@ $table->data[11][0] = __('Font size');
$table->data[11][1] = html_print_select(range(1, 15), 'font_size', $config["font_size"], '', '', 0, true);
$table->data[12][0] = __('Flash charts');
$table->data[12][1] = __('Yes').'&nbsp;'.html_print_radio_button ('flash_charts', 1, '', $config["flash_charts"], true).'&nbsp;&nbsp;';
$table->data[12][1] .= __('No').'&nbsp;'.html_print_radio_button ('flash_charts', 0, '', $config["flash_charts"], true);
$table->data[12][1] = __('Yes').'&nbsp;'.html_print_radio_button ('flash_charts', 1, '', $config["global_flash_charts"], true).'&nbsp;&nbsp;';
$table->data[12][1] .= __('No').'&nbsp;'.html_print_radio_button ('flash_charts', 0, '', $config["global_flash_charts"], true);
if (!defined ('PANDORA_ENTERPRISE')){
$table->data[13][0] = __('Custom logo') . ui_print_help_icon("custom_logo", true);

5
pandora_console/include/config_process.php
View File

@ -95,8 +95,9 @@ if ((!isset($config["timezone"])) OR ($config["timezone"] == "")){
date_default_timezone_set($config["timezone"]);
// Save the global block size
// Save the global values
$config["global_block_size"] = $config["block_size"];
$config["global_flash_charts"] = $config["flash_charts"];
if (isset ($config['id_user'])){
$userinfo = get_user_info ($config['id_user']);
@ -104,8 +105,10 @@ if (isset ($config['id_user'])){
// If block_size or flash_chart are provided then override global settings
if (!empty($userinfo["block_size"]) && ($userinfo["block_size"] != 0))
$config["block_size"] = $userinfo["block_size"];
if ($userinfo["flash_chart"] != -1)
$config["flash_charts"] = $userinfo["flash_chart"];
html_debug_print($config["flash_charts"]);
// Each user could have it's own timezone)
if (isset($userinfo["timezone"])) {