diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 6687a0bd02..0f04acbad8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2010-05-06 Raúl Mateos + + * include/config*.php: Updated year. Updated build. + + * include/functions_*.php: Updated year. Clean Code. + 2010-05-06 Miguel de Dios * include/config.inc.php: fixed the operation require when the php file to @@ -859,7 +865,7 @@ 2010-04-05 Miguel de Dios * include/functions_ui.php: changed some parts of source code in the - functions "format_alert_row" for show column modules in general view. In the + functions "forma Raúl Mateos t_alert_row" for show column modules in general view. In the function "pagination" added the parameter $offset_name with default value 'offset' for to use several paginations in one page. diff --git a/pandora_console/include/config.inc.php b/pandora_console/include/config.inc.php index 87c573073b..e01c2f4c41 100644 --- a/pandora_console/include/config.inc.php +++ b/pandora_console/include/config.inc.php @@ -1,7 +1,7 @@ 'uid', //login -// 'lastname' => 'sn', //last (sur) name -// 'firstname' => 'givenname', //first (given) name -// 'fullname' => 'cn', //full (common) name +// 'id_user' => 'uid', //login +// 'lastname' => 'sn', //last (sur) name +// 'firstname' = 'givenname', //first (given) name +// 'fullname' => 'cn', //full (common) name // 'comments' => 'description', //comments - you can set this to anything -// 'last_contact' => 'lastlogin', //last login utimestamp or don't define -// 'email' => 'mail', //email - not necessary will default to empty -// 'phone' => 'phone', //phone +// 'last_contact' => 'lastlogin', //last login utimestamp or don't define +// 'email' => 'mail', //email - not necessary will default to empty +// 'phone' => 'phone', //phone // 'middlename' => 'mn', //not yet used except for representational purposes // 'registered' => 'created' //created utimestamp or don't define //); diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f0de96ae59..10daf51b18 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC10408'; // Remember is YYMMDD +$build_version = 'PC100506'; // Remember is YYMMDD $pandora_version = 'v3.1-dev'; /* Help to debug problems. Override global PHP configuration */ diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 5a321e7eee..73005013eb 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -1,7 +1,7 @@ $id_user, - "id_perfil" => $id_profile, - "id_grupo" => $id_group, + "id_usuario" => $id_user, + "id_perfil" => $id_profile, + "id_grupo" => $id_group, "assigned_by" => $assign ); @@ -442,8 +442,8 @@ function get_group_agents ($id_group = 0, $search = false, $case = "lower", $noA ////////////////LOG AJAX/////////////////////// /////////////////////////////////////////////// - //$log = fopen ( "/tmp/log_sql", "a"); - //fwrite ($log, $sql."\n\n"); + //$log = fopen ( "/tmp/log_sql", "a"); + //fwrite ($log, $sql."\n\n"); //fclose($log); /////////////////////////////////////////////// @@ -1798,7 +1798,7 @@ function get_db_row ($table, $field_search, $condition, $fields = false) { * Get the row of a table in the database using a complex filter. * * @param string Table to retrieve the data (warning: not cleaned) - * @param mixed Filters elements. It can be an indexed array + * @param mixed Filters elements. It can be an indexed array * (keys would be the field name and value the expected value, and would be * joined with an AND operator) or a string, including any SQL clause (without * the WHERE keyword). Example: @@ -1850,15 +1850,15 @@ function get_db_row_filter ($table, $filter, $fields = false, $where_join = 'AND */ function get_db_sql ($sql, $field = 0, $search_history_db = false) { - $result = get_db_all_rows_sql ($sql, $search_history_db); - if($result === false) - return false; - $ax = 0; - foreach ($result[0] as $f){ - if ($field == $ax) - return $f; - $ax++; - } + $result = get_db_all_rows_sql ($sql, $search_history_db); + if($result === false) + return false; + $ax = 0; + foreach ($result[0] as $f){ + if ($field == $ax) + return $f; + $ax++; + } } /** @@ -2214,9 +2214,9 @@ function get_db_all_fields_in_table ($table, $field = '', $condition = '', $orde * echo $sql; * * Will return: - * + * * UPDATE table SET `name` = "Name", `description` = "Long description" WHERE id=1 - * + * * * @param array Values to be formatted in an array indexed by the field name. * @@ -2437,7 +2437,7 @@ function get_agentmodule_status ($id_agentmodule = 0) { /** * Get the worst status of all modules of a given agent. * - * @param int Id agent to check. + * @param int Id agent to check. * * @return int Worst status of an agent for all of its modules. * The value -1 is returned in case the agent has exceed its interval. diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 48e1bf8310..bb6eb14f4c 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php index 216e7b278a..8df7277e18 100644 --- a/pandora_console/include/functions_extensions.php +++ b/pandora_console/include/functions_extensions.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or diff --git a/pandora_console/include/functions_fsgraph.php b/pandora_console/include/functions_fsgraph.php index 026e046a22..dec2f37f55 100644 --- a/pandora_console/include/functions_fsgraph.php +++ b/pandora_console/include/functions_fsgraph.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2009 Artica Soluciones Tecnologicas +// Copyright (c) 2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -29,18 +29,18 @@ function get_chart_code ($chart, $width, $height, $swf) { $random_number = rand (); $div_id = 'chart_div_' . $random_number; $chart_id = 'chart_' . $random_number; - $output = '
'; - $output .= ''; - return $output; + $output = '
'; + $output .= ''; + return $output; } // Returns a 3D bar chart @@ -62,7 +62,7 @@ function fs_3d_bar_chart ($data, $width, $height) { $chart->addChartData($value, 'name=' . clean_flash_string($name) . ';color=95BB04'); } - $chart->setChartParams('showNames=1;rotateNames=1;showValues=0;showPercentageValues=0;showLimits=0;baseFontSize=9;' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '')); + $chart->setChartParams('showNames=1;rotateNames=1;showValues=0;showPercentageValues=0;showLimits=0;baseFontSize=9;' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '')); // Return the code return get_chart_code ($chart, $width, $height, 'include/FusionCharts/FCF_Column3D.swf'); @@ -78,7 +78,7 @@ function fs_3d_pie_chart ($data, $width, $height) { // Generate the XML $chart = new FusionCharts('Pie3D', $width, $height); - $chart->setChartParams('showNames=1;showValues=0;showPercentageValues=0;baseFontSize=9'); + $chart->setChartParams('showNames=1;showValues=0;showPercentageValues=0;baseFontSize=9'); $empty = 1; foreach ($data as $name => $value) { @@ -124,7 +124,7 @@ function fs_2d_area_chart ($data, $width, $height, $step = 1, $params = '') { $chart->addChartData($value, 'name=' . clean_flash_string($name) . ';showName=' . $show_name . ';color=95BB04'); } - $chart->setChartParams('numVDivLines=' . $num_vlines . ';showAlternateVGridColor=1;showNames=1;rotateNames=1;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '') . $params); + $chart->setChartParams('numVDivLines=' . $num_vlines . ';showAlternateVGridColor=1;showNames=1;rotateNames=1;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '') . $params); // Return the code return get_chart_code ($chart, $width, $height, 'include/FusionCharts/FCF_Area2D.swf'); @@ -176,27 +176,27 @@ function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $ti } } - $chart->setChartParams('animation=0;numVDivLines=' . $num_vlines . ';showAlternateVGridColor=1;showNames=1;rotateNames=1;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '')); + $chart->setChartParams('animation=0;numVDivLines=' . $num_vlines . ';showAlternateVGridColor=1;showNames=1;rotateNames=1;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '')); $random_number = rand (); $div_id = 'chart_div_' . $random_number; $chart_id = 'chart_' . $random_number; - $output = '
'; + $output = '
'; $pre_url = ($config["homeurl"] == "/") ? '' : $config["homeurl"]; $output .= ''; - $output .= ''; - return $output; + --> + '; + return $output; } // Returns a Pandora FMS combined chart @@ -246,7 +246,7 @@ function fs_combined_chart ($data, $categories, $sets, $width, $height, $type = } } - $chart->setChartParams('animation=0;numVDivLines=' . $num_vlines . ';showAlternateVGridColor=1;showNames=1;rotateNames=1;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '')); + $chart->setChartParams('animation=0;numVDivLines=' . $num_vlines . ';showAlternateVGridColor=1;showNames=1;rotateNames=1;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '')); // Return the code return get_chart_code ($chart, $width, $height, 'include/FusionCharts/FCF_' . $chart_type . '.swf'); @@ -275,7 +275,7 @@ function fs_agent_event_chart ($data, $width, $height, $step = 1) { $chart->addChartData(1, 'name=' . clean_flash_string($name) . ';showName=' . $show_name . ';color=' . $value); } - $chart->setChartParams('numDivLines=0;numVDivLines=0;showNames=1;rotateNames=0;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=0;areaBorderThickness=1;canvasBgColor=9ABD18'); + $chart->setChartParams('numDivLines=0;numVDivLines=0;showNames=1;rotateNames=0;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=0;areaBorderThickness=1;canvasBgColor=9ABD18'); // Return the code return get_chart_code ($chart, $width, $height, 'include/FusionCharts/FCF_Area2D.swf'); diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php index c4cbc53f29..85d8f85e54 100644 --- a/pandora_console/include/functions_gis.php +++ b/pandora_console/include/functions_gis.php @@ -1,7 +1,7 @@ ', {styleMap: style} - ); + '', {styleMap: style} + ); - layer.data = {}; - layer.data.id = ''; + layer.data = {}; + layer.data.id = ''; - layer.setVisibility(); - map.addLayer(layer); - - layer.events.on({ - "featureselected": function(e) { - if (e.feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") { - var feature = e.feature; - var featureData = feature.data; - var long_lat = featureData.long_lat; + layer.setVisibility(); + map.addLayer(layer); + layer.events.on({ + "featureselected": function(e) { + if (e.feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") { + var feature = e.feature; + var featureData = feature.data; + var long_lat = featureData.long_lat; var popup; - popup = new OpenLayers.Popup.FramedCloud('cloud00', - long_lat, + popup = new OpenLayers.Popup.FramedCloud('cloud00', + long_lat, null, '
', null, true, function () { popup.destroy(); }); - feature.popup = popup; - map.addPopup(popup); + feature.popup = popup; + map.addPopup(popup); - jQuery.ajax ({ - data: "page=operation/gis_maps/ajax&opt="+featureData.type+"&id=" + featureData.id, - type: "GET", - dataType: 'json', - url: "ajax.php", - timeout: 10000, - success: function (data) { - if (data.correct) { - $('.cloudContent' + featureData.id).css('text-align', 'left'); - $('.cloudContent' + featureData.id).html(data.content); - popup.updateSize(); - } - } - }); - } - } - }); + jQuery.ajax ({ + data: "page=operation/gis_maps/ajax&opt="+featureData.type+"&id=" + featureData.id, + type: "GET", + dataType: 'json', + url: "ajax.php", + timeout: 10000, + success: function (data) { + if (data.correct) { + $('.cloudContent' + featureData.id).css('text-align', 'left'); + $('.cloudContent' + featureData.id).html(data.content); + popup.updateSize(); + } + } + }); + } + } + }); } ); @@ -204,11 +203,10 @@ function activateSelectControl($layers=null) { @@ -216,7 +214,7 @@ function activateSelectControl($layers=null) { } /** - * Activate the feature refresh by ajax. + * Activate the feature refresh by ajax. * * @param Array $layers Its a rows of table "tgis_map_layer" or None is all. * @param integer $lastTimeOfData The time in unix timestamp of last query of data GIS in DB. @@ -257,41 +255,40 @@ function activateAjaxRefresh($layers = null, $lastTimeOfData = null) { } if (featureIdArray.length > 0) { - jQuery.ajax ({ - data: "page=operation/gis_maps/ajax&opt=get_new_positions&id_features=" + featureIdArray.toString() - + "&last_time_of_data=" + last_time_of_data + "&layer_id=" + layer.data.id + "&agent_view=" + agentView, - type: "GET", - dataType: 'json', - url: "ajax.php", - timeout: 10000, - success: function (data) { - if (data.correct) { - content = $.evalJSON(data.content); + jQuery.ajax ({ + data: "page=operation/gis_maps/ajax&opt=get_new_positions&id_features=" + featureIdArray.toString() + + "&last_time_of_data=" + last_time_of_data + "&layer_id=" + layer.data.id + "&agent_view=" + agentView, + type: "GET", + dataType: 'json', + url: "ajax.php", + timeout: 10000, + success: function (data) { + if (data.correct) { + content = $.evalJSON(data.content); - if (content != null) { - for (var idAgent in content) { - if (isInt(idAgent)) { - agentDataGIS = content[idAgent]; - - feature = searchPointAgentById(idAgent); - layer.removeFeatures(feature); - - delete feature; - feature = null - status = parseInt(agentDataGIS['status']); + if (content != null) { + for (var idAgent in content) { + if (isInt(idAgent)) { + agentDataGIS = content[idAgent]; + feature = searchPointAgentById(idAgent); + layer.removeFeatures(feature); + + delete feature; + feature = null + status = parseInt(agentDataGIS['status']); - js_addAgentPointExtent(layer.name, agentDataGIS['name'], - agentDataGIS['stored_longitude'], agentDataGIS['stored_latitude'], - agentDataGIS['icon_path'], 20, 20, idAgent, 'point_agent_info', status, agentDataGIS['id_parent']); + js_addAgentPointExtent(layer.name, agentDataGIS['name'], + agentDataGIS['stored_longitude'], agentDataGIS['stored_latitude'], + agentDataGIS['icon_path'], 20, 20, idAgent, 'point_agent_info', status, agentDataGIS['id_parent']); - //TODO: Optimize, search a new position to call for all agent in the layer and or optimice code into function. - js_refreshParentLines(); - } - } - } - } - } - }); + //TODO: Optimize, search a new position to call for all agent in the layer and or optimice code into function. + js_refreshParentLines(); + } + } + } + } + } + }); } } @@ -339,7 +336,7 @@ function activateAjaxRefresh($layers = null, $lastTimeOfData = null) { } function addAgentPoint($layerName, $pointName, $lat, $lon, $icon = null, $width = 20, - $height = 20, $point_id = '', $status = -1, $type_string = '', $idParent = 0) { + $height = 20, $point_id = '', $status = -1, $type_string = '', $idParent = 0) { ?>