Commit Graph

654 Commits

Author SHA1 Message Date
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
Uwe Steinmann
7dc478382f initial support for auto login of guest user 2016-01-29 16:48:21 +01:00
Uwe Steinmann
51f80c0930 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-27 17:23:22 +01:00
Uwe Steinmann
c875729cbe put footnote into bootstrap information box 2016-01-26 15:05:46 +01:00
Uwe Steinmann
e3fe3e469f more bootstrap markup 2016-01-26 10:28:43 +01:00
Uwe Steinmann
53031a13fc depend on bootstrap 2016-01-26 07:58:26 +01:00
Uwe Steinmann
6f4c1cb519 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-22 09:30:14 +01:00
Uwe Steinmann
f81eab28b4 new version 4.3.23 2016-01-21 07:41:09 +01:00
Uwe Steinmann
c43c5e64eb ldap search can be filtered 2016-01-19 15:30:54 +01:00
Uwe Steinmann
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +01:00
Uwe Steinmann
85e9dc25bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-11 20:35:20 +01:00
Uwe Steinmann
aefa0c120e set param 'class' for inclusion of view specific javascript file 2015-12-11 20:19:54 +01:00
Uwe Steinmann
20e7b873a5 get classname of SeedDMS Document from dms instance
don't use hard coded SeedDMS_Core_Document anymore
2015-12-04 08:34:32 +01:00
Uwe Steinmann
574cc53075 Merge branch 'seeddms-5.0.x' into develop 2015-12-03 15:24:41 +01:00
Uwe Steinmann
c93bc1bfa1 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-03 15:24:29 +01:00
Uwe Steinmann
eee4e2f0eb add getUser() 2015-12-01 18:06:15 +01:00
Uwe Steinmann
10cbf3b3b3 add pptx to getMimeType() 2015-11-30 20:46:55 +01:00
Uwe Steinmann
1f77a749be Merge branch 'seeddms-5.0.x' into develop 2015-11-27 16:09:11 +01:00
Uwe Steinmann
8d88844190 move replaceMarker from Notify 2015-11-25 17:19:28 +01:00
Uwe Steinmann
401f3ba685 move set sender into EmailNotify 2015-11-25 17:18:58 +01:00