Commit Graph
74 Commits
Author SHA1 Message Date
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 e961202f70 Resolving Issue #1048
Unable to import vdef's from templatesl
2017-10-27 06:52:44 -05: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 86f719b923 Resolving Issue #989
- Spaces lost on re-import of data input method.
- Possible injection point in templates_export.php
- Minor format changes to db calls

Note that this will not 100% resolve the importation of old templates.
However, all new templates will base64_encode all input strings prior to
XML encoding, which resolves this issue ongoing.
2017-10-15 09:54:07 -05:00
Patrick c3419aa36e Various fixes && Updated Translations (#1032)
Good catch on the bug fixes too.  Hard to spot.
_______________________________________________________

* 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

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

* Updated Dutch translations
- Fixed conflicts in translations
2017-10-15 07:27:25 -05:00
John Horne 9b359d932a Trivial - removed tabbed blank line. 2017-06-02 17:12:35 +01:00
Tony Roman 8a179d7d7f Fix up to move if elseif else blocks to PSR 2017-05-07 19:57:36 -04:00
Tony Roman 27045ea52d Fixup install process to streamline releases
- Added and moved code to CACTI_VERSION constant
 - Merged cacti versions and hash codes array to have one place to add versions
 - Moved cacti version to file to facitate automation needs
 - Cleaned up cli database upgrade script
2017-05-01 08:58:29 -04:00
cigamit ab746b0e38 Add new field for graph templates to form actions
Increase the minimum import level for new templates, insure that new
templates imported with this column are saved properly, include
duplicate graph functionality, change field to a char(2)
2017-04-28 04:45:13 -05:00
cigamit 49e83d7fa1 Resolving Issued #580, #606, #608, #609
- Data collection warnings when using cmd.php
- Replace <path_php_binary> in data input methods
- Spaces adjacent to double quotes are eliminated durate data input
method import
- Horor the column setting in graph tree view mode
2017-04-24 20:40:05 -05: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 50ecf39e24 Resolving Issue #500
Generic SNMP Device Packaged Damaged - Unix Ping Host input variable not
replaced.
2017-04-01 12:11:28 -05:00
cigamit 97f87eacdb Fully implement remove orphans from Graph Template import process
It's recommended to always remove orphans as not doing so will leave
remnants of older template versions in your Graph Templates.
2017-03-25 10:48:33 -05:00
cigamit 2a1eb67dca Resolving Issues #330 and #380
-issue#330: Import templates to non-default Data Profile
-issue#380: Cacti ignores a non-standard SNMP Port
-issue: Importing Template from old Cacti would not show Data Templates
from GUI
2017-03-11 08:29:17 -06:00
cigamit a8c560966a Correcting spelling and grammar issues 2017-01-12 19:09:16 -06:00
cigamit 0ba5711f09 Rework Import Functions
Move package import to lib/import.php.  Create new import_package.php
CLI script.  Make output logging an import function.
2017-01-08 11:02:03 -06:00
cigamit d0fafdbe13 Move logging to 'HIGH' level for import. 2017-01-07 13:41:52 -06:00
Tony Roman 35a5988f41 Update source code files copyright to new year 2017-01-01 13:45:29 -05:00
cigamit 480ca77b68 Resolving #119
Please backup your database before re-runnning the upgrade script.  This
change requires rerunning the upgrade script even though it has been
tested.
2016-12-30 13:19:06 -06:00
cigamit c5e1e8a0b3 Updates for remote polling
Note that you will need to rerun you database upgrade after thsese
changes.  Some a new table and some new columns have been added to
support remote polling and if you don't make these database changes,
your Cacti system may stop operating.
2016-12-26 17:00:07 -06:00
cigamit 7269cbfd88 Committing prototype of replication api for team review
Part of multiple polling is to support either MySQL replication, or to
replicate tables requred for remote data collection.  These changes will
enable the later method, but are not complete.

The replicate_tables in lib/poller.php function is designed to handle
each of the table replecation types.  When complete, it will handle all
table replication based upon poller state.

There may be additional table schema changes to increase performance,
but those changes have not been validated yet.
2016-12-19 21:44:34 -06:00
cigamit 23ca0548c0 enable viewing new and orphaned graph items 2016-09-19 18:33:49 -05:00
cigamit 153e8df641 resolving bug#851 2016-09-19 16:37:59 -05:00
cigamit 7bbea5777f use the default profile_id on import if not specified 2016-09-10 11:50:48 -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
Micke2k 0fef67d0a6 Attempt at fixing step and heartbeat during import
Step and heartbeat was always set to default when importing profiles with a newly created datasource_profile(example 1 minute polling profile).

Now step and heartbeat is read from the profile.

New installations and upgrades do not have a datasource_profile. $profile_id is returned as an array in that case. Not to happy about the fix for that, but it works.

Tested import with default profile, 1 minute polling profile as well as new installation import of Disk IO. Works fine.
2016-04-09 21:58:10 +04:00
cigamit 8f11b3c112 more removal of rra_id 2016-03-19 09:52:26 -05:00
Micke2k 07826332db Undefined variable: import_custom_rra_settings in import.php
Changed to import_as_new
2016-03-19 17:24:31 +04:00
cigamit 39bbb23ac5 implement data source profiles
this commit will cause your 1.0 environment to break.  to fix, please
run the script 'profile_migrate.php'.  this commit includes a major new
feature to allow your Cacti system to have multiple polling intervals
and for you to create identical graphs using multiple polling intervals
in a sane way.  this is an initial commit, one that has been tested.
however, there will be subsequent commits.  however, after migration,
this should be considered stable.
2016-03-14 06:59:54 -05:00
cigamit 2e236dcbdf big commit back porting features
back port the following features from main:

1) vdef support
2) new graph items
3) new graph options

this covers all the high points available in rrdtool today.

also change the following:

1) allow forms to include spacers
2) reorganize graph template form with spacers
3) many help wording back ports from main

for those testing, if you are going to start using this version, you
will have to implement the changes in the upgrade script or reinstall.
also note that this change may break new aggregates.
2016-03-09 20:43:52 -06:00
Linegod f31c7b6835 first spellcheck pass 2016-02-07 23:12:03 -06:00
Micke2k d188f1631d Change Copyright year 2015 -> 2016 2016-01-29 21:46:02 +04:00
Jimmy Conner 5bde3da972 1) Update Copyright Years Correct a few minor CY Issues
2) Allow Locking/UnLocking of Graphs
3) ToolTips
4) Correct Minor Issues with Login/Out/Permission associated with Theme JS
5) Upgrade jQuery which has Fixes for Major issue in Safari 7/8.1

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7662 860744bd-22fc-0310-8c96-e9fe5004b5ca
2015-01-04 01:52:50 +00:00
Jeff Pasnak 6e9f636abf #0002492 - Standardize mysql syntax - final pass
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7621 860744bd-22fc-0310-8c96-e9fe5004b5ca
2014-12-28 21:09:38 +00:00
Jimmy Conner ac6d6929cc Remove some unnecessary ending PHP closing tags
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7571 860744bd-22fc-0310-8c96-e9fe5004b5ca
2014-12-17 03:02:03 +00:00
Tony Roman 65be30ffe0 Update copyright to 2014
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7437 860744bd-22fc-0310-8c96-e9fe5004b5ca
2014-03-30 19:54:50 +00:00
Tony Roman ce40281901 Update copyright to 2013 for 0.8.8
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7386 860744bd-22fc-0310-8c96-e9fe5004b5ca
2013-07-21 23:00:42 +00:00
Tony Roman a257958a0b Update copyright to 2012
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@7016 860744bd-22fc-0310-8c96-e9fe5004b5ca
2012-02-27 07:04:37 +00:00
Reinhard Scheck 7c94ebaabb -bug#0002093: unit exponent value of 0 not imported with graph template
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6913 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-11-13 17:59:16 +00:00
Reinhard Scheck 920066fd19 0002094: CDEF: "another cdef" references not included in template export
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6909 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-11-13 15:25:52 +00:00
Tony Roman 9acba795fe Update copyright to 2011
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6233 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-27 03:44:05 +00:00
Reinhard Scheck 14fc72a382 -bug#0001926: Importing templates "using defaults for this installation" associates all rra's defined
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6230 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-20 20:33:17 +00:00
Reinhard Scheck 9d2a164909 -bug#0001568: Cacti currently gives a lot of warnings of deprecated functions on PHP 5.3
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6200 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-06 21:03:25 +00:00
Larry Adams c5403f3844 QA: Update copyrights
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5806 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-04-28 03:48:09 +00:00
Larry Adams d10567cb9f -QA: remove invalid htmlspecialchars from code. Not appropriate for this function.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5189 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-08-19 00:01:03 +00:00
Larry Adams aad34a72f5 -bug#0001522: Special(?) charakters break parsing of template data.
-bug#0001452: Missing "<" and ">" in "Collection Methods=>Data Input Methods=>"Input String", When Import Template 
-bug#0001125: XML parse error on template import with degree symbol 
-bug#0001366: Exported data templates do not import the special characters properly 

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5188 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-08-18 23:38:30 +00:00
Tony Roman 26d1957d62 Update copyright to 2009
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4931 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-02-11 22:53:50 +00:00
Jimmy Conner 9bc2210a43 Parse error: syntax error, unexpected ')'
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4757 860744bd-22fc-0310-8c96-e9fe5004b5ca
2008-10-10 03:50:22 +00:00
Tony Roman ff81c2633e XSS implementation was flawed, it has been fixed. Please use clean_html_output where you want to remove possible XSS issues. This is only to be used on HTML output.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4743 860744bd-22fc-0310-8c96-e9fe5004b5ca
2008-09-27 21:27:24 +00:00
Larry Adams 22f9e12ddb Update Copyright Notice for 2008.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4434 860744bd-22fc-0310-8c96-e9fe5004b5ca
2008-01-29 00:40:43 +00:00