* Import: Fixed handling of references to objects not included in file
When exporting an object with the "Include Dependencies" option disabled and then importing the resulting file, the import process will not complete successfully. This is because the mapping of object hashes to object IDs only tracks objects that have been included in the file.
This commit resolves the issue by first loading the mapping with all existing hashes and IDs before processing the file's objects. This results in the expected behavior when a referenced object is not in the file but is already loaded into the Cacti installation.
* Revised #1787 based on review from @cigamit
- Removed unnecessary double quotes
- Encapsulated `foreach` on possibly-empty array with size check
- Added whitespace
* Updated CHANGELOG to include #1796
* 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
- 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.
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
- 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
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)
- 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
-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
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.
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.
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.
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.
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.
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
Mark Brugnoli-Vinten