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
94 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 2b8097c060 Resolving Issue #1882 
Bypass output validation in select cases
 2018-08-30 19:29:27 -05:00
cigamit ccdc937d72 Allow adding a Non-Existing Data Source to an Existing Graph when the Template is Updated 2018-08-19 19:22:22 -05:00
Mark Brugnoli-Vinten 51ee26ce1a Resolving issue #1689 (#1779) 
* Resolving issue #1689

As noted in issue #1689 (Technical Support's RRDTool version should show
detected RRD version) the version of the RRDTool is never actually displayed.
The code has now been updated to properly handle versioning and displays both
the configured and installed versions.

The setting for rrdtool_version has been updated to a proper minimum version
number so that the cacti_version_compare() function may be effectively used.
This means that the constant values of RRDTOOL_VERSION_1_3 through
RRDTOOL_VERSION_7 have now been removed from the system.

* Some QA updates

* Further QA fixes
 2018-08-02 18:01:25 -05:00
cigamit 86641b1be2 Pre-apply jQueryUI styles to input objects 2018-05-09 20:58:37 -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 a02f223f4e Additional sanitization for XSS for Issue #1457 
- Also additional formatting and cleanup of some code
 2018-03-17 08:20:29 -05:00
Tony Roman 1ce66b5fde Merge branch 'develop' into feature/1.2.x 2018-02-25 20:12:19 -05:00
cigamit 5d7bb410e0 Some pages missing colspan's for no rows found 
Issue with message text wrapping when no rows found on some pages
 2018-02-24 17:43:48 -06:00
cigamit 10a8e523f7 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	cacti.sql
#	data_sources.php
#	docs/CHANGELOG
#	graphs.php
#	host.php
 2018-01-26 19:31:47 -06:00
netniV 6039e847fc Fix for Issue #1256 / #1268 - RFILTER and display corrections (#1269) 
* Fix for Issue #1256 and #1268
This patch fixes issues with both the display of the error messages and with RFILTER variables not properly being primed as discussed on issue #1256 and issue #1268

* Update CHANGELOG

* Fix issue number
 2018-01-26 17:56:24 -07: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
Tony Roman 6d1b0a9a76 Merge branch 'develop' into feature/1.2.x 
Conflicts:
	aggregate_graphs.php
	auth_login.php
	automation_templates.php
	cli/add_tree.php
	graph_templates_items.php
	lib/api_automation.php
	lib/api_tree.php
	lib/auth.php
	lib/html_form_template.php
 2017-11-18 09:44:33 -05: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
cigamit 295d390dc1 Resolving Isuse #1059 
Aggregate item filter should use regular expressions to avoid SQL errors
due to flawed filter logic.
Backporting more html_escape() calls.
 2017-11-04 14:01:21 -05:00
Tony Roman 6c73dd6105 Merge branch 'develop' into feature/1.2.x 
Conflicts:
	cli/add_tree.php
	docs/CHANGELOG
 2017-10-16 11:36:51 -04: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
cigamit 3a8d4f7ff9 Use html_escape() over htmlspecialchars() for consistency and security 2017-09-04 21:26:27 -05:00
cigamit 2c4b143c97 Resolving Issue #122 
- Support Site Branch Type
- Note that though the branches currently render, their form and what is
rendered is still not finalized.
 2017-09-01 14:19:11 -05:00
cigamit 7ee2116a2f Resolving Issue #933 
Aggregate graphs page counter off
 2017-08-27 08:59:23 -05:00
cigamit 0673e3c725 Resolving Issue #861 
- The search filter does not support Cyrillic
- Also adding more __esc() to title and value attributes
- Also adding more missing i18n via audit
 2017-07-19 20:16:27 -05:00
cigamit f850e57629 Freshed core filter html 
In preparation for responsive filters phase II
 2017-07-05 17:13:10 -05:00
cigamit 3f2d15565f Another crack at issue #599 
Well, the errors are gone, but see if it's what you were expecting.
 2017-05-27 11:44:00 -05:00
cigamit fb834d720d Fix #739 again 2017-05-27 09:52:26 -05:00
cigamit a008483115 Resolving Issue #739 2017-05-27 07:42:37 -05:00
cigamit 611aef77b5 Resolving Issue #748 
Search results are not cleared on Aggregate items
 2017-05-27 07:34:30 -05:00
patrick 16e2b7c052 Replaced all if statements and inline if statement with $variable != '' where strlen($variable) was used to determine if a string was empty or not 2017-05-18 01:14:15 +02:00
Tony Roman 8a179d7d7f Fix up to move if elseif else blocks to PSR 2017-05-07 19:57:36 -04:00
cigamit 6fff84f201 Remove manual aria controls from pages 2017-04-30 18:04:29 -05:00
cigamit ff125d01cb Update all pages to include div based forms 
This requires a CSS change which is going to be committed next and
separately to call out the changes required there.
 2017-04-30 13:15:58 -05:00
cigamit c67608f7f4 Fixing two Aggregate issues 
1) Sequencing was broken on non-templated Aggregates causing totals not
to function
2) Skip/Total Selectors for Aggregates not functional when creating
Non-Templated Aggregates
 2017-04-23 13:09:03 -05:00
cigamit b28f44a9d9 Add escaping to filter values prior to request. 
Handles the sepecial case of a pound sign causing issues.
 2017-04-23 07:35:01 -05:00
cigamit a76b93691e Fix JavaScript errors when managing Aggreage Graphs 2017-04-22 13:06:10 -05:00
patrick d2185c98b1 PHP7.2 changes: 
- Replaced deprecated each() for foreach()
 2017-04-21 22:12:55 +02: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 f22c9694e4 Add multiple column sort and glyph API's 
Convert all core pages to use multiple column sort.  There may still be
some pages around automation that are required to be migrated.  However,
they will continue to operate as is.
 2017-03-17 17:19:03 -05:00
cigamit af44bc6655 Resolving Issue #385 
You can't place an aggregate on a subtree
 2017-03-11 09:25:21 -06:00
cigamit 0f450fc6d4 Change appearance of aggregate 'debug' 2017-02-19 11:54:11 -06:00
cigamit a8c560966a Correcting spelling and grammar issues 2017-01-12 19:09:16 -06:00
cigamit 598539ead6 Resolving Issue #172 2017-01-08 19:54:55 -06:00
Tony Roman 35a5988f41 Update source code files copyright to new year 2017-01-01 13:45:29 -05:00
cigamit e1856263c7 Add Alpha to Graph Templates Item displays 2016-12-28 21:57:07 -06:00
cigamit 795bda3b2c Fix html characters for 'None' 2016-12-14 00:13:17 -06:00
cigamit b7042064ef Minor fix for aggregate page 2016-12-14 00:02:21 -06:00
cigamit 642b39b0de Correct duplicate nav bar on top of aggregate items 2016-12-13 23:44:16 -06:00
cigamit 806d61a343 Correct double saving of form 
Both form_end and form_save_button adds javascript to save the form.
This results in a race condition that one save can be deleting rows
while the other is saving.
 2016-12-13 23:01:33 -06:00
cigamit 43b3fa2a34 Minor format change 2016-11-22 18:42:03 -06:00
cigamit 80b483b559 more prepared statements 
preparing for turning off magic quotes
 2016-08-27 17:26:53 -05:00