admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-08 21:16:17 +09:00
Code Issues Packages Projects Releases Wiki Activity
7,434 Commits 73 Branches 85 Tags
ebf8fb2ee8c56b05d804e52119cf811941717841
Commit Graph
53 Commits
Author SHA1 Message Date
Tony Roman 519b35f5cd Update copyright to 2018 2018-01-06 09:10:15 -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 373911e429 Additional export updates for backward compatibility 
Additional optimizations for export routing to support consistent file
namings
 2017-11-04 20:07:56 -05:00
cigamit 692c437e03 Resolving Issue #992 
Resolving RRDfile naming issues that result from random sorting upon
export in prior versions of Cacti
 2017-10-29 09:41:53 -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
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
Tony Roman 35a5988f41 Update source code files copyright to new year 2017-01-01 13:45:29 -05:00
cigamit ce6699e2ba resolving bug#2754 2016-08-30 08:45:17 -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 0a16430390 order on export 
makes comparing template changes easier
 2016-05-22 08:50:06 -05:00
cigamit e1aedc4a83 better logging on export 2016-04-10 15:36:00 -05: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
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
Jimmy Conner 4d353f3ac1 1) More removal of colons 
2) Add Filter Icon to Filters
3) It's not a Host, it's a Device

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7645 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2015-01-01 01:23:29 +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
Jeff Pasnak fa0e971385 #0002492 - Standardize mysql syntax - start of lib 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7615 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-26 19:32:18 +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
Reinhard Scheck 948f6d995c 0002385: Cannot export host templates while including dependencies 
we checked a non-existing array index, which seems to pop up since php 5.4.something

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7424 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2013-08-24 17:07:19 +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 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
Larry Adams e226b8ea4b -bug#0001929: Error when exporting templates are not properly reported 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6323 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-02-21 15:14:01 +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
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 a8b2af4714 QA: Put the encoding on the wrong line. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5192 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2009-08-19 00:45:56 +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
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
Tony Roman e625781ec6 Typos suck and I'm glad I have a script to update copyrights 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3898 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-03-04 20:17:57 +00:00
Tony Roman 8ff975973a Proper date range needed in copyright 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3896 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-03-04 20:11:14 +00:00
Tony Roman e116f23ff7 Copyright update for php files 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3894 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-03-04 19:30:21 +00:00
Tony Roman a9d999707b Fixed invalid XML exporting chars escaping 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3862 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-01-15 18:30:23 +00:00
Tony Roman 79527f0f72 bug#0000582: Ampersand present in graph template graph name causes xml import to fail 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3399 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2005-12-03 22:12:04 +00:00
Larry Adams 2bbb6120f7 changes for mysql 5.x support 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3215 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2005-10-09 21:20:19 +00:00
Ian Berry bd065cce57 fix get_item_xml() return by reference to work with php 4.4 (bug#0000535) 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3137 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2005-08-23 01:39:34 +00:00
Ian Berry eddabc6f60 add proper handling for special xml characters (bug#0000506) 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3108 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2005-08-17 01:44:20 +00:00
Ian Berry 859dd6cf52 removed manual data input method mappings for data queries 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1569 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-06-08 18:36:05 +00:00
Ian Berry ae264da708 add xml_character_encode() and xml_character_decode() to work around php's buggy handling of html entities 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1501 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-02-01 20:37:42 +00:00
Ian Berry 9014054837 updated the copyright to 2004 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1469 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-01-19 06:05:14 +00:00
Ian Berry 9e5b253e92 export and import user-defined colors correctly 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1467 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-01-19 05:53:40 +00:00
Ian Berry a7fbe10bb7 fix some data template item export bugs 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1312 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2003-11-02 06:38:55 +00:00
Ian Berry 1f38b5788b add host template and round robin archive XML import/export support 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1306 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2003-10-30 06:33:38 +00:00
Ian Berry 127fa39d7d finished up most of the xml import code; fixed a few export bugs 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1283 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2003-10-24 02:14:39 +00:00
Ian Berry 1e98dd452c add the new get_item_xml() and resolve_dependencies() functions 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1280 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2003-10-20 21:25:21 +00:00