Commit Graph

653 Commits

Author SHA1 Message Date
Uwe Steinmann
7e507e6a9e fix searching in fulltext, number of hits and pages was often wrong 2015-09-28 12:32:41 +02:00
Uwe Steinmann
8ab6dda490 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-18 07:59:15 +02:00
Uwe Steinmann
4206f5d32a log approval/reject 2015-09-16 17:31:09 +02:00
Uwe Steinmann
459739bd01 file for creating preview in list of files in dropfolder 2015-09-03 15:13:59 +02:00
Uwe Steinmann
784081b5d3 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 20:16:26 +02:00
Uwe Steinmann
58d8d8dd9e set search time, document und folder count after fulltext search 2015-08-19 20:15:04 +02:00
Uwe Steinmann
65fda6daee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-10 21:53:27 +02:00
Uwe Steinmann
8ffcfab6e4 use new fulltext index interface with support for sqlitefts 2015-08-10 21:43:15 +02:00
Uwe Steinmann
b0413a0d46 engine for fulltext search can be configured 2015-08-10 21:41:51 +02:00
Uwe Steinmann
ae98b574b7 jump to homefolder of user 2015-08-07 15:44:06 +02:00
Uwe Steinmann
482143c04f pass $dms to contructor of SeedDMS_AccessOperation 2015-08-07 13:11:50 +02:00
Uwe Steinmann
122fcdb3c9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-05 21:14:17 +02:00
Uwe Steinmann
7485a85077 set timeout for external commands when creating fulltext index 2015-08-05 21:11:21 +02:00
Uwe Steinmann
0351305995 pass formkey when substituting user 2015-07-15 08:24:15 +02:00
Uwe Steinmann
9fee411f3f explicitly check for false returned by SeedDMS_Core_DMS::inList() 2015-07-15 08:22:39 +02:00
Uwe Steinmann
c4fdc6aee9 remove old code 2015-07-15 08:22:16 +02:00
Uwe Steinmann
4a034d395b pass previewer to mainClipboard() 2015-07-15 08:21:51 +02:00
Uwe Steinmann
f35ae2736a add new paramter autoLoginUser 2015-07-14 21:28:47 +02:00
Uwe Steinmann
84a1879c85 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-06 22:18:23 +02:00
Uwe Steinmann
a94614c39a fix setting expire date (Closes: #225) 2015-07-06 22:17:16 +02:00
Uwe Steinmann
94b3b8e6ee remove print_r() 2015-06-30 18:12:24 +02:00
Uwe Steinmann
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
2015-06-30 07:05:27 +02:00
Uwe Steinmann
62ba9fe961 take out review and approval status
currently not needed
2015-06-23 08:00:31 +02:00
Uwe Steinmann
e5036548fb take out review and approval status
currently not needed
2015-06-23 07:59:39 +02:00
Uwe Steinmann
44ce6619c0 do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:46:55 +02:00
Uwe Steinmann
f960bc81b4 new parameter overrideMimeType 2015-06-23 07:46:39 +02:00
Uwe Steinmann
d46d2b265d do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:45:18 +02:00
Uwe Steinmann
515e95c227 new parameter overrideMimeType 2015-06-23 07:44:47 +02:00
Uwe Steinmann
ec0816e825 finfo returns only mimetype 2015-06-23 07:03:02 +02:00
Uwe Steinmann
4d0d4e030b finfo returns only mimetype 2015-06-23 07:02:15 +02:00
Uwe Steinmann
7d28e2f6f5 log id and name of folder 2015-06-19 15:04:55 +02:00
Uwe Steinmann
6a9493a786 log id and name of folder 2015-06-19 15:04:25 +02:00
Uwe Steinmann
65aa3eca27 check if expires and sequence is set 2015-06-18 17:32:19 +02:00
Uwe Steinmann
31d0c49412 check if expires and sequence is set 2015-06-18 17:31:56 +02:00
Uwe Steinmann
0d19b2d52e check if keywords, name, comment was posted 2015-06-18 17:29:01 +02:00
Uwe Steinmann
0ff5ade2b3 check if keywords, name, comment was posted 2015-06-18 17:28:32 +02:00
Uwe Steinmann
5c43f191ce propperly check access rights 2015-06-15 14:20:51 +02:00
Uwe Steinmann
3b0d239a00 propperly check for access right 2015-06-15 14:17:16 +02:00
Uwe Steinmann
efb9173815 use access operation to check if approval is allowed
Conflicts:
	op/op.ApproveDocument.php
2015-06-15 09:01:03 +02:00
Uwe Steinmann
ba74861ae7 use access operation to check if operation is allowed
Conflicts:
	op/op.ReviewDocument.php
2015-06-15 09:00:21 +02:00
Uwe Steinmann
48442f3947 use access operation to check if approval is allowed 2015-06-15 08:55:20 +02:00
Uwe Steinmann
4215532a9c use access operation to check if operation is allowed 2015-06-15 08:54:33 +02:00
Uwe Steinmann
334c2accf4 download review/approval files 2015-06-12 09:01:13 +02:00
Uwe Steinmann
5df9b44d97 download review/approval files 2015-06-12 08:59:36 +02:00
Uwe Steinmann
d36ba8d906 allow to upload a file with each review/approval 2015-06-11 21:32:29 +02:00
Uwe Steinmann
220329c1b8 allow to upload a file with each review/approval 2015-06-11 21:30:56 +02:00
Uwe Steinmann
4d0a64266e redirect relative to http_root 2015-06-11 14:09:50 +02:00
Uwe Steinmann
97fe703afb fix line endings 2015-06-11 14:06:59 +02:00
Uwe Steinmann
73650ae32e send end date to end of day 2015-06-10 19:15:10 +02:00
Uwe Steinmann
9d4a219065 send end date to end of day 2015-06-10 19:14:07 +02:00
Uwe Steinmann
18e46f0d95 redirect to url with absolute path
using a relative url won't work if the apache rewrites the url, e.g.
/Login/<hash> will be rewritten to /seeddms/op/op.Login.php
Redirecting to ../op/op.Login.php will result in a url /op/op.Login.php
which does not exists
2015-06-10 08:31:13 +02:00
Uwe Steinmann
ad3a3b2c52 allow to add additional authentication before ldap 2015-06-10 08:24:00 +02:00
Uwe Steinmann
083e2a55a9 add currenttab to link when redirecting to out/out.ViewDocument.php
Conflicts:
	op/op.AddDocumentLink.php
	op/op.ReceiptDocument.php
	op/op.RemoveDocumentLink.php
	op/op.ReviseDocument.php

Conflicts:
	op/op.AddDocumentLink.php
	op/op.RemoveDocumentLink.php
2015-06-09 09:07:51 +02:00
Uwe Steinmann
d0b32e0fb8 add currenttab to link when redirecting to out/out.ViewDocument.php
Conflicts:
	op/op.AddDocumentLink.php
	op/op.ReceiptDocument.php
	op/op.RemoveDocumentLink.php
	op/op.ReviseDocument.php
2015-06-09 09:04:41 +02:00
Uwe Steinmann
ddf2ab1731 set missing parameter [url] in email notification 2015-06-09 07:15:53 +02:00
Uwe Steinmann
c2b2c34290 set missing parameter [url] in email notification 2015-06-09 07:15:18 +02:00
Uwe Steinmann
8e2aeb7264 pass resultmode to view 2015-06-08 09:15:33 +02:00
Uwe Steinmann
4180e56690 check if resultmode is set before passing it to view 2015-06-08 09:13:47 +02:00
Uwe Steinmann
83cdedad51 pass resultmode to view 2015-06-08 09:12:25 +02:00
Uwe Steinmann
4814c5cefe search for documents/folders only 2015-06-02 08:53:21 +02:00
Uwe Steinmann
1150b5cc68 search for documents/folders only 2015-06-02 08:53:08 +02:00
Uwe Steinmann
6e852f4eac no need to pass document status to addWorkflowAction() 2015-05-04 07:02:43 +02:00
Uwe Steinmann
b25184af17 no need to pass document status to addWorkflowAction() 2015-05-04 07:01:51 +02:00
Uwe Steinmann
15ce32ca24 use propper name of converters array in settings 2015-05-02 08:05:46 +02:00
Uwe Steinmann
a7763c8cc4 use propper name of converters array in settings 2015-05-02 08:04:41 +02:00
Uwe Steinmann
52a2106155 include correct files in right direction 2015-04-29 20:08:46 +02:00
Uwe Steinmann
5611be5c7f set proper msg when approver was deleted or already assigned 2015-04-20 13:47:34 +02:00
Uwe Steinmann
1fda236179 pass proper array converters to SeedDMS_Lucence_IndexedDocument 2015-04-16 14:16:03 +02:00
Uwe Steinmann
1348cd008d first check for $_POST vars
$_POST['notification_users'] and $_POST['notification_groups']
2015-04-16 14:12:47 +02:00
Uwe Steinmann
a252f82f08 first check for $_POST vars
$_POST['notification_users'] and $_POST['notification_groups']
2015-04-16 14:12:01 +02:00
Uwe Steinmann
6481d230a6 pass proper array converters to SeedDMS_Lucence_IndexedDocument 2015-04-16 08:06:15 +02:00
Uwe Steinmann
a73d14e5a4 fix calling constructor of SeedDMS_Extension_Mgr 2015-04-16 08:04:15 +02:00
Uwe Steinmann
6af9a3a210 move setting error msg into controller 2015-04-15 16:13:47 +02:00
Uwe Steinmann
be990463bd validate attribute values 2015-04-15 16:13:22 +02:00
Uwe Steinmann
9c61ede57a remove old print_r() 2015-04-14 19:37:33 +02:00
Uwe Steinmann
72c3207a75 Merge branch 'seeddms-4.3.17' into develop
Conflicts:
	Makefile
2015-03-30 16:40:24 +02:00
Uwe Steinmann
645fbe7def check for workflow type when evaluating post vars 2015-03-27 17:21:37 +01:00
Uwe Steinmann
d2f4c24f08 set additional notification if set, send mails for each workflow step 2015-03-27 16:42:26 +01:00
Uwe Steinmann
cb81eb7db4 Merge branch 'seeddms-4.3.16' into develop
Conflicts:
	Makefile
	views/bootstrap/class.UsrMgr.php
2015-03-20 08:32:29 +01:00
Uwe Steinmann
d7d63ae129 fix calculation of totalPages 2015-03-20 07:57:02 +01:00
Uwe Steinmann
78cb252e9d do not send email twice to a user, do not send email if expiration
hasn't changed
2015-03-17 17:45:53 +01:00
Uwe Steinmann
0335cc8bcd Merge branch 'seeddms-4.3.15' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.Settings.php
2015-03-17 06:52:33 +01:00
Uwe Steinmann
a257c25277 fully obey permissions of documents 2015-03-17 06:36:33 +01:00
Uwe Steinmann
1f1e273c97 set url in email notification 2015-03-16 09:12:49 +01:00
Uwe Steinmann
b4195171f9 set mail to list of user and group reviewers/approvers
not just users
2015-03-16 08:57:29 +01:00
Uwe Steinmann
28f0d7e1cb send mail when workflow starts 2015-03-12 14:02:16 +01:00
Uwe Steinmann
ed9fbe93e1 set current tab to last one selected when submitting data 2015-03-11 18:24:14 +01:00
Uwe Steinmann
dee7f03931 set mail to users/groups who need to take action in next workflow
transition
2015-03-11 18:12:52 +01:00
Uwe Steinmann
c3b80c1b5d add new option enableNotificationWorkflow
turns on/off is mail is set to users/groups in next step of workflow
2015-03-11 18:11:41 +01:00
Uwe Steinmann
083dad60e8 remove old code for email creation 2015-02-27 17:11:50 +01:00
Uwe Steinmann
46d7ecf80d do not even check for guest user, if disabled 2015-02-26 11:47:28 +01:00
Uwe Steinmann
0266c3a037 Merge branch 'seeddms-4.3.15' into develop 2015-02-24 19:53:59 +01:00
Uwe Steinmann
c4feea2664 all converters are only used for fulltext 2015-02-24 19:26:38 +01:00
Uwe Steinmann
f5d656bde0 set a group notification with setting a user works again (Bug #201) 2015-02-11 18:30:39 +01:00
Uwe Steinmann
f992adf775 do not used fixed classnames for SeedDMS_Core[Folder|Document]
use classname returned by SeedDMЅ_Core_DMS::getClassname()
2015-02-05 07:38:56 +01:00
Uwe Steinmann
1aa08781b2 Merge branch 'seeddms-4.3.14' into develop
Conflicts:
	Makefile
	SeedDMS_Core/Core/inc.ClassFolder.php
2015-01-29 18:22:19 +01:00
Uwe Steinmann
75ef47f6e1 expiration date of documents can be preset in settings 2015-01-29 17:28:40 +01:00
Uwe Steinmann
f79f9acc78 reseting expiration date works again 2015-01-23 13:38:52 +01:00
Uwe Steinmann
a87d802dba take out second inclusion of inc/inc.Extension.php 2015-01-23 10:34:52 +01:00
Uwe Steinmann
e24439ff43 do not use global variables anymore 2015-01-08 14:53:53 +01:00
Uwe Steinmann
e486254d80 include inc/inc.Init.php, new order of include files 2014-12-08 14:47:32 +01:00
Uwe Steinmann
4a652ba1df fix line endings 2014-12-08 14:47:05 +01:00
Uwe Steinmann
1744479837 removed left overs from failed merge (Bug #190) 2014-12-08 14:46:01 +01:00
Uwe Steinmann
77b5abe6bf fix line endings, change sequence of include files 2014-12-08 14:44:59 +01:00
Uwe Steinmann
1de8e26289 fix line endings, change sequence of include files 2014-12-08 14:43:50 +01:00
Uwe Steinmann
1be9052c85 put controller code into controller/class.EditFolder.php 2014-12-08 14:43:04 +01:00
Uwe Steinmann
4483fb52cc fix line endingѕ, adjust sequence of include files 2014-12-08 14:41:47 +01:00
Uwe Steinmann
8809086014 Merge branch 'seeddms-4.3.13' into develop 2014-11-24 19:42:18 +01:00
Uwe Steinmann
b39b92e0b0 don't crash if folder/document was deleted (Bug #186) 2014-11-24 19:08:17 +01:00
Uwe Steinmann
0a3f4e1fd7 do not include inc/inc.ClassEmail.php twice 2014-11-24 19:00:04 +01:00
Uwe Steinmann
e9c3696466 Merge branch 'seeddms-4.3.13' into develop
Conflicts:
	Makefile
2014-11-19 17:04:56 +01:00
Uwe Steinmann
03359ca620 fix checking for attribute values
checking for the number of values of a multi value attribute
disregards the maximum number of values if it is 0
2014-11-19 17:00:55 +01:00
Uwe Steinmann
834a8118e6 check for propper number of attribute values 2014-11-17 07:03:57 +01:00
Uwe Steinmann
05ad0d11ad log each operation 2014-11-14 10:06:25 +01:00
Uwe Steinmann
15c5392ed8 Merge branch 'seeddms-4.3.11' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-11-13 09:21:08 +01:00
Uwe Steinmann
5ff934373d take all attributes for searching into account 2014-11-13 07:54:35 +01:00
Uwe Steinmann
a800f74a75 fix almost unrestricted fast upload (Bug #175) 2014-11-11 15:42:07 +01:00
Uwe Steinmann
31da6d4f5f Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
2014-07-24 07:58:32 +02:00
Uwe Steinmann
f4e7e451e2 check if $_GET["width"] is set before using it 2014-07-24 07:53:36 +02:00
Uwe Steinmann
760da5e2b4 check if pwd is passed in _POST 2014-07-24 07:53:08 +02:00
Uwe Steinmann
0026f8c69c selecting a status or category will not turn of folder search 2014-07-23 20:51:45 +02:00
Uwe Steinmann
b6f60e8c7f reoganize database search form, don't show results without a search criteria 2014-07-23 20:23:07 +02:00
Uwe Steinmann
c5b41095a2 pass folder attributes to search form 2014-07-23 20:12:29 +02:00
Uwe Steinmann
7830837e61 Merge branch 'seeddms-4.3.9' into develop 2014-07-21 07:40:22 +02:00
Uwe Steinmann
8a6acd321a include comment and verison comment in notification mail 2014-07-21 07:34:13 +02:00
Uwe Steinmann
25f0a3588a check if 'theme' is set before using it 2014-07-15 14:21:12 +02:00
Uwe Steinmann
e2974f2054 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.ViewFolder.php
2014-07-11 12:49:21 +02:00
Uwe Steinmann
6fc870c9df make notification work when uploading documents 2014-07-11 12:36:22 +02:00
Uwe Steinmann
3590b0859e addtoclipboard set msg in case of succes 2014-07-11 12:02:41 +02:00
Uwe Steinmann
fc334bf43a better error checking for uploaddocuments
first check for upload error, than for filesize
2014-07-11 11:14:27 +02:00
Uwe Steinmann
289649b6ee add file upload via drag&drop
can be enabled in the settings
2014-07-11 08:41:25 +02:00
Uwe Steinmann
0ee577fb11 add command for uploading documents 2014-07-11 08:38:26 +02:00
Uwe Steinmann
48c3f24e01 get rid of some old code 2014-07-11 08:38:05 +02:00
Uwe Steinmann
4d8f9731d5 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
2014-07-08 08:49:14 +02:00
Uwe Steinmann
73bfecb5a8 more general folder chooser
the choosen folder will no longer use targetidformx for the input field
containing the id. It is now independent of the form name.
2014-07-08 08:30:59 +02:00
Uwe Steinmann
eb909aa100 no more php warnings if userid isn't set 2014-07-07 15:44:46 +02:00
Uwe Steinmann
579946d455 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-07-03 12:07:27 +02:00
Uwe Steinmann
3ebfd7aacf extract filetype by using pathinfo() 2014-06-13 17:29:40 +02:00
Uwe Steinmann
6325bd2844 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-06 14:15:39 +02:00
Uwe Steinmann
9d2674e9e4 new command tooglelockdocument, new view documentlistrow 2014-06-06 13:59:12 +02:00
Uwe Steinmann
91dcc5cf1d add more commands
removefromclipboard removes an item from the clipboard
view returns the html of some views
2014-06-05 15:00:44 +02:00
Uwe Steinmann
58cdecfe21 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-05 10:03:35 +02:00
Uwe Steinmann
b9ace5f6f7 add command 'deletefolder' 2014-06-05 09:48:45 +02:00
Uwe Steinmann
aa6bdf000b Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-06-04 21:25:30 +02:00
Uwe Steinmann
aa80f28de1 set splash message 2014-06-04 19:17:44 +02:00
Uwe Steinmann
e0a49734f0 'movefolder' requires a formtoken 2014-06-04 19:17:08 +02:00
Uwe Steinmann
c09e650c89 add 'deletedocument', 'movedocument' requires a formtoken 2014-06-04 19:15:28 +02:00
Uwe Steinmann
10b609927a Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	op/op.UpdateDocument.php
2014-06-04 08:03:20 +02:00
Uwe Steinmann
3b129502a0 unlock document if updated by admin or owner of document 2014-06-04 08:01:35 +02:00
Uwe Steinmann
f13ef894b2 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	Makefile
	op/op.RemoveDocument.php
	op/op.UpdateDocument.php
	out/out.RemoveDocument.php
2014-06-04 07:58:06 +02:00