Commit Graph

5549 Commits

Author SHA1 Message Date
slerena 8f387818ba 2012-06-25 Sancho Lerena <slerena@artica.es>
* operation/menu.php: Changed order of treeview in menu.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6690 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 11:03:08 +00:00
mdtrooper 581b05d7ea 2012-06-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: cleaned source code style.
	
	* include/functions_custom_graphs.php: fixed into the function
	"graphic_combined_module" the show html entities in the name of
	agents in legends, show better the legend for long size names of
	agents and modules.
	
	Merged from 4.0.2
	
	* extensions/update_manager/debug.php: upload lost file from old
	commit.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6688 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 10:42:52 +00:00
santimunin fb927e26ac 2012-06-24 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Main.java: Removed getGroups function, now it calls API.getGroups().


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6685 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-24 11:30:22 +00:00
santimunin 5ac33aa8eb 2012-06-24 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Main.java: Added search profiles feature.
	* res/layout/main.xml: UI changes. Added search profiles feature.
	* res/values/strings.xml: Added new entries.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6684 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-24 11:24:47 +00:00
santimunin d6d000a77b 2012-06-23 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Core.java: Fixed a bug in the isOnline() function.
	* src/pandroid_event_viewer/pandorafms/Options.java: Improved the connection checking functionality.
	* src/pandroid_event_viewer/pandorafms/API.java: Added getTags().
	* src/pandroid_event_viewer/pandorafms/Main.java: Now the tags are getted by API.getTags().


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6683 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-23 14:28:37 +00:00
zarzuelo aaea073293 2012-06-22 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php: Improved several 
	parts of SLA reports. Add icons to criticity, etc.
	
	* include/functions_api.php: Fixed bug in get events
	api function remaning function
	
	* godmode/reporting/graph_builder.graph_editor.php: Increase
	the size of little combo boxes in combined graphs editor

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6679 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-22 12:19:05 +00:00
mdtrooper f00215657b 2012-06-22 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/load_updatemanager.php,
	extensions/update_manager/lib/functions.ajax.php,
	extensions/update_manager/lib/libupdate_manager_client.php,
	extensions/update_manager/main.php,
	extensions/update_manager/debug.php: added the feature to get traces
	of execution. Only change the flag for debug in debug.php .
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6677 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-22 12:07:00 +00:00
vgilc 5e4cecdc65 2012-06-22 Vanessa Gil <vanessa.gil@artica.es>
* operation/users/user_edit.php
	  godmode/users/configure_user.php: Apply password policy
	on users edition.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6674 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-22 11:11:42 +00:00
santimunin 97e7748602 2012-06-21 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Core.java: Added a new method which checks if a website is online.
	* src/pandroid_event_viewer/pandorafms/Options.java: Fixed a bug. The app didn't check if the url were online before checking the certificate.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6673 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 22:11:22 +00:00
ramonn 7d76c88f9a 2012-06-21 Ramon Novoa <rnovoa@artica.es>
* win32/bin/pandora_agent.conf,
	  win32/installer/pandora.mpi,
	  win32/versioninfo.rc,
	  win32/pandora.cc,
	  pc/AIX/pandora_agent.conf,
	  pc/Linux/pandora_agent.conf,
	  pc/HP-UX/pandora_agent.conf,
	  pc/Win32/pandora_agent.conf,
	  pc/NT4/pandora_agent.conf,
	  pc/SunOS/pandora_agent.conf,
	  pc/FreeBSD/pandora_agent.conf,
	  unix/AIX/pandora_agent.conf,
	  unix/DEBIAN/control,
	  unix/DEBIAN/make_deb_package.sh,
	  unix/pandora_agent.spec,
	  unix/Linux/pandora_agent.conf,
	  unix/HP-UX/pandora_agent.conf,
	  unix/pandora_agent.redhat.spec,
	  unix/pandora_agent,
	  unix/NT4/pandora_agent.conf,
	  unix/SunOS/pandora_agent.conf,
	  unix/FreeBSD/pandora_agent.conf,
	  shellscript/linux/pandora_agent.conf,
	  shellscript/bsd-ipso/pandora_agent.conf,
	  shellscript/aix/pandora_agent.conf,
	  shellscript/hp-ux/pandora_agent.conf,
	  shellscript/mac_osx/pandora_agent.conf,
	  shellscript/solaris/pandora_agent.conf,
	  shellscript/openWRT/pandora_agent.conf: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6672 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 17:41:54 +00:00
ramonn b817487ce1 2012-06-21 Ramon Novoa <rnovoa@artica.es>
* DEBIAN/control,
	  DEBIAN/make_deb_package.sh,
	  conf/pandora_server.conf,
	  pandora_server.spec,
	  lib/PandoraFMS/Config.pm,
	  pandora_server.redhat.spec,
	  util/pandora_db.pl,
	  util/pandora_manage.pl: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6671 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 17:39:54 +00:00
ramonn e2a32e28c7 2012-06-21 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql,
	  DEBIAN/control,
	  DEBIAN/make_deb_package.sh,
	  include/config_process.php,
	  install.php,
	  pandora_console.spec,
	  pandora_console.redhat.spec: Updated version strings.

	* extensions/update_manager.php: Merged from 4.0 branch. Ignore blank
	  lines in installation SQL file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6670 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 17:38:43 +00:00
mdtrooper f1c738c49e 2012-06-21 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/load_updatemanager.php: fixed the lost
	parameter for keygen, the dbtype.
	
	* extensions/update_manager/lib/libupdate_manager_client.php: fixed
	when update enterprise packages maybe sometimes try to update again
	and again and again....like spoon killer.
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6667 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 15:41:09 +00:00
santimunin 6f73b31102 2012-06-21 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/EventList.java: Restored to the previous version.
	* src/pandroid_event_viewer/pandorafms/Core.java: Added a line which checks if the connection is secure.
	* src/pandroid_event_viewer/pandorafms/Options.java: Made some changes in certificate checking.
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: Now, if there are any problem parsing data received from server.
	* res/layout/list_view_layout.xml: Restored to the previous version.
	* res/layout/item_list_event_layout.xml: Restored to the previous version.
	* res/values/strings.xml: Added new entries.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6665 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 15:20:17 +00:00
slerena f16cf3cd5a 2012-06-21 Sancho Lerena <slerena@artica.es>
* extensions/update_manager/sql/update_manager.oracle.sql,
        extensions/update_manager/sql/update_manager.sql,
        extensions/update_manager/sql/update_manager.postgreSQL.sql: Updated
        some default details for update manager.

        * pandoradb_data.sql: Some updates on default data load.

        * include/help/es/help_main_help.php,
        include/help/es/help_gis_setup_map_connection.php,
        include/help/es/help_setup_gis_index.php,
        include/help/es/help_snmp_alert_field1.php,
        include/help/es/help_local_component.php: Missing help files for
        spanish added.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6664 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 14:17:38 +00:00
ramonn 93c3d4930e 2012-06-21 Ramon Novoa <rnovoa@artica.es>
* include/functions_servers.php: Merged from 4.0 branch. Added inventory
	  server statistics



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6662 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 14:09:24 +00:00
zarzuelo ace0d45022 2012-06-21 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php
	operation/search_modules.php
	operation/agentes/status_monitor.php
	operation/agentes/estado_ultimopaquete.php
	operation/agentes/estado_monitores.php
	operation/search_agents.php
	operation/search_alerts.php
	godmode/agentes/module_manager.php
	godmode/agentes/modificar_agente.php
	godmode/users/configure_user.php: Cleaned some old
	code of policy ACL to fix and prevent important bugs

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6660 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 13:27:37 +00:00
ramonn 0e19a6eb5f 2012-06-21 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: merged from 4.0 branch. Added inventory server
	  statistics.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6659 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 13:19:49 +00:00
juanmanuelr bcf52e9ba1 2012-06-21 Juan Manuel Ramon Vigo <juanmanuel.ramon@artica.es>
* unix/AIX/pandora_agent.conf
	 unix/Linux/pandora_agent.conf
	 unix/HP-UX/pandora_agent.conf
	 shellscript/mac_osx/pandora_agent.conf
	 unix/NT4/pandora_agent.conf
	 unix/SunOS/pandora_agent.conf
	 unix/FreeBSD/pandora_agent.conf
	 shellscript/linux/pandora_agent.conf
	 shellscript/openWRT/pandora_agent.conf: Changed enconding token to 
	 UTF-8 in all Unix agents configuration files.
       
	* unix/pandora_agent
	 shellscript/linux/pandora_agent
	 shellscript/mac_osx/pandora_agent
	 shellscript/openWRT/pandora_agent: Changed default enconding to 
	 UTF-8 in Unix agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6656 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 13:12:57 +00:00
juanmanuelr b19ecf8edd 2012-06-21 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* ChangeLog: Forgot to update ChangeLog in my last commit.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6654 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 11:51:32 +00:00
juanmanuelr dfc02e6a46 2012-06-21 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* util/pandora_xml_stress.conf
	 util/pandora_xml_stress.pl: Changed XML character codification 
	of Pandora XML stress to UTF-8.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6651 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 11:47:23 +00:00
zarzuelo 82ab548e37 2012-06-21 Sergio Martin <sergio.martin@artica.es>
* operation/users/webchat.php: Changed a string to 
	be translated



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6649 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 11:14:30 +00:00
slerena 526695683d 2012-06-21 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/NetworkServer.pm: SNMP values starting with quotes
        are now stripped of starting/ending double quotes. This will help to
        get numeric (float data) as strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6646 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 10:06:19 +00:00
hkosaka 130ccd476b 2012-06-21 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/pandora_logs.php: show the last 500k bytes
	instead error message, if the file is too large.
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6644 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 09:43:26 +00:00
hkosaka 4f782d0b7a 2012-06-21 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/net_tools.php: Use 'whereis' to get command path
	to execute, regardless $PATH environment.
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6642 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 09:04:59 +00:00
juanmanuelr 0a2c98835b 2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora_black.css: Autocomplete text is visible in
	black style.
	
	Fixes: #3524691



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6638 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 17:38:08 +00:00
juanmanuelr a4912f64e5 2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/groups/modu_group_list.php: Fixed module update when a 
	module group is deleted.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6637 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 17:24:43 +00:00
zarzuelo 9e20e71461 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php
	include/functions_reporting.php: Fixed layout issues in
	SLA reports and add ttl param to slice graphs 
	function to pdf side

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6634 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 17:11:53 +00:00
slerena 09adfea471 2012-06-20 Sancho Lerena <slerena@artiac.es>
* extensions/update_manager/sql/update_manager.sql: 4.0.2 comes with a fixed
        last package installed of 412

        * extensions/update_manager/load_updatemanager.php: Fixed execution
        of keygen: now uses dbtype as last parameter in execution.

        * include/functions_config.php: Avoid to check for new update on each
        page render (BAD!)




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6631 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 16:44:28 +00:00
vgilc e692f99275 2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* operation/tree.php: Fixed bug: Missing text in tree view title.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6628 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 15:50:15 +00:00
mdtrooper c93f4d3b20 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php,
	extensions/update_manager/lib/functions.php: uploaded lost changes.
	
	* include/functions_filemanager.php: cleaned source code style.
	
	* include/functions.php: added function "copy_dir" for use in the
	bug #3527247.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6627 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 15:43:41 +00:00
vgilc 5ea5a4cd89 2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb_data.sql
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql
	  godmode/setup/setup_visuals.php: Fixed bug: Inside Visual styles menu 
	there is an option "Timestamp or time comparation" which has not a selected
	value by default.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6624 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 14:54:37 +00:00
ramonn 8684545c4e 2012-06-20 Ramon Novoa <rnovoa@artica.es>
* pandora_update_version.sh: Update version in agent configuration
	  files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6622 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 13:42:17 +00:00
juanmanuelr dc550e758f 2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/graphs/pChart/pPie.class.php: ixed a bug in pie3d graph
	function when graph data only has one element.
	
	 include/functions_reporting.php
	 operation/reporting/reporting_viewer.php: Fixed a visualization 
	 problem in agent_modules report item.
	 
	 godmode/users/profile_list.php: Fixed a bug when profile creation
	fails.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 11:45:12 +00:00
vgilc 5c22b6b962 2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/module_manager.php
	  operation/agentes/estado_agente.php
	  operation/agentes/status_monitor: Changed interval format.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 10:56:40 +00:00
zarzuelo 811abfecb4 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php
	operation/agentes/estado_agente.php: Fixed sort actions
	of agents operation view

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6616 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 10:17:09 +00:00
mdtrooper e9abfff98e 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* extensions/net_tools.php: cleaned source code style.
	
	* extensions/module_groups.php,
	operation/agentes/status_monitor.php: fixed the lost "module group"
	"unasigned".
	
	Fixes: #3532075
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6614 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 09:43:14 +00:00
santimunin d9552510b5 2012-06-20 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/API.java: New class, it will provide all API calls.
	* src/pandroid_event_viewer/pandorafms/EventList.java: Loading more events on scroll down.
	* src/pandroid_event_viewer/pandorafms/Core.java: Added HTTPS connections.
	* src/pandroid_event_viewer/pandorafms/Options.java: Added self-signed certificates check.
	* src/pandroid_event_viewer/pandorafms/NaiveTrustManager.java: HTTPS through self-signed websites.
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: Added ListAdapter to get events asynctask as a parameter.
	* res/layout/list_view_layout.xml: Little UI changes.
	* res/layout/item_list_event_layout.xml: Little UI changes.
	* res/values/strings.xml: Added new entries.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6612 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 09:32:49 +00:00
zarzuelo e197350df4 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	godmode/agentes/module_manager.php: Added not init status
	in the manage modules view for bug 3533341

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 09:03:30 +00:00
mdtrooper 5e2b2f59e1 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, include/functions.php: cleaned source
	code style.
	
	* extensions/extension_uploader.php: fixed the upload enterprise
	extension.
	
	Fixes: #3532208
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6609 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 08:28:34 +00:00
hkosaka 16a849bb84 2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/net_tools.php: Fixed bug: 'whereis' could find a
	command regardless of whether reachable or not with $PATH
	(and leads to fail the subsequent command execution).
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6607 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 07:54:50 +00:00
hkosaka ffbcfcd4a1 2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/net_tools.php: Fixed bug: cannot find traceroute
	other than /usr/sbin/traceroute.
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6605 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 07:27:56 +00:00
hkosaka df60fb5c34 2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions.php: Changed ambiguous time representation
	"MM:SS minutes", that can read 'MM hours SS minute', to 
	"MM minutes SS seconds".
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 03:34:57 +00:00
markholland 50fc62147b 2012-06-19 Mark Holland <mark@mark-holland.me.uk>
* res/layout.main.xml: removed as no longer used
	 in pandroid 2.0

	* res/values/strings.xml: Added strings for simID,
	upTime, start, loading and agent stopped. Replicated
	in values-en and values-es
	
	* src/pandroid/agent/core.java: Added variables 
	for simID and upTime
 	
	* src/pandroid/agent/PandroidAgent.java: commented
	out unnecessary code from version 1.0. Removed
	absolute tab height as it interferes with high
	density screens.

	* src/pandroid/agent/PandroidAgentListener.java: 
	Android version is now set as per device rather 
	than a fixed string. simID, upTime and networkOperator 	methods
	and then added to XML

	* src/pandroid/agent/setup.java: commented
	out unnecessary code from version 1.0

	* src/pandroid/agent/SMSActivity.java: Started work

	* src/pandroid/agent/SMSBroadcastReceiver.java: 
	Started work

	* src/pandroid/agent/status.java: Created onStart
	method to better follow android standard. run()
	is executed here. Fixed way toasts for connection 
	messages are handled. Added textviews for simID 
	and upTime values. added start/stop, show and hide 
	XML buttons for debugging purposes.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6601 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 22:37:03 +00:00
zarzuelo 6894e6db3d 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* general/header.php: Add hint to explain the use of
	blank characters in global search as AND conditions
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6598 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 15:45:25 +00:00
vgilc 6d24c7d651 2012-06-19 Vanessa Gil <vanessa.gil@artica.es>
* godmode/db/db_audit.php: Fixed bug:don't display any 
	message to confirm the action.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6595 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 12:15:56 +00:00
vgilc a0cf6445e7 2012-06-19 Vanessa Gil <vanessa.gil@artica.es>
* godmode/db/db_sanity.php: Fixed bug: to sanitise
	my database now, don't display any message to confirm
	the action.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6593 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 11:19:53 +00:00
zarzuelo c4d34bd57d 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* include/functions.php: Fixed check referer bug with 
	https when is not forced. Bug #3525494
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6592 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 11:07:38 +00:00
zarzuelo 65600fa77e 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* include/functions_incidents.php: Changed a parameter
	of the xml2array function to set it equal to recent
	fix in 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6589 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 09:49:49 +00:00
mdtrooper 0177bd11e3 2012-06-19 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.list_items.php: some fixes.

	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6587 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 09:25:45 +00:00