Commit Graph

759 Commits

Author SHA1 Message Date
Igor Scheller 540efef63e active angels: Bugfix and prevent errors when searching double spaces 2018-12-28 21:39:23 +01:00
msquare db26412e6c fixes #549: fill missing arrival dates and prevent setting arrival by admin-user instead of admin-arrive 2018-12-27 19:08:35 +01:00
Igor Scheller acd9ec6966 add multiple shifts: Fix hour regex and sorting, cleanup and formatting 2018-12-26 19:49:01 +01:00
Igor Scheller 36830c43e7 Fix warning if searching two whitespaces and formatting 2018-12-26 19:39:40 +01:00
Igor Scheller 31d9efb2b8 Bugfix: Edit user: Show groups list if angel has no rights 2018-12-25 14:46:14 +01:00
Igor Scheller d214525e24 Sort Angels Alphabetical
closes #541 (Shift Signup: Sort Angels Alphabetical)
2018-12-25 10:25:32 +01:00
jwacalex 8c5b52aa11 reformatted code due to guidelines 2018-12-22 12:10:16 +01:00
jwacalex 60a9c15454 first draft for #536 2018-12-22 12:10:16 +01:00
Igor Scheller b1d8fede46 user: allow up to 40 characters for dect numbers
closes #309 (EPVPN number in DECT field is shortened)
closes #529 (For dect numbers are only 5 digits allowed)
2018-12-22 12:03:24 +01:00
Igor Scheller c5621b82cf Implemented /metrics endpoint and reimplemented /stats
closes #418 (/metrics endpoint)

Usage:
```yaml
scrape_configs:
  - job_name: 'engelsystem'
    static_configs:
    - targets: ['engelsystem.example.com:80']
```
2018-12-19 22:36:42 +01:00
Igor Scheller 204ff4c0e7 rooms admin: Set a maximum character length
closes #525 (Room names with more than 35 characters dispatch a team of untrained monkeys)
2018-12-18 13:22:10 +01:00
msquare 93b819025c fix margin of form submit in tables 2018-12-09 12:51:48 +01:00
MichiK 252f003b94 Really fix the data/timepicker CSS and JS
Attaching the timepicker to the input instead of the sorrounding div didn't
turn out as expected. Therefore, I used the same mechanism for DOM attachment
and lazy initialization for the timepicker like for the datepicker.

Instead of trying to load the CSS through webpack and some JS voodoo, it's
a lot simpler to just include it via the normal base theme CSS. This works.
In addition, I noticed that there is an easier way to read the current locale.
No need to do this twice via different ways.

This closes #516.
2018-12-08 21:14:20 +01:00
MichiK 7e53c45890 Change the color of "reset" in admin_arrive 2018-12-07 17:26:44 +01:00
MichiK ed5ee3235e Add timepickers in shifts view 2018-12-05 18:43:51 +01:00
Igor Scheller c33940f64a Moved permission checks to Authenticator class 2018-12-02 12:53:31 +01:00
Igor Scheller 944c29b964 Require POST for sending forms
* Ensure that the form is submitted with a post request
* Replaced several links with forms

Closes #494 (Security Vulnerability)
2018-11-21 19:24:36 +01:00
Igor Scheller 23c0fae36f Added csrf middleware 2018-11-21 19:24:36 +01:00
msquare 8236989be0 fix missing unique mail validation on user register 2018-11-18 12:13:00 +01:00
Igor Scheller 15751f9c7a Fix error when accessing undefined date
Closes #491 (Edit User fails when User never logged in before)
2018-11-02 18:03:40 +01:00
Igor Scheller 88f3bafa5e Replaced `Auth()` with `auth()` 2018-10-31 13:43:23 +01:00
Igor Scheller 82b22160fd Fixed error if shirt size is not configured 2018-10-31 13:43:23 +01:00
Igor Scheller a2aaba9cab User: Bugfixes & code cleanup 2018-10-31 13:43:23 +01:00
Igor Scheller d7aea575ff Replaced more sql queries and old data 2018-10-31 13:43:23 +01:00
Igor Scheller 57932be428 Moved arrival_date to state 2018-10-31 13:43:23 +01:00
Igor Scheller 4e09ee3eb2 Replaced more user related stuff
(Contains some buggy stuff too...)
2018-10-31 13:43:23 +01:00
Igor Scheller 7c6afc2bfe Removed `User($id)` function 🎉 2018-10-31 13:43:23 +01:00
Igor Scheller 89e62c95a7 Changed more functions 🎉 2018-10-31 13:43:23 +01:00
Igor Scheller b069a938c6 Changed user_link and some other user functions to use the user id 2018-10-31 13:43:23 +01:00
Igor Scheller 2dcb7cc2de Replaced some global `$user` variables 2018-10-31 13:43:23 +01:00
Igor Scheller 90e1a94962 Make application name configurable
* Added app_name configuration option
* Extended `EngelsystemMailer` to prepend the application name to all mails

Closes #426
2018-10-30 22:50:22 +01:00
Igor Scheller 7f61dc95be EventConfig: Merge event configuration from database to global config 2018-10-30 21:13:56 +01:00
Igor Scheller 66038eda14 Merge branch 'twig-templates' 2018-09-23 20:11:37 +02:00
Nos- b2303c0723 Tried to fix inputfields for date, email, tel 2018-09-23 11:48:09 +02:00
Igor Scheller 2a134e6c0b Config: Removed nightshifts query 2018-09-23 11:40:53 +02:00
Igor Scheller 0734807eef Merge remote-tracking branch 'MyIgel/logentry-model' 2018-09-16 12:06:18 +02:00
Igor Scheller d0abc27c07 Merge remote-tracking branch 'MyIgel/translations' 2018-09-15 14:58:31 +02:00
Igor Scheller c1a1180d1f Moved frontend, templates and lang to resources 2018-09-10 18:22:48 +02:00
Igor Scheller 222c9fed7d Merge remote-tracking branch 'MyIgel/templating' 2018-09-09 12:11:12 +02:00
Igor Scheller 9d34f371cb Added CreditsController 2018-09-03 15:42:51 +02:00
Igor Scheller ac48332166 Models: Added LogEntry model 2018-08-31 03:24:54 +02:00
Bot e8f8fc7f5f Replaced gettext translation `_()` with `__()` that uses the Translator class 2018-08-29 23:46:32 +02:00
Igor Scheller acfe72cb91 Removed translation from config file 2018-08-29 23:46:32 +02:00
Igor Scheller bb3d16d273 Added Twig template renderer, closes #338 2018-08-29 23:46:11 +02:00
Igor Scheller 175c335810 Db::selectOne() should return null if result is empty 2018-08-29 18:11:35 +02:00
Igor Scheller d93ace2eae Prevent object serialization in session 2018-08-20 21:08:06 +02:00
Igor Scheller d6c8f1a614 Merge branch 'master' to 'rebuild-database' 2018-08-20 21:07:57 +02:00
Igor Scheller 864a086900 Prevent object serialization in session 2018-08-07 16:54:08 +02:00
msquare 0f1da65f2a
Merge pull request #421 from MyIgel/master
Prevent empty string after $tokens = explode(' ', $search);
2018-01-22 20:48:59 +01:00
msquare 2e1c2cf3b5 remove br between shift filter checkboxes 2018-01-22 20:45:31 +01:00
Igor Scheller fe58e4f422 database: updated checks for selectOne 2018-01-14 17:47:26 +01:00
Igor Scheller b2e5b5c44d Prevent empty string after $tokens = explode(' ', $search); 2018-01-03 01:47:34 +01:00
msquare 73ed2308c1 use user tshirt count 2017-12-30 13:59:41 +01:00
msquare b3ca550ed0 simplify t-shirt statistics 2017-12-30 13:40:24 +01:00
msquare 0314ba19e3 make got t-shirt always available 2017-12-30 13:37:26 +01:00
msquare c961269bb7 better hour formatting 2017-12-30 12:07:10 +01:00
msquare ee9fbda098 add work date to work log 2017-12-29 18:57:11 +01:00
msquare 86a38a3372 add user work log entries feature 2017-12-29 17:19:27 +01:00
msquare e7b0e9934d add shift filter buttons at the top 2017-12-29 16:20:30 +01:00
msquare 8c64532902 fix ical export description 2017-12-27 15:06:39 +01:00
Igor Scheller 6ceec76e7d feature request: filter angel types based on account settings, closes #362 2017-12-27 13:43:46 +01:00
msquare abf4b1da30 check if logged in before sign up 2017-12-27 11:35:26 +01:00
Igor Scheller 6953090e7d 392: Show warning message when editing html news without proper permissions to save them, Closes #392 2017-12-26 14:35:33 +01:00
Bot 952c7892f3 Formatting & Docstrings 2017-12-25 23:51:15 +01:00
klemens a6cf4c9ce9 spelling fixes 2017-12-25 21:29:00 +01:00
msquare 81b4e9d2bc solve problem with autobreaks in news text when building html tables 2017-12-20 23:46:04 +01:00
msquare 34da670b6f solve problem with autobreaks in news text when building html tables 2017-12-20 23:42:37 +01:00
msquare 2b52d24c59 solve problem with autobreaks in news text when building html tables 2017-12-20 23:40:46 +01:00
msquare 9969208be2 solve problem with autobreaks in news text when building html tables 2017-12-20 23:35:06 +01:00
msquare a0f70d9819 solve problem with autobreaks in news text when building html tables 2017-12-20 23:21:03 +01:00
msquare a1c032642f introduce new shift signup state for not arrived angels 2017-12-20 23:12:17 +01:00
msquare 1289101f6e rewrite controller for creating shift entries 2017-12-20 00:42:58 +01:00
msquare fd85034e7f redo shift signoff and icons for delete/confirm/acknowledgment questions 2017-12-19 20:58:01 +01:00
msquare 952dc6921a undo of fix #382: XXE DoS in engelsystem - the feature is actually needed for xcal files 2017-12-14 14:56:29 +01:00
msquare a8cf4b9ddf fix #382: XXE DoS in engelsystem 2017-12-13 16:59:28 +01:00
msquare 5278be1f0f add link to public dashboard from shift view 2017-12-13 12:53:07 +01:00
msquare d5631297dc better logging of needed angeltypes for shifts and rooms 2017-12-12 20:04:36 +01:00
msquare afb77d22ba move room db queries to model 2017-12-10 18:56:40 +01:00
msquare aae8c77ed1 fix #212: Duplicate entry for Room name 2017-12-10 18:36:53 +01:00
msquare dbf6e64a2c change write permission check to catch exceptions 2017-12-10 18:10:28 +01:00
msquare 4143680297 remove room number and visible flag, rename pentabarf to frab and introduce map/c3nav integration as well as markdown description for rooms 2017-12-10 15:02:37 +01:00
msquare 9e04e2d4a0 fix age validation 2017-11-29 17:41:12 +01:00
Igor Scheller 0b45d2a88f #366 Feature: Time Interval Buttons (on Shifts page), closes #366 2017-11-29 13:30:41 +01:00
msquare bb2681a7c8 add validation of dect numbers 2017-11-21 19:00:42 +01:00
msquare 15c50ab315 fix minor cody style issues (codacy) 2017-11-19 15:13:48 +01:00
msquare 86e41e2949 change logging of needed angeltypes for created shifts 2017-11-19 13:55:18 +01:00
msquare 4eedad6c89 fix problem with default values on registration 2017-11-19 12:03:29 +01:00
msquare f9ab269758 fix problem with default values on registration 2017-11-19 12:02:11 +01:00
msquare 6b74705f37 fix problem with default values on registration 2017-11-19 12:00:42 +01:00
msquare d8de02db34 fix problem with default values on registration 2017-11-19 11:59:37 +01:00
msquare 59cd65cb50 fix problem with validation of planned arrival date 2017-11-19 11:58:19 +01:00
msquare 7df64c82a6 fix problem with bools in queries 2017-11-19 11:52:39 +01:00
msquare c62833bb51 fix problem with default value when registering 2017-11-19 11:45:22 +01:00
msquare eec161a852 fix problem with default age when registering 2017-11-19 11:34:12 +01:00
msquare 50f24271eb fix all redirects to home (because of new urls redirect to ? wont work anymore) 2017-11-19 10:45:08 +01:00
Igor Scheller 4817658862 Merge branch 'noc0lour:fix_setup_bugs', closes #335 2017-09-25 20:25:00 +02:00
Igor Scheller 945fcb079a Added registration_enabled configuration 2017-09-20 12:18:08 +02:00
Igor Scheller e6ed8a3017 Changed LogEntries table: Use log level instead of nick name 2017-09-19 19:45:02 +02:00
Igor Scheller 8c81adc8e8 Implemented container 2017-08-31 17:30:54 +02:00
Igor Scheller 0a20883aa8 Reimplementation of 2840bb619 (signup requires arrival), closes #330 2017-08-31 12:32:08 +02:00
Igor Scheller 2bd127c011 Use symfony session 2017-08-30 19:57:01 +02:00
Igor Scheller 96f1d9fd54 Bugfixes 2017-08-30 15:35:12 +02:00
Bot a473a56f1d Formatting 2017-08-30 00:22:02 +02:00
Igor Scheller d0074cf006 Merge remote-tracking branch 'engelsystem/feature-igel-rewrite'
# Conflicts:
#	includes/controller/angeltypes_controller.php
#	includes/pages/admin_groups.php
#	includes/pages/user_settings.php
#	includes/sys_page.php
#	src/Exceptions/Handler.php
#	src/Http/Request.php
2017-08-29 23:16:41 +02:00
Igor Scheller 3002ed9e93 Security: Only allow angels with admin_news_html privilege to use HTML 2017-08-29 22:22:53 +02:00
Igor Scheller cc01c906ba #336: Integration of symfony/http-foundation request 2017-08-29 21:52:07 +02:00
Igor Scheller 73175e2b64 #337: Added routing 2017-08-28 17:34:00 +02:00
Andrej Rode 5f305121a4 fix order by not in select clause for >mysql-5.7 2017-08-16 00:45:56 +02:00
msquare f82e5456d2 dried code by introducing selectOne for select queries with only one result line expected 2017-07-28 20:11:09 +02:00
msquare 69a1ee2bfe use glyph bool icons on room list 2017-07-28 19:49:32 +02:00
msquare a0af8d4624 further switching to db exceptions instead of return false 2017-07-28 19:15:52 +02:00
msquare 5794c4cab8 clear delete queries from false resuls 2017-07-28 18:50:00 +02:00
msquare a157004f4a handle failed db queries in Db class 2017-07-23 11:46:54 +02:00
Igor Scheller e1762e7764 replaced template_render with dynamic renderer class 2017-07-20 02:30:53 +02:00
Igor Scheller d4ad70804b Removed overwhelmed page 2017-07-20 02:10:53 +02:00
Igor Scheller 7d5d905fcf Moved $themes array to config 2017-07-20 01:14:28 +02:00
Igor Scheller 3a1e460249 Changed $_GET, $_POST and $_REQUEST to use the Request object 2017-07-19 11:44:16 +02:00
Igor Scheller 68da2a4eb8 Renamed "default_theme" config to "theme" 2017-03-02 08:11:52 +01:00
Igor Scheller 781f830678 Fixes and improvements 2017-01-22 01:16:00 +01:00
Bot 3de0cc840f Removed spaces 2017-01-22 01:12:57 +01:00
Igor Scheller 8506d6d27e Refactoring: Config cleanup / moved to class 2017-01-21 23:07:20 +01:00
Bot 740026a9de Replaced [0-9] with \d 2017-01-21 20:12:48 +01:00
Bot 915ce28fee Replaced " with ' 2017-01-21 20:12:35 +01:00
Igor Scheller 9a3ad88834 Changed from mysqli to PDO, some refactorings, faster sql queries 2017-01-21 13:58:53 +01:00
Igor Scheller 8254a79c58 Bugfixes & improvements 2017-01-03 15:59:33 +01:00
Bot 55141154c0 Replaced " with ' 2017-01-03 15:32:59 +01:00
Bot 356b2582f3 PPHDoc, formatting, fixes, cleanup 2017-01-03 03:22:48 +01:00
Bot d71e7bbfad Formatting 2017-01-02 15:49:53 +01:00
Bot 7313e15ce8 PSR-2 formatting 2017-01-02 03:57:23 +01:00
msquare 29128763fd Merge pull request #306 from MyIgel/config-fix-constant
Fixes "Constant already defined" notice
2017-01-02 00:09:18 +01:00
Igor Scheller 1f8d1eb4bb Fixed "Constant already defined" notice
Added more ugly global variables
2017-01-01 18:50:53 +01:00
Igor Scheller 00d8709ae8 Fix relative paths 2017-01-01 05:58:42 +01:00
msquare fe5dec73ba bring back filtering by occupancy 2016-12-29 14:51:43 +01:00
msquare 5600476c56 fix missing users on active angels view 2016-12-28 18:30:09 +01:00
msquare 4407604793 move data sorting to begin 2016-12-28 14:53:35 +01:00
msquare 6c4bb0da31 move data sorting to begin 2016-12-28 14:49:00 +01:00
msquare 0603d0dd4e remove unused code 2016-12-28 12:11:35 +01:00
msquare 860252bce8 select only one room per default 2016-12-27 23:07:44 +01:00
msquare 46528fe1d8 shift view performance improvements 2016-12-27 23:02:05 +01:00
msquare ffc33993d4 overwhelmed 2016-12-27 19:16:26 +01:00
msquare 9975e42d3c fix edit user bug deleting emails 2016-12-27 13:10:18 +01:00
msquare 2f2d08c574 fix edit user bug deleting emails 2016-12-27 13:05:30 +01:00
msquare 827de98256 fix room delete bug in pentabarf import temporarily 2016-12-26 19:08:59 +01:00
msquare 188891c147 use planned arrival time validation for register page 2016-12-23 16:22:46 +01:00
msquare bae3ede662 fixes #279 fix exporting freeload comment in json export 2016-11-25 13:38:16 +01:00
Leandra Eberle 67df8da061 Typo Changes and Descriptions 2016-11-24 22:47:32 +01:00
gnomus dc49b9af41 Update guest_login.php 2016-11-24 12:22:18 +01:00
msquare 16e9a69c0d fixes #277 date parsing returns the start of the day now 2016-11-24 09:25:28 +01:00
Leandra Eberle 4116e0114e Change ask an Arch Angel, to Ask the Heaven because the Arch Angel only role is deprecated 2016-11-24 00:17:01 +01:00
msquare 5ae328b2b1 hide event countdown for mobile clients 2016-11-20 17:54:16 +01:00
msquare 409761ce4b rebuild login page 2016-11-18 15:36:02 +01:00
msquare 9c4636f5c4 reduce complexity of user driver license 2016-11-17 14:35:04 +01:00
msquare 1636688394 reduce complexity of angeltype edit controller 2016-11-17 13:03:28 +01:00
msquare ac53559fea fix shift calendar headers 2016-11-15 22:00:17 +01:00
msquare 918d41ca70 reduce complexity of menu and hints 2016-11-15 16:31:55 +01:00
msquare ec6016cd38 reduce complexity of menu and hints 2016-11-15 16:28:20 +01:00
msquare 16ed2ae683 fixed settings validation 2016-11-14 19:10:29 +01:00
msquare d3e942f742 Merge pull request #273 from anykraus/typo-sheduler-scheduler
minor typo fixed (sheduler to scheduler)
2016-11-14 18:21:58 +01:00
msquare 5f2871538a fix css problem with rooms table 2016-11-11 17:07:40 +01:00
msquare 03c9d1ef5d reduce complexity of user settings main 2016-11-11 17:00:51 +01:00
msquare beb0db6852 fix misspellings 2016-11-11 16:42:47 +01:00
msquare 247166f28b improve code of user settings 2016-11-11 16:34:23 +01:00
msquare f5a5f234e4 fixes #266: add checkbox allowing the users email to be used by humans like event-team 2016-11-11 15:24:51 +01:00
msquare 82b9436c50 rename coordinator to supporter 2016-11-11 14:59:25 +01:00
msquare f6da9148e7 fix missing var check 2016-11-10 13:38:31 +01:00
msquare defdb3007c Merge pull request #272 from anykraus/#271-admin_active
fix admin_active.php not displaying (issue #271)
2016-11-09 22:04:22 +01:00
msquare a8e3e91448 implement shift calendar into user shift page 2016-11-07 20:55:37 +01:00
anykraus 8c22ec7f6d typo fixed (sheduler to scheduler) 2016-11-07 20:24:01 +01:00
anykraus efb7dbfb01 fix admin_active.php not displaying (issue #271)
Reverts 53ad1b5110 "fix codacy unused code" partially. (where $shift_sum_formula was removed from global)
2016-11-02 02:04:43 +01:00
msquare 6fff6a6c1a begin room view and shifts filter renderer 2016-10-05 18:56:50 +02:00
msquare a50b26490c reduce complexity of shiftsfilter update 2016-10-04 18:52:52 +02:00
msquare aa628208ec reduce complexity of shift view 2016-10-04 18:36:57 +02:00
msquare 676f5e1627 small code style improvements 2016-10-04 18:11:26 +02:00
msquare 42144ed21c move static access to datetime parse function 2016-10-04 17:58:56 +02:00
msquare eec10ebfc5 reduce complexity of user angeltypes controller 2016-10-04 16:50:06 +02:00
msquare 455e417200 fix variable naming problems 2016-10-04 16:16:00 +02:00
msquare 51d270db28 restore ical export 2016-10-03 19:37:00 +02:00
msquare f3a0ce865d move sql queries from shifts controller to model 2016-10-03 18:32:25 +02:00
msquare d59809d6d2 bring back session filter store 2016-10-02 23:32:10 +02:00
msquare 5e66007f06 introduce ShiftsFilter 2016-10-02 23:00:01 +02:00
msquare 6ff5e7997a split user_shifts into different functions 2016-10-02 21:19:03 +02:00
msquare d5d2acc7d8 improve code style 2016-10-01 10:48:19 +02:00
msquare 6dfefc3bb9 small code improvements 2016-09-30 18:49:33 +02:00
msquare 3738d071f8 remove long array syntax 2016-09-30 17:08:20 +02:00
msquare 9ad9088260 make short variable names longer 2016-09-29 19:31:26 +02:00
msquare 07ddbb0f4c make short variable names longer 2016-09-29 12:45:06 +02:00
msquare f05f1a3cd4 rename to 2016-09-29 12:08:12 +02:00
msquare 81e5a6482c remove unused global from login 2016-09-29 11:32:03 +02:00
msquare 91dafb19ec prohibit inline control structures on pages 2016-09-29 10:53:17 +02:00
msquare 5170fd7f6e prohibit inline control structures on helpers 2016-09-29 09:49:25 +02:00
msquare 6685beb397 display event countdowns on start page 2016-09-29 09:25:06 +02:00
msquare 6384eca1ce display user welcome message 2016-09-28 07:28:51 +02:00
msquare a083c198bb better log when changing event config 2016-09-27 18:42:10 +02:00
msquare 031fc3057c rename settings to event config and implement mvc pattern on it 2016-09-27 17:49:39 +02:00
msquare 45bbf95972 fix settings validation 2016-09-27 17:49:39 +02:00
msquare 3f4be08865 remove old update script 2016-08-22 19:32:54 +02:00
msquare 14d20933f7 improve quality of user atom 2016-08-22 19:23:23 +02:00
msquare 54e6f422ce cleanup guest stats 2016-08-22 19:11:09 +02:00
msquare 79588ff2cf split user atom into different functions 2016-08-22 19:08:10 +02:00
msquare d4bba0d468 remove exit code from shifts controller 2016-08-22 19:03:18 +02:00