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

2013-04-22 Miguel de Dios <miguel.dedios@artica.es> 

* operation/users/user_edit.php, include/functions_graph.php:
	improved the source code style.
	
	* mobile/operation/agent.php, mobile/operation/modules.php: somes
	fixes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8027 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-04-22 17:43:28 +00:00
parent 93db4748b3
commit 0994dcdbb7
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-04-22 Miguel de Dios <miguel.dedios@artica.es>
* operation/users/user_edit.php, include/functions_graph.php:
improved the source code style.
* mobile/operation/agent.php, mobile/operation/modules.php: somes
fixes.
2013-04-22 Mario Pulido <mario.pulido@artica.es> 2013-04-22 Mario Pulido <mario.pulido@artica.es>
* include/help/es/help_alerts.php, * include/help/es/help_alerts.php,

6
pandora_console/include/functions_graph.php
View File

@ -1371,9 +1371,9 @@ function graph_alert_status ($defined_alerts, $fired_alerts, $width = 300, $heig
// If any value is negative, truncate it to 0 // If any value is negative, truncate it to 0
function truncate_negatives(&$element) { function truncate_negatives(&$element) {
if($element < 0) { if ($element < 0) {
$element = 0; $element = 0;
} }
} }
/** /**

2
pandora_console/mobile/operation/agent.php
View File

@ -136,7 +136,7 @@ class Agent {
$modules = new Modules(); $modules = new Modules();
$filters = array('id_agent' => $this->id, 'all_modules' => true); $filters = array('id_agent' => $this->id, 'all_modules' => true, 'status' => -1);
$modules->setFilters($filters); $modules->setFilters($filters);
$modules->disabledColumns(array('agent')); $modules->disabledColumns(array('agent'));
$ui->contentBeginCollapsible(__('Modules')); $ui->contentBeginCollapsible(__('Modules'));

7
pandora_console/mobile/operation/modules.php
View File

@ -85,6 +85,9 @@ class Modules {
if (isset($filters['all_modules'])) { if (isset($filters['all_modules'])) {
$this->all_modules = $filters['all_modules']; $this->all_modules = $filters['all_modules'];
} }
if (isset($filters['status'])) {
$this->status = $filters['status'];
}
} }
public function disabledColumns($columns = null) { public function disabledColumns($columns = null) {
@ -517,7 +520,9 @@ class Modules {
$listModules = $this->getListModules($page); $listModules = $this->getListModules($page);
//$ui->debug($listModules, true); //$ui->debug($listModules, true);
html_debug_print("-----------", true);
html_debug_print($listModules, true);
html_debug_print("===========", true);
if ($listModules['total'] == 0) { if ($listModules['total'] == 0) {
$html = '<p style="color: #ff0000;">' . __('No modules') . '</p>'; $html = '<p style="color: #ff0000;">' . __('No modules') . '</p>';
if (!$return) { if (!$return) {

4
pandora_console/operation/users/user_edit.php
View File

@ -74,7 +74,7 @@ if (is_ajax ()){
} }
// Header // Header
if($meta) { if ($meta) {
user_meta_print_header(); user_meta_print_header();
$url = 'index.php?sec=advanced&amp;sec2=advanced/users_setup&amp;tab=user_edit'; $url = 'index.php?sec=advanced&amp;sec2=advanced/users_setup&amp;tab=user_edit';
} }
@ -283,7 +283,7 @@ else
$usr_groups = (users_get_groups($config['id_user'], 'AR', $display_all_group)); $usr_groups = (users_get_groups($config['id_user'], 'AR', $display_all_group));
$id_usr = $config['id_user']; $id_usr = $config['id_user'];
if(!$meta) { if (!$meta) {
$data = array(); $data = array();
$data[0] = __('Shortcut bar') . ui_print_help_tip(__('This will activate a shortcut bar with alerts, events, messages... information'), true); $data[0] = __('Shortcut bar') . ui_print_help_tip(__('This will activate a shortcut bar with alerts, events, messages... information'), true);
$data[1] = __('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true); $data[1] = __('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true);