mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
2010-05-06 Raul Mateos <raulofpandora@gmail.com>
* include/config*.php: Updated year. Updated build. * include/functions_*.php: Updated year. Clean Code. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2674 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
404fcc4b2b
commit
797694bc5f
@ -1,3 +1,9 @@
|
||||
2010-05-06 Raúl Mateos <raulofpandora@gmail.com>
|
||||
|
||||
* include/config*.php: Updated year. Updated build.
|
||||
|
||||
* include/functions_*.php: Updated year. Clean Code.
|
||||
|
||||
2010-05-06 Miguel de Dios <miguel.dedios@artica.es>
|
||||
|
||||
* include/config.inc.php: fixed the operation require when the php file to
|
||||
@ -859,7 +865,7 @@
|
||||
2010-04-05 Miguel de Dios <miguel.dedios@artica.es>
|
||||
|
||||
* 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 <raulofpandora@gmail.com>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.
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
|
||||
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public License
|
||||
@ -84,7 +84,7 @@
|
||||
// //Pandora attribute // LDAP attribute //Explanation
|
||||
// 'id_user' => 'uid', //login
|
||||
// 'lastname' => 'sn', //last (sur) name
|
||||
// 'firstname' => 'givenname', //first (given) 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
|
||||
|
@ -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 */
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
// 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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
|
||||
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
|
||||
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public License
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
// 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
|
||||
@ -163,7 +163,6 @@ function makeLayer($name, $visible = true, $dot = null, $idLayer = null) {
|
||||
var feature = e.feature;
|
||||
var featureData = feature.data;
|
||||
var long_lat = featureData.long_lat;
|
||||
|
||||
var popup;
|
||||
|
||||
popup = new OpenLayers.Popup.FramedCloud('cloud00',
|
||||
@ -205,7 +204,6 @@ function activateSelectControl($layers=null) {
|
||||
$(document).ready (
|
||||
function () {
|
||||
var layers = map.getLayersByClass("OpenLayers.Layer.Vector");
|
||||
|
||||
var select = new OpenLayers.Control.SelectFeature(layers);
|
||||
map.addControl(select);
|
||||
select.activate();
|
||||
@ -272,7 +270,6 @@ function activateAjaxRefresh($layers = null, $lastTimeOfData = null) {
|
||||
for (var idAgent in content) {
|
||||
if (isInt(idAgent)) {
|
||||
agentDataGIS = content[idAgent];
|
||||
|
||||
feature = searchPointAgentById(idAgent);
|
||||
layer.removeFeatures(feature);
|
||||
|
||||
@ -774,7 +771,7 @@ function updateMap($idMap, $map_name, $map_initial_longitude, $map_initial_latit
|
||||
*
|
||||
* @result: An array with all the configuration parameters
|
||||
*/
|
||||
function getConectionConf($idConnection) {
|
||||
function getConectionConf($idConnection) {
|
||||
$confParameters = get_db_row_sql('SELECT * FROM tgis_map_connection WHERE id_tmap_connection = ' . $idConnection);
|
||||
return $confParameters;
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user