Commit Graph

773 Commits

Author SHA1 Message Date
Uwe Steinmann
ca76b64ba8 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-11-08 12:00:44 +01:00
Uwe Steinmann
2ed68b22d2 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-08 11:39:02 +01:00
Uwe Steinmann
b3571c360b new version 4.3.31 2016-11-08 11:27:28 +01:00
Uwe Steinmann
b5626c2cdf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-07 09:27:28 +01:00
Uwe Steinmann
f960f69fc9 add new configuration for preview of pdf documents 2016-11-07 09:25:06 +01:00
Uwe Steinmann
f6db8de5bd do not use static class name 'SeedDMS_Core_Document'
rather use classname as saved in instance of dms
2016-11-02 13:40:54 +01:00
Uwe Steinmann
9ac66febee add config paramter enableAdminReceipt
allows admins in list of possible recipients of documents
2016-10-27 14:11:18 +02:00
Uwe Steinmann
e10b6974ae add new config flag which allows doc reception by owner 2016-10-27 12:17:04 +02:00
Uwe Steinmann
cc387a1f52 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-27 09:39:08 +02:00
Uwe Steinmann
44f89b9949 add function getAttributeValidationText() 2016-10-27 09:18:45 +02:00
Uwe Steinmann
d3c12a84fd Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-25 10:02:09 +02:00
Uwe Steinmann
bf9e2fa0da Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-25 10:01:00 +02:00
Uwe Steinmann
bfd02591c8 make getConfigDir static 2016-10-25 09:56:49 +02:00
Uwe Steinmann
e69fb26dcc prepare for new version 4.3.30 2016-10-07 16:11:29 +02:00
Uwe Steinmann
754d256532 prepare for next version 5.0.7 2016-10-07 16:10:49 +02:00
Uwe Steinmann
3d1e6eede0 role has now id 3 instead of 0 2016-10-06 15:30:02 +02:00
Uwe Steinmann
2cc90ccbaf Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-06 15:29:11 +02:00
Uwe Steinmann
1541fc26ec Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-06 15:27:52 +02:00
Uwe Steinmann
5658cbbe54 set initial role to '0' not '1' 2016-10-06 15:26:28 +02:00
Uwe Steinmann
9d1f3b867f Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-04 20:55:33 +02:00
Uwe Steinmann
3d50543b66 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-04 20:48:51 +02:00
Uwe Steinmann
9fa5ececb7 add showSingleSearchHit config option 2016-10-04 16:54:16 +02:00
Uwe Steinmann
19d4d84e58 set model in tblAcos because it may not be null 2016-09-22 08:47:20 +02:00
Uwe Steinmann
8881ad1e74 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-06 14:49:22 +02:00
Uwe Steinmann
0977ed0a76 new version 4.3.29 2016-09-06 14:35:30 +02:00
Uwe Steinmann
b646e4f9cf Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-30 13:36:09 +02:00
Uwe Steinmann
5003c54deb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-30 08:46:59 +02:00
Uwe Steinmann
62d0f249d2 remove guest user check 2016-08-30 07:56:50 +02:00
Uwe Steinmann
05a7a897f2 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-24 11:17:17 +02:00
Uwe Steinmann
6ab08983bb new version 4.3.28 2016-08-24 10:20:53 +02:00
Uwe Steinmann
3fbfadeebd add optional parameter $plain to exitError()
if set, the resulting html will only be a html fragment to be embedded
in a page
2016-08-22 17:01:53 +02: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
073bdf24bb add rss feed of timeline 2016-08-10 18:16:39 +02:00
Uwe Steinmann
eebb3e996d Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-10 17:53:12 +02:00
Uwe Steinmann
002684e840 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-10 17:49:56 +02:00
Uwe Steinmann
0802198e87 some more documentation of ldap settings 2016-08-10 17:48:23 +02:00
Uwe Steinmann
e1d09ac09f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-10 15:53:31 +02:00
Uwe Steinmann
f890b23ccc put authentication into its own class 2016-08-10 15:52:55 +02:00
Uwe Steinmann
43016dcbc1 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-08 20:31:01 +02:00
Uwe Steinmann
7f7bb2926d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-08 20:29:27 +02:00
Uwe Steinmann
176fb7967b use getCurrentDatetime() instead of CURRENT_TIMESTAMP 2016-08-08 12:58:06 +02:00
Uwe Steinmann
dac9c7b37f check also for '' in pwdExpiration 2016-08-08 12:57:07 +02:00
Uwe Steinmann
138a6ce408 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-03 09:30:53 +02:00
Uwe Steinmann
b013553a3d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-03 09:24:10 +02:00
Uwe Steinmann
06347ff212 check for HTTP_X_FORWARDED_FOR in add_log_line()
use it instead of REMOTE_ADDR
2016-08-03 08:53:14 +02:00
Uwe Steinmann
8770aaecb3 add new paramter maxSizeForFullText 2016-08-02 17:08:54 +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
825ef2898b add enable2FactorAuthentication 2016-07-06 22:25:43 +02:00
Uwe Steinmann
d7898f972e new version 4.3.27 2016-07-04 09:17:35 +02:00
Uwe Steinmann
44dbf74c57 Merge branch 'seeddms-5.0.x' into develop 2016-05-30 11:20:47 +02:00
Uwe Steinmann
d76d54ce96 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-24 08:00:48 +02:00
Uwe Steinmann
6ba8013d40 add option to unlink file in drop folder once uploaded 2016-05-23 13:15:50 +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
9fb4dfaa9b start new version 5.0.4 2016-05-03 06:44:50 +02:00
Uwe Steinmann
8a4948085a Merge branch 'seeddms-5.0.x' into develop 2016-04-28 12:24:47 +02:00
Uwe Steinmann
4dbe07871c check for dependency on seeddms
disable extension if dependency not met
2016-04-28 12:04:09 +02:00
Uwe Steinmann
135f9c06f6 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-22 16:49:11 +02:00
Uwe Steinmann
2ee76efedb new version 4.3.26 2016-04-22 16:46:56 +02:00
Uwe Steinmann
35d7a70ade header for additional columns can be set 2016-04-22 12:57:39 +02:00
Uwe Steinmann
e1926ed217 add more documentation 2016-04-22 08:21:18 +02:00
Uwe Steinmann
823e7bf76e better handling of access rights if advanced access rights are turn off
check_view_access() returns true for admins and false otherwise
2016-04-21 17:19:58 +02:00
Uwe Steinmann
20c0abf69d add missing attribute 'target' to converters
this needs to be done when updating from 5.0.x to 5.1.x
2016-04-21 15:33:57 +02:00
Uwe Steinmann
8a08cc3bff check_view_access() returns true if advanced access is turned off 2016-04-20 18:09:05 +02:00
Uwe Steinmann
ea4d3d782c add parameter to html_link() for turning access check off 2016-04-20 18:08:24 +02:00
Uwe Steinmann
4590a14de1 fix html_link(), link attributes can't be added 2016-04-20 09:01:20 +02:00
Uwe Steinmann
8c77b0734c add hook to set extra columns, fix column counting if approval or review does not exists 2016-04-18 20:51:32 +02:00
Uwe Steinmann
caf1501c89 add mehtod __invoke() 2016-04-13 18:30:54 +02:00
Uwe Steinmann
94682fb0ff copy code from check_view_access() to check_controller_access() 2016-04-13 18:29:58 +02:00
Uwe Steinmann
0dba3d5300 Merge branch 'seeddms-5.0.x' into develop 2016-04-13 08:53:12 +02:00
Uwe Steinmann
d2ca2a8329 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-13 08:53:03 +02:00
Uwe Steinmann
4c15aa7c49 check_access() doesn't check for admin anymore
check_view_access() does it now
2016-04-13 08:49:32 +02:00
Uwe Steinmann
e22ca653ed check_view_access() returns true/false and also takes admin role into account 2016-04-13 08:48:23 +02:00
Uwe Steinmann
d2b2bd0226 check() returns true/false again 2016-04-13 08:47:33 +02:00
Uwe Steinmann
2d79a0f143 make php7 compatible 2016-04-12 17:05:05 +02:00
Uwe Steinmann
6278dd8df3 set access restrictions by role 2016-04-12 12:22:36 +02:00
Uwe Steinmann
3654906e9a set $dms->noReadForStatus (still commented out) 2016-04-12 07:56:53 +02:00
Uwe Steinmann
be8be01ed5 check if getLatestContent() returns a version 2016-04-12 07:54:22 +02:00
Uwe Steinmann
c86616b971 Merge branch 'seeddms-5.0.x' into develop 2016-04-07 08:38:05 +02:00
Uwe Steinmann
8a0073c39a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-07 08:33:41 +02:00
Uwe Steinmann
ef6bbecd1e add optional parameter to add_log_line() 2016-04-07 08:32:07 +02:00
Uwe Steinmann
c3ab200c87 use SEEDDMS_CONFIG_FILE if set 2016-04-07 08:31:40 +02:00
Uwe Steinmann
c2d8fb1508 remove empty line 2016-04-07 08:31:11 +02:00
Uwe Steinmann
df040190f1 pass $settings to view, set default theme to bootstrap 2016-04-07 08:30:47 +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
d59e7c1228 remove some duplicate code, do not use classname SeedDMS_Core_User 2016-04-05 09:41:32 +02:00
Uwe Steinmann
369411ec5b $settings is not needed 2016-04-04 16:41:09 +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
50a39d439a revisors may not be set unless document is release or in revision 2016-03-23 17:56:34 +01:00
Uwe Steinmann
a693233150 make mayEditVersion() work again 2016-03-23 16:53:01 +01:00
Uwe Steinmann
e72e7f3f15 Merge branch 'seeddms-5.0.x' into develop 2016-03-22 15:22:19 +01:00
Uwe Steinmann
0577fec1ba Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-22 15:11:42 +01:00
Uwe Steinmann
2e8c9cb690 use __construct for constructor 2016-03-22 14:55:48 +01:00
Uwe Steinmann
7bd77ba43e Merge branch 'seeddms-5.0.x' into develop 2016-03-15 08:50:32 +01:00
Uwe Steinmann
fc0b7a4e16 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-15 08:48:03 +01:00
Uwe Steinmann
d283c24979 put footnote into row-fluid 2016-03-15 08:28:23 +01:00
Uwe Steinmann
4125c0c437 set optional parameter of contentContainerStart(), fix settings var sitename 2016-03-15 06:33:13 +01: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
197a005da6 add $dms as parameter to constructor 2016-03-09 18:05:55 +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
d317388d18 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 08:10:15 +01:00
Uwe Steinmann
9a319ef539 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 08:06:37 +01:00
Uwe Steinmann
4c2fd6962a new version 4.3.25 2016-03-09 08:01:31 +01:00
Uwe Steinmann
526ae37b08 add new parameter editOnlineFileTypes 2016-03-09 07:45:37 +01:00
Uwe Steinmann
46843ad0e7 add mayEditVersion()
checks if version may be edited online
2016-03-09 07:44:12 +01:00
Uwe Steinmann
4e32ce086e Merge branch 'develop' into seeddms-5.1.x 2016-03-08 10:46:34 +01:00
Uwe Steinmann
aca3db06c2 Merge branch 'seeddms-5.0.x' into develop 2016-03-08 10:46:16 +01:00
Uwe Steinmann
91e57e49da Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-08 10:42:21 +01:00
Uwe Steinmann
969fa2569b add method jsTranslations() 2016-03-08 10:37:07 +01:00
Uwe Steinmann
1f9aa108a4 set parameter class 2016-03-04 15:45:28 +01:00
Uwe Steinmann
8e606dac8b order objects by alias 2016-03-04 15:45:10 +01:00
Uwe Steinmann
04eadaad67 add check_controller_access() 2016-03-04 15:44:11 +01:00
Uwe Steinmann
4770608d8f include inc.ClassAccessOperation.php 2016-03-04 09:40:49 +01:00
Uwe Steinmann
6826e69795 add function for creating links, urls, and check access 2016-03-04 09:28:37 +01:00
Uwe Steinmann
bd3fbd5cf7 cache aro, first param of check_view_access() can be string, array, object 2016-03-04 09:27:29 +01:00
Uwe Steinmann
1fe2b3bdc2 some code clean up, change varialbe dms to _dms 2016-03-04 09:26:27 +01:00
Uwe Steinmann
f84c8eedd2 add parameter to turn off/on advanced acl 2016-03-04 09:25:18 +01:00
Uwe Steinmann
51fa5d18e6 enhance AccessOperation by check_view_access()
all methods in SeedDMS_AccessOperation take the object to be checked
as the first parameter. Add new method check_view_access() which
checks if a view may be accessed based on the tables tblAros, tblAcos,
tblArosAcos
2016-03-03 07:39:04 +01:00
Uwe Steinmann
839ae0b1df many improvements 2016-03-03 07:04:36 +01:00
Uwe Steinmann
b19f306bbf add more methods 2016-02-29 14:07:20 +01:00
Uwe Steinmann
a213a6a0cd various new methods 2016-02-29 08:31:19 +01:00
Uwe Steinmann
920d850915 set format of date fields 2016-02-27 08:44:20 +01:00
Uwe Steinmann
8d1dc66c59 Merge branch 'develop' into seeddms-5.1.x 2016-02-26 09:08:32 +01:00
Uwe Steinmann
206983cffd Merge branch 'seeddms-5.0.x' into develop 2016-02-26 09:08:17 +01:00
Uwe Steinmann
771f266aa6 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-26 08:17:50 +01:00
Uwe Steinmann
0369e95157 add fold marks 2016-02-26 08:17:30 +01:00
Uwe Steinmann
b3426ec6eb Merge branch 'develop' into seeddms-5.1.x 2016-02-25 10:43:51 +01:00
Uwe Steinmann
72ce140895 fix creation of aro 2016-02-25 10:16:40 +01:00
Uwe Steinmann
2721a43dde Merge branch 'develop' into seeddms-5.1.x 2016-02-24 14:43:10 +01:00
Uwe Steinmann
fb95d8f5ed add class to handle access controll 2016-02-24 14:37:49 +01:00
Uwe Steinmann
f41210f2d7 new version 5.1.0 2016-02-22 14:18:42 +01:00
Uwe Steinmann
7b251fb419 Merge branch 'seeddms-5.0.x' into develop 2016-02-22 11:49:08 +01:00
Uwe Steinmann
677a134cf4 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-22 10:43:39 +01:00
Uwe Steinmann
72cf2a4283 toIndividual() allows string as sender email 2016-02-22 10:40:22 +01:00
Uwe Steinmann
0e5e09dbbf fix logout if not admin 2016-02-19 08:21:22 +01:00
Uwe Steinmann
01c03f33f9 Merge branch 'seeddms-5.0.x' into develop 2016-02-16 12:19:26 +01:00
Uwe Steinmann
e56e6f5c8b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-16 11:21:40 +01:00
Uwe Steinmann
7e12f18e2b do not send notification emails to disabled users 2016-02-16 10:35:49 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
b04571da11 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-04 19:13:06 +01:00
Uwe Steinmann
028161d14e set defaultsearchmethod for view 2016-02-04 18:25:42 +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
0c8768a09e new version 4.3.24 2016-02-01 20:49:28 +01:00
Uwe Steinmann
4dce5d7ab3 help and default search method be set 2016-02-01 19:57:08 +01:00