Commit Graph

70 Commits

Author SHA1 Message Date
Uwe Steinmann
88a3359a9e Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2020-05-26 14:53:41 +02:00
Uwe Steinmann
5d5a7da2d0 return to old setcookie() because the new parameter $options requires php 7.3 2020-05-26 14:51:58 +02:00
Uwe Steinmann
3e45348b31 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2020-05-25 15:57:49 +02:00
Uwe Steinmann
3b0037649d pass options of cookie as array 2020-05-25 15:48:19 +02:00
Uwe Steinmann
d1f47f9320 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2020-04-22 17:22:24 +02:00
Uwe Steinmann
dcfefa5801 remove cloѕing php tag 2020-04-20 10:18:51 +02:00
Uwe Steinmann
48cf4b2ff3 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2019-01-15 09:13:23 +01:00
Uwe Steinmann
73e1df3ad8 make it work with slim notfound handler 2019-01-09 09:19:46 +01:00
Uwe Steinmann
a4ddbd6605 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2018-11-12 13:33:56 +01:00
Uwe Steinmann
2f8fd33f8e do not redirect to ForcePassword page if out.Logout.php was opened (Closes #421) 2018-11-08 16:38:32 +01:00
Uwe Steinmann
aa416f90ec do not enforce 2facto auth for guest and when secret is set 2018-03-27 13:43:56 +02:00
Uwe Steinmann
ab7776bdb9 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2018-02-07 22:32:18 +01:00
Uwe Steinmann
a36f5721dd pass $dms to preAddService() and postAddService() 2018-02-07 18:58:56 +01:00
Uwe Steinmann
72c5bd237b Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-23 18:48:45 +01:00
Uwe Steinmann
a001d32854 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-23 17:43:39 +01:00
Uwe Steinmann
46582a2be4 update last access time only once a minute 2017-03-23 17:25:54 +01:00
Uwe Steinmann
2c498613b6 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-17 16:02:42 +01:00
Uwe Steinmann
4e92b9e0d3 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-17 16:02:27 +01:00
Uwe Steinmann
96d153a4f8 do not resetSu wіth any request 2016-11-17 16:00:08 +01:00
Uwe Steinmann
34ce80eb3d do not redirect if session ended and it is an ajax call 2016-08-22 17:00:52 +02:00
Uwe Steinmann
dac9c7b37f check also for '' in pwdExpiration 2016-08-08 12:57:07 +02:00
Uwe Steinmann
b8b1996fb4 redirekt to out/out.Setup2Auth.php if 2-fact-auth isn't setup
make sure user has not been substituted for setting up 2-fact-auth
or password change
2016-07-12 17:40:54 +02:00
Uwe Steinmann
6380e028fa Merge branch 'seeddms-5.0.x' into develop 2016-05-03 07:09:26 +02:00
Uwe Steinmann
6c509d3f8b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-03 07:05:10 +02:00
Uwe Steinmann
553a29bd29 remove some old code 2016-05-03 07:03:31 +02:00
Uwe Steinmann
6278dd8df3 set access restrictions by role 2016-04-12 12:22:36 +02:00
Uwe Steinmann
17fc1d7dd4 sync with 5.0.x 2016-04-07 08:30:25 +02:00
Uwe Steinmann
552c3b4d98 Merge branch 'seeddms-5.0.x' into develop 2016-04-05 10:05:05 +02:00
Uwe Steinmann
f4b6b9b6e1 do not pass $dms and $settings to (pre|post)AddService 2016-04-04 16:40:41 +02:00
Uwe Steinmann
5de44791ff fix name of preAddService 2016-04-04 16:17:41 +02:00
Uwe Steinmann
3f6420a6d4 Merge branch 'seeddms-5.0.x' into develop 2016-03-14 18:20:03 +01:00
Uwe Steinmann
6132c364de call hooks before and after setting notification service 2016-03-09 18:25:17 +01:00
Uwe Steinmann
a5d766543e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 18:03:34 +01:00
Uwe Steinmann
acdfa6f8c4 add notification service 2016-03-09 17:57:38 +01:00
Uwe Steinmann
4770608d8f include inc.ClassAccessOperation.php 2016-03-04 09:40:49 +01:00
Uwe Steinmann
0e5e09dbbf fix logout if not admin 2016-02-19 08:21:22 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
c45f88ce3d make autoLogin and enableGuestAutoLogin work together 2016-02-02 10:02:13 +01:00
Uwe Steinmann
76f5a89f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-02 09:48:18 +01:00
Uwe Steinmann
7dc478382f initial support for auto login of guest user 2016-01-29 16:48:21 +01:00
Uwe Steinmann
1f77a749be Merge branch 'seeddms-5.0.x' into develop 2015-11-27 16:09:11 +01:00
Uwe Steinmann
250400a9cb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-25 17:01:52 +01:00
Uwe Steinmann
eda80242ea some reorganization of email notification 2015-11-25 16:49:09 +01:00
Uwe Steinmann
889779113d first check if user is an object before using it 2015-07-14 21:35:53 +02:00
Uwe Steinmann
f616c6cf39 check if user is valid before using it 2015-07-14 21:34:51 +02:00
Uwe Steinmann
bdfb552204 auto login user if not already logged in
the user won't have a session, but will be granted access for the
http request

Conflicts:
	inc/inc.Authentication.php
2015-07-14 21:32:15 +02:00
Uwe Steinmann
f187dff23a auto login user if not already logged in
the user won't have a session, but will be granted access for the
http request
2015-07-14 21:23:54 +02:00
Uwe Steinmann
536ead64ac allow to substitute user for regular users 2015-05-19 19:44:18 +02:00
Uwe Steinmann
1fcc786d25 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/Core/inc.ClassUser.php
	op/op.AddDocument.php
	styles/bootstrap/application.css
	views/bootstrap/class.UsrMgr.php
2014-05-22 08:21:22 +02:00
Uwe Steinmann
a5863e4a10 run SeedDMS_Session::updateAccess() because load() doesn't do it anymore 2014-05-22 06:37:56 +02:00