admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-09 14:02:54 +09:00
Code Issues Packages Projects Releases Wiki Activity
8,619 Commits 81 Branches 85 Tags
b9b2bcd4a214906caaafcda5edccdfd249a5bf60
Commit Graph
106 Commits
Author SHA1 Message Date
Mark Brugnoli-Vinten 1ca32862a9 Resolving issue #1920 (#1922) 
* Resolving issue #1920

* Minor QA issue
 2018-09-14 20:59:52 -05:00
cigamit 9cdd347e58 Moving some functions into api calls 
This will help resolve and issue that was raised during the resolution
of issue #948.
 2018-08-20 19:06:06 -05:00
cigamit d800ac2595 Resolving Issue #948 
Every time when creating new graph Cacti creates new datasource
 2018-08-19 20:57:22 -05:00
cigamit 0cc7ae91a0 Minor format change in lib/template.php 2018-06-09 12:08:33 -05:00
cigamit f89ab3b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	auth_login.php
#	data_sources.php
#	graphs_new.php
#	include/auth.php
#	lib/api_tree.php
#	lib/html_form_template.php
#	lib/html_tree.php
#	lib/template.php
#	permission_denied.php
#	poller_automation.php
#	tree.php
 2018-03-25 11:08:00 -05:00
cigamit 14eb34338d Resolving Issue #1458 
Error in logs when creating new graphs
 2018-03-08 12:07:47 -06:00
cigamit 1012537828 feature: Make Graph and Data Source suggested naming more efficient 2018-01-21 11:28:03 -06:00
cigamit 62615311b5 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	docs/CHANGELOG
 2018-01-06 14:08:07 -06:00
Tony Roman 519b35f5cd Update copyright to 2018 2018-01-06 09:10:15 -05:00
cigamit 439d93eef4 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	lib/template.php
#	scripts/ss_host_cpu.php
 2017-12-21 19:49:04 -06:00
netniV f2790006af Fix Issue #1133 - Incorrect variable name (#1134) 
* Fix Issue #1133 - Incorrect variable name

Fixed the incorrect use of $totle in place of $title resulting in database insertion errors.

* Update import.php

Fix debug display to match code.

* Update CHANGELOG
 2017-12-21 07:49:03 -06:00
cigamit 14be99a33b Final fix for Issue #1072 
This commit adds a new function to validate input string from the hash
value.  Should resolve the last outstanding issue.
 2017-12-02 12:16:27 -06:00
cigamit cd8618f5fd More updates for issue #1072 
- Moving the json_decode to associative arrays.
- Add update poller cache validation check that was previously missed
- Minor reformating of function calls, database calls, etc.
 2017-11-23 08:30:08 -06:00
Tony Roman 6732e2ddd8 Fix up data input whitelist for realz 2017-11-22 12:22:42 -05:00
Tony Roman af4f440ec9 Update input whitelisting to require defining configuration variable 2017-11-22 07:58:41 -05:00
Tony Roman 5f052cc894 Fix invalid value in data input whitelist validation function 2017-11-21 20:45:35 -05:00
Tony Roman 59e8199101 Update data input whitelist feature 2017-11-21 20:35:44 -05:00
cigamit 365730d442 Resolving Issue #1072 
Correcting CVE-2009-4112.  This CVE correction will provide some level
of protection to Cacti when unauthorized changes are made to a Data
Input Method.
 2017-11-21 17:16:34 -06:00
cigamit 99d19d5312 Correct whitespace and formatting issues 
Whitespace and formatting in lib
 2017-11-19 14:35:17 -06:00
Patrick 4bc2f4c0bc Various updates (#1073) 
* Updated Dutch translations
- Fixed i18n

* Defined fields in queries

* Fixed changelog

* Updated Dutch translations

* Various fixes

All committed files:
- true|false to lowercase

add_perms.php:
- displayGroups() was undefined

add_tree.php:
- duplicate case for '--quiet'

repair_templates.php:
- correction function call to diaplay_version()

gettext.php:
- PHP EOF unneeded

* Fixed warnings in graph_view

* Updated Dutch translations
- Updated Dutch translations with latest cacti.pot file

* Updated Dutch translations
- Fixed conflicts in translations

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes
- Fixed one i18n entry in api_automation.php

* Updated changelog

* Layout changes (tab instead of spaces)

* Layout changes (tab instead of spaces)

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes

* Some fixes for better querying

* Layout change only

* Updated Dutch translations

* Updated changelog

* Updated changelog

* Fixed upgrade script 1_1_28.zip

* Few final fixes after CR or changes

* Updated Dutch translations
 2017-11-11 05:45:12 -06:00
Wolfgang Stöggl 4a1a15d72c Correct spelling of RRDtool (#1038) 
- Change RRDTool -> RRDtool with a lowercase t.
- Replace in all files except *.mo, *.po, *.pot
 2017-10-16 11:32:05 -04:00
John Horne 88df1a1668 When the graph template changes, ensure that the 'snmp_query_graph_id' is 
changed in the graph_local table.
Also ensure that the new number of graph items is recalculated after updating
the table, but before checking to see if we need to remove any.
 2017-06-02 17:19:12 +01:00
cigamit c862851b7e Optimizations around data input methods 
No functional changes
 2017-05-13 11:08:34 -05:00
Tony Roman 8a179d7d7f Fix up to move if elseif else blocks to PSR 2017-05-07 19:57:36 -04:00
Patrick 623611cd16 PHP7.2 changes: 
- Replaced deprecated each() for foreach()
- Removed unnecessary reset() calls used for resetting pointers of an array before iterating by a foreach() loop
 2017-04-18 14:40:29 +02:00
patrick cc1cc7eab2 PHP7.2 changes: 
- Replaced deprecated each() for foreach()
- Removed reset() calls used for each() loops
 2017-04-15 18:00:13 +02:00
cigamit 1e1818f514 Fixing light corruption issue in graph_templates_item 
New graph items contained a hash when they should not have.
 2017-03-25 10:46:00 -05:00
cigamit 4944c38a3a Shorten syntax on SQL 2017-03-18 21:27:12 -05:00
cigamit 257349648a Resolving Issues #447 and #338 
- Extreemly slow new graphs/DS creation
- Creating another non data query graph from same template reuses first
data source
 2017-03-18 07:05:35 -05:00
cigamit b79e99f10c Resolving Issue #337 
Error when try create new graph - SNMP - Generic OID
 2017-03-04 14:34:19 -06:00
cigamit 571fe40f27 Partial resolution of Issue #226 2017-01-20 09:36:42 -06:00
Tony Roman 35a5988f41 Update source code files copyright to new year 2017-01-01 13:45:29 -05:00
cigamit 3cee024a3a Allow Graphs to be Re-Templated 
Often times in Cacti, you can have multiple versions of a template in
place.  This function will allow you to re-template any existing graphs
to the new version.
 2016-12-29 11:37:03 -06:00
cigamit 81da29a45e resolving https://github.com/Cacti/cacti/issues/65 2016-09-22 19:02:31 -05:00
cigamit 30ff8e6fc5 more column detection fixes 2016-09-21 08:36:59 -05:00
cigamit 04a3215f02 make sure we set defaults 2016-09-11 07:28:33 -05:00
cigamit 6569c2a824 fix corruption when adding items to graph templates 2016-09-10 21:48:48 -05:00
cigamit 845275ac71 correct issues with automation on non data query graphs 2016-09-10 11:51:50 -05:00
cigamit 4c1cfa2a5c adding snmp_query_graph_id to graph_local 
this will make plugin developers, as well as mainline deverlopers much
happier with the ability to view graphs by template.  other changes
coming.
 2016-09-08 14:10:46 -05:00
cigamit 3c0471a676 resolving bug#168 
this is the second commit after additional testing.
 2016-09-05 21:34:24 -05:00
cigamit 56cd61518d resolving bug#168 
not entirely happy with this solution, but it is a start.
 2016-09-04 10:31:25 -05:00
cigamit da835102e7 fixing two prepared statement conversion issues. 2016-08-28 23:12:20 -05:00
cigamit b523f1dea5 remove addslashes, prepared statements, wc3 validation, double to single quote 
this is required for preparation of magic_quotes_gpc.
 2016-08-28 15:27:48 -05:00
cigamit b97fbb92c0 resolve issue with soft database corruption when creating graphs, convert to prepared statements 2016-08-27 16:27:33 -05:00
cigamit 8e9e86fe16 resolving bug#2535 2016-08-26 20:03:24 -05:00
cigamit 39fa27b30a resolving bug#2725 and others 
Propagate Graph Template changes to Data Source
Minor GROUP_CONCAT ORDER issue
Remove graph_diff as it's no longer required
 2016-08-26 16:48:13 -05:00
cigamit 2bb804e3a5 use prepared statements, and db_qstr() vs. addslashes() 
additional cleanup including double to single quotes and some
formatting.
 2016-08-25 08:19:29 -05:00
cigamit 1d138befb1 resolving bug#2714 2016-08-20 12:06:11 -05:00
cigamit 9cbb202198 mysql 5.7 testing 2016-06-18 09:44:39 -05:00
cigamit 521d8297c8 resolve alternate data profile issue, introduce prepared statements, double to single quotes 2016-04-21 22:23:39 -05:00