Commit Graph

26 Commits

Author SHA1 Message Date
Tony Murray
32a7c50189 Use Laravel authentication (#8702)
* Use Laravel for authentication
Support legacy auth methods
Always create DB entry for users (segregate by auth method)

Port api auth to Laravel

restrict poller errors to devices the user has access to

Run checks on every page load.  But set a 5 minute (configurable) timer.
Only run some checks if the user is an admin

Move toastr down a few pixels so it isn't as annoying.

Fix menu not loaded on laravel pages when twofactor is enabled for the system, but disabled for the user.
Add two missing menu entries in the laravel menu

Rewrite 2FA code
Simplify some and verify code before applying

Get http-auth working
Handle legacy $_SESSION differently.  Allows Auth::once(), etc to work.

* Fix tests and mysqli extension check

* remove duplicate Toastr messages

* Fix new items

* Rename 266.sql to 267.sql
2018-09-11 07:51:35 -05:00
Neil Lathwood
2d72d8144e Convert old templates title as well as body (#9034)
* Convert old templates title as well as body

* Update convert-template.inc.php
2018-08-19 09:28:57 +01:00
Tony Murray
3b6fbd99ee Convert alert templates in place (#8951)
* Convert alert templates inplace

* Update copyright

* Update convert-template.inc.php
2018-07-31 21:54:12 +01:00
Richard Mayhew
4bca036433 Updated Old Template URL to point to the correct location within docs (#8905) 2018-07-16 14:28:43 -05:00
Neil Lathwood
ad6ec7f72a Refactor alert templates to use Laravel Blade templating engine (#8803)
* Initial start on new templating support

* further updates

* more updates

* More working version

* Last fixes

* Small updates

* modified test to look for dbname.

* Schema update

* Added fix for not being able to disable Philips Hue transport

* Updated sql file

* Updated db_schema

* Set myclabs/deep-copy to be 1.7.x version in composer

* Fixes from murrant

* Forced nikic/php-parser to version 3.1.x in composer

* Updated composer to use custom fork of string-blade-compiler + fixed transport use

* Updated to always use correct template

* Merged legacy and blade templating engines

* Removed template type + fixed test-alert.php

* Added more template placeholders

* Added ability to reference data in templates as $alert->X

* Updated docs for templates

* Updated db_schema.yaml

* Added $alert->builder

* Clarify the use of $alert->builder

* Fixed the use of $alert->transport

* renamed schema file

* Added template validation

* Small update to fix travis issue

* Add Docs text to title bar

* Updated amqp to new of version

* Consistency in alert rule and template title bars
2018-07-14 22:15:43 +01:00
Neil Lathwood
1eee6e8195 alert: Added ability to make notes for acking alerts + record who did so (#8433)
* alert: Added ability to make notes for acking alerts + record who did so

* Updated schema

* moved sql file

* Updated from comments in PR

* warning changed to blue

* reset notes + keep notes on ack
2018-04-26 00:00:56 -05:00
Tony Murray
7250376104 refactor: Don't access $_SESSION directly for Auth (#8513)
* Don't access $_SESSION directly for Auth

* fix style

* add property annotations
2018-04-07 21:55:28 +01:00
Aldemir Akpinar
18101a93d5 webui: Use toastr for operational messages on alert templates page (#8499)
* webui: Use toastr for operational messages

* Reload template table after insert/update

* Trying to fix travis ci error

* Change error checking to librenms standard
2018-04-07 13:22:08 +01:00
Aldemir Akpinar
34d0fc3199 refactor: Ability to edit default alert template (#7121)
* newfeature: ability to edit default alert template

* Fix style errors

* Added missing db query

* Removed unnecessary code, and added faq section

* Minor documentation about default alert template. And put back wrongly removed lines

* Fixing the silly old mistakes... again
2017-08-12 20:21:13 +01:00
Aldemir Akpinar
3ca39c810d webui: Facelift for alert templates, also added bootgrid (#7041)
* webui: facelift for alert templates, also converted the custom code to bootgrid

* Update alert_template.inc.php

removed var = action line, no longer needed.
2017-07-18 23:54:14 +01:00
Aldemir Akpinar
b378d9e762 webui: Set correct button text when editing an alert template (#6916) 2017-06-29 22:03:43 -05:00
Neil Lathwood
dda3bb0995 fix: alert templates designer now fixed #5636 (#5638) 2017-01-27 23:31:46 +00:00
Vitali Kari
3680849206 feature: Add description and notes to be used in alerts templates (#4706) 2016-10-03 20:31:50 +01:00
Tony Murray
8c639aa5a4 PSR2 Cleanup: /html edition
Travis tests for code conformance. Ignore warnings for now.
Fixed all errors, left most warnings.
2016-08-18 21:29:30 -05:00
Søren Rosiak
3d8e75a216 Merge pull request #3652 from laf/issue-3544 2016-06-14 19:01:28 +02:00
laf
1d678642b3 Updated docs and webui 2016-06-13 22:04:51 +00:00
laf
ed0479a2f3 Fixed the create new alert template / edit template bug 2016-06-13 19:44:14 +00:00
f0o
bea0587634 Fixed edit-javascript 2015-08-30 18:05:57 +01:00
f0o
68f9812b9d Added JavaScript to modal 2015-08-30 17:27:31 +01:00
f0o
ac7d0c9420 Added user defined titles for alert templates 2015-08-30 16:53:34 +01:00
Michael Newton
f77c712bfc changes needed to run under web server subdirectory 2015-08-11 14:54:05 -07:00
Neil Lathwood
945ca7f2ea Revert "changes needed to run under web server subdirectory" 2015-08-11 21:25:23 +01:00
Michael Newton
cc0f449fc9 changes needed to run under web server subdirectory 2015-08-07 11:10:43 -07:00
laf
51e75b3b46 Fix bug with edit/create template re-using template 2015-08-06 19:08:36 +00:00
laf
dae96388e8 Fixed javascript event. issue - stopped Firefox working 2015-02-27 11:57:43 +00:00
laf
807fc9a3ba Alerts gui commit 2014-12-16 20:03:19 +00:00