Commit Graph
263 Commits
Author SHA1 Message Date
cigamit f90e7a552e Correct two minor issues
The likelihood of an XSS is quite low
Always use AS when aliasing column
2018-06-10 11:29:34 -05:00
Petr Macek 80f7ccd86b fix issue #1639 (#1640)
* fix issue #1639

* Fix issue #1639 - better way with apostrophes
2018-05-30 06:28:29 -05:00
cigamit d14c50285b Resolving Issue #1590
User Admin generates SQL error if user is not part of any groups
2018-05-10 19:10:19 -05:00
cigamit 86641b1be2 Pre-apply jQueryUI styles to input objects 2018-05-09 20:58:37 -05:00
Mark Brugnoli-Vinten c70642b93f feature #1400: User settings should have checkbox to enable overriding of default settings (#1577)
* feature #1400: User settings should have checkbox to enable overriding of global settings

* Fix for enable/disable styles

* QA fix for settings not being cleared

* QA fix to prevent double saving
2018-04-29 10:08:46 -05:00
Tony Roman 1ce66b5fde Merge branch 'develop' into feature/1.2.x 2018-02-25 20:12:19 -05:00
Patrick 10f8f893a3 Updated Dutch Translations (#1402)
* Updated Dutch Translations

* Updated Dutch Translations

Merge conflict, needed to re-compile the .mo

* Updated Dutch Translations with latest Cacti.pot

* Fixed some inconsistencies

* Fixed obsolete code

* Updated Dutch Translations
2018-02-25 12:26:22 -06: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 7e70e27940 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x
# Conflicts:
#	docs/CHANGELOG
#	include/themes/modern/main.css
#	tree.php
2018-02-18 16:26:26 -06:00
cigamit 7343c8e4c1 Resolve Issue #1366
Improve error/info message display
2018-02-18 14:20:50 -06:00
cigamit 333d6a5460 Resolve two minor user and group admin issues
-issue: Remove spurious php code from checkbox area in user admin
-issue: Minor plugin permissions format change
2018-02-14 18:03:11 -06:00
cigamit 50103c2708 Correct spelling mistake 2018-01-14 21:06:10 -06:00
cigamit a3b89d798f Correct spelling mistake 2018-01-14 21:05:46 -06:00
cigamit 40b7f28201 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 2018-01-14 20:55:52 -06:00
cigamit a744cb4d84 Detect button widget per jQuery standards 2018-01-14 19:39:21 -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 7c8201f5a0 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x
# Conflicts:
#	docs/CHANGELOG
2018-01-05 18:04:45 -06:00
netniV 6dc3fcb811 Fix for issue #1162 - Missing error messages (#1163)
Error messages are not display when editing a user
2018-01-02 19:16:11 -06:00
netniV 5ce4bea475 Fix issue #1122 - Local user login fails with Multi/Single LDAP enabled (#1129)
* Fix issue #1122 - Local user login fails with Multi/Single LDAP enabled

Code was not consistent with how it was generating the password hashes and comparing them. To fix this, added compat_password_xxx functions that check for the availability of the newer password_xxx functions and if not present revert back to the md5 version.

Changes made are:

auth_changepassword.php:
* Break out of switch when error message set
* Reduce duplication of code when checking passwords
* Use local variables rather than constantly pulling in request ones
* Use new compat_password_xxx functions

auth_login.php:
* Added some debug logging to identify login issues
* Allow local login even if using ldap
* Use new compat_password_xxx functions
* Remove password from SQL search as hash can change and we don't know what it would have been at the time it was set

user_admin.php
* Use new compat_password_xxx functions

lib\auth.php:
* Added compat_password_verify, compat_password_hash and compat_password_rehash to check for PHP 5.7+ compatible functions other use MD5
* Reduced SQL query to just required user in secpass_login_process()
* Fixed password check in secpass_check_history()
* Fixed return value check of secpass_check_pass() in secpass_login_process()
* Use new compat_password_xxx functions

* Update CHANGELOG

* Fixup for Issue #1122, corrects some minor issues

* Merge branch 'Issue-1122' of https://github.com/netniV/cacti into Issue-1122

Update log message to be warning notj ust a normal message

* Fix issue of local auth bypas

* Update CHANGELOG

Fix up CHANGELOG issues

* Update auth.php

Fix up formatting issues
2017-12-23 13:37:05 -06:00
netniV 979373fea4 Fix issue #1122 - Local user login fails with Multi/Single LDAP enabled (#1129)
* Fix issue #1122 - Local user login fails with Multi/Single LDAP enabled

Code was not consistent with how it was generating the password hashes and comparing them. To fix this, added compat_password_xxx functions that check for the availability of the newer password_xxx functions and if not present revert back to the md5 version.

Changes made are:

auth_changepassword.php:
* Break out of switch when error message set
* Reduce duplication of code when checking passwords
* Use local variables rather than constantly pulling in request ones
* Use new compat_password_xxx functions

auth_login.php:
* Added some debug logging to identify login issues
* Allow local login even if using ldap
* Use new compat_password_xxx functions
* Remove password from SQL search as hash can change and we don't know what it would have been at the time it was set

user_admin.php
* Use new compat_password_xxx functions

lib\auth.php:
* Added compat_password_verify, compat_password_hash and compat_password_rehash to check for PHP 5.7+ compatible functions other use MD5
* Reduced SQL query to just required user in secpass_login_process()
* Fixed password check in secpass_check_history()
* Fixed return value check of secpass_check_pass() in secpass_login_process()
* Use new compat_password_xxx functions

* Update CHANGELOG

* Fixup for Issue #1122, corrects some minor issues

* Merge branch 'Issue-1122' of https://github.com/netniV/cacti into Issue-1122

Update log message to be warning notj ust a normal message

* Fix issue of local auth bypas

* Update CHANGELOG

Fix up CHANGELOG issues

* Update auth.php

Fix up formatting issues
2017-12-23 12:58:03 -06: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 92e90783de Taking actions on users does not use callbacks
Minor GUI issue.
2017-08-21 19:53:01 -05:00
cigamit 166950b95e issue: Design of Sunrise requires all checkboxes have their css updated, and include labels. 2017-08-06 14:20:05 -05:00
cigamit cc47688d35 Resolving Issue #875
When modifying Realm permissions, realms that are listed multiple times
don't stay in sync.
2017-07-25 20:04:28 -05:00
cigamit 30bbf226f5 More changes for issue #861
Filters not working properly for i18n
2017-07-20 18:55:33 -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 37a5a7791a Resolving Issue #779
- Resolve randome apache segfault due to recursion.
- Also, remove additional references to export user
- Change the way the guest_account id is gathered.
- Change elseif format
- Remove trailing white-spaces
2017-06-08 07:42:22 -05:00
John Horne e42eb706b2 Correct the graph template count for user permissions. 2017-06-01 13:38:22 +01: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
cigamit f013fb88c7 User Admin page reported wrong permissions at Tree level and missed some i18n 2017-05-14 13:28:56 -05: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 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
Patrick 40dbc3e57b Alignment fixes
Alignment fixes for PHP7.2 compatibility changes of yesterday.
2017-04-22 15:53:05 +02:00
patrick d2185c98b1 PHP7.2 changes:
- Replaced deprecated each() for foreach()
2017-04-21 22:12:55 +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
browniebraun 35d89c5891 fix broken user permission layout occurring if no external links have been defined yet
Signed-off-by: browniebraun <browniebraun@outlook.com>
2017-04-12 23:13:43 +02:00
cigamit 8f6fa03d8d Resolving Issue #533
User settings not cleared after saving profile
2017-04-07 17:26:28 -05:00
cigamit 429d00bc6f Mark realms that are not available with the current ldap setting as such.
This differentiates between LDAP and Multiple LDAP
2017-03-20 18:08:49 -05:00
cigamit 56e630ffa6 Minor layout change. 2017-03-19 16:27:20 -05:00
cigamit 01da9b11d6 Resolving Issue #436
Restricted user does not see graphs in tree view.  Also caught some
issues in the Tree Permissions section of both user and User Group's,
and additional Tree permissions when reproducing the users environment.
2017-03-19 13:18:48 -05: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 e77531201e Resolving Issue #275 2017-02-06 17:05:39 -06:00
cigamit 73d0100349 Resolving visual issues with row counts. 2017-01-29 13:08:32 -06:00
cigamit 5eaab96735 Resolved Issue #235
Also resolving some missing i18n migrations and prepared statement
formatting.
2017-01-28 15:32:15 -06:00