gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-16 21:12:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,814 Commits 7 Branches 76 Tags 32 MiB
f35ae2736a
Commit Graph

536 Commits

Author SHA1 Message Date
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
Uwe Steinmann
51b84868a6 check if document is locked 2014-06-03 17:50:20 +02:00
Uwe Steinmann
858552b743 setting version to 0 will retrieve the latest version 2014-06-03 08:48:27 +02:00
Uwe Steinmann
05d6d9dca5 create preview image if it doesn't exists 2014-05-28 14:58:04 +02:00
Uwe Steinmann
5a8d13e1e7 get latest version if 'version' < 1 2014-05-28 14:54:10 +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
66c89d2875 set password expiration even if password is not set 2014-05-22 06:43:18 +02:00
Uwe Steinmann
4fa324f99e change deletion of old sessions 
the time when an old session is deleted is taken from the cookie
lifetime. If set to 0 it will be after 1 week
 2014-05-22 06:40:47 +02:00
Uwe Steinmann
2e7197665e run SeedDMS_Session::updateAccess() explicitly 2014-05-22 06:39:54 +02:00
Uwe Steinmann
71fb34cbca check quota 2014-05-20 06:43:44 +02:00
Uwe Steinmann
8cd9210107 quota can be set 2014-05-20 06:23:32 +02:00
Uwe Steinmann
319b2cbe75 Merge branch 'seeddms-4.3.8' into develop 2014-04-15 18:53:21 +02:00
Uwe Steinmann
cfe5d1561c set LDAP_OPT_REFERRALS in case of AD 2014-04-15 15:32:43 +02:00
Uwe Steinmann
783a7a3d37 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 21:41:56 +02:00
Uwe Steinmann
c550d7f11d use preview image width from settings 2014-04-10 21:38:33 +02:00
Uwe Steinmann
0144c4c396 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 11:22:05 +02:00
Uwe Steinmann
7f8d35bb38 check for empty attributes array (Bug #150) 2014-04-09 21:29:13 +02:00
Uwe Steinmann
4d094b2920 show single doc/folder only if the search returns 1 hit 
till now it could happen, that if the last page of a search result contained
only 1 record, then this record was shown.
 2014-04-09 10:50:17 +02:00
Uwe Steinmann
c180f17f98 Merge branch 'seeddms-4.3.8' into develop 
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
 2014-04-09 06:26:32 +02:00
Uwe Steinmann
183c772d6a allow calling submittranslation only if showmissingtranslation is turned on 2014-04-08 10:43:59 +02:00
Uwe Steinmann
99ba945b75 add subcommand for submitting new translation 2014-04-08 10:41:53 +02:00
Uwe Steinmann
0ff38100c6 new parameter to turn missing translation output 2014-04-08 10:40:20 +02:00
Uwe Steinmann
5c3a22dee1 return message when password was send 2014-04-01 17:14:57 +02:00
Uwe Steinmann
885a26a6a4 check for saving empty category and keyword (Bug #148) 2014-04-01 13:59:34 +02:00
Uwe Steinmann
0d61fc80ec issue error if to is before from date 2014-04-01 11:12:54 +02:00
Uwe Steinmann
52bab22fc2 add fields for homefolder and quota 2014-03-26 17:31:37 +01:00
Uwe Steinmann
84c89c3ed6 go to home folder if set for user 2014-03-26 17:30:38 +01:00
Uwe Steinmann
3fc340f226 check for quota 2014-03-26 17:30:19 +01:00
Uwe Steinmann
1d011feaf6 Merge branch 'seeddms-4.3.8' into develop 2014-03-26 07:29:28 +01:00
Uwe Steinmann
7477c907d8 subtree command sets load_on_demand propperly 
for folders with just documents the load_on_demand wasn't set
propperly. Those folders could not be opened in the Document Chooser
 2014-03-24 10:39:02 +01:00
Uwe Steinmann
1b95fee8d5 fix merge conflickts 2014-03-21 09:21:49 +01:00
Uwe Steinmann
468846b19f Merge branch 'seeddms-4.3.7' into develop 
Conflicts:
	Makefile
	op/op.Download.php
 2014-03-21 09:20:19 +01:00
Uwe Steinmann
5b0a4ea614 trim referuri 2014-03-21 08:11:12 +01:00
Uwe Steinmann
ef923b5f72 check POST vars for valid values, prevent access to arbitrary files on the server 2014-03-21 08:10:23 +01:00
Uwe Steinmann
fcca6049ac check POST vars for valid values, preventing access to arbitrary files on the server 2014-03-21 08:09:07 +01:00
Uwe Steinmann
c1f5a31f13 Merge branch 'seeddms-4.3.6' into develop 
Conflicts:
	Makefile
 2014-03-18 16:55:06 +01:00
Uwe Steinmann
d87296c859 make preview image size configurable 2014-03-18 10:03:39 +01:00
Uwe Steinmann
bbd1fd6445 take enableAdminRevApp and enableOwnerRevApp into account 
getReadAccessList() doesn't return the owner and administrators
unless explicitly requested by passing true for the first and second
parameter
 2014-03-14 15:11:40 +01:00
Uwe Steinmann
aa399e50bb subtree takes sort order into account 2014-03-14 15:10:29 +01:00
Uwe Steinmann
52e24892f6 turn off http only cookies if large file upload is enabled (Bug #132) 2014-03-13 12:51:48 +01:00
Uwe Steinmann
4f31a040b6 Merge branch 'seeddms-4.3.5' into develop 2014-03-06 11:42:09 +01:00
Uwe Steinmann
87e7aa083a various enhacements 
do not include lang file unless user is logged in,
check for user in all cases besides calculating the password strength
add comman 'session_info'
 2014-03-06 11:33:31 +01:00
Uwe Steinmann
386ac5f208 Merge branch 'seeddms-4.3.5' into develop 
Conflicts:
	Makefile
 2014-03-04 19:48:08 +01:00
Uwe Steinmann
d3caff7cdc first check if folder has parent before accessing the parent 2014-03-04 17:58:00 +01:00
Uwe Steinmann
fc6a034c2b do not try to get parent from folder path 
this fails for the root folder
 2014-03-04 17:55:21 +01:00
Uwe Steinmann
0a070eef1f Merge branch 'seeddms-4.3.5' into develop 
Conflicts:
	languages/en_GB/lang.inc
	views/bootstrap/class.Bootstrap.php
 2014-03-04 11:20:02 +01:00
Uwe Steinmann
773cf3d121 do not exit in _printErrorMsg() anymore 
this disabled the login failure count
 2014-03-04 08:31:17 +01:00
Uwe Steinmann
374250f344 replace ',' in $ѕequence by '.' 2014-03-03 14:42:58 +01:00
Uwe Steinmann
ceb62a75d8 Merge branch 'seeddms-4.3.4' into develop 2014-02-28 12:02:05 +01:00
Uwe Steinmann
266e169c98 exit if non authorized user tries to upload a file 2014-02-28 08:53:31 +01:00
Uwe Steinmann
50d939cd8e Merge branch 'seeddms-4.3.4' into develop 
Conflicts:
	Makefile
	op/op.RemoveFolder.php
 2014-02-26 23:12:40 +01:00
Uwe Steinmann
92fc50fcce set httponly cookie 2014-02-26 22:59:29 +01:00
Uwe Steinmann
d317c744bf fix security hole 
missing check of passed parameters allows to place files on the server
 2014-02-26 22:31:01 +01:00
Uwe Steinmann
5886449b31 set url and parent folder in notification mail 2014-02-26 06:55:34 +01:00
Uwe Steinmann
2659dab13f set folder_name in notification mail 2014-02-25 11:04:34 +01:00
Uwe Steinmann
5d879a3439 Merge branch 'seeddms-4.3.4' into develop 
Conflicts:
	Makefile
	op/op.Ajax.php
	styles/bootstrap/application.js
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
 2014-02-21 22:04:22 +01:00
Uwe Steinmann
e9355c37af take out debug echo statement (Bug #125) 2014-02-21 21:29:52 +01:00
Uwe Steinmann
6dc8b26a0c add subcommands movefolder and movedocument 2014-02-21 21:25:26 +01:00
Uwe Steinmann
dd07cf5fef fix line ending 2014-02-21 11:23:06 +01:00
Uwe Steinmann
a14c6b85e4 Merge branch 'seeddms-4.3.4' into develop 
Conflicts:
	op/op.Login.php
 2014-02-21 07:53:14 +01:00
Uwe Steinmann
90bea9a2fb fix handling of multivalue attributes 2014-02-20 21:05:22 +01:00
Uwe Steinmann
41469a4570 clean up and test ldap code 2014-02-01 21:52:45 +01:00
Uwe Steinmann
a4f26d3f68 Merge branch 'seeddms-4.3.3' into develop 
Conflicts:
	CHANGELOG
	languages/de_DE/lang.inc
	languages/en_GB/lang.inc
	views/bootstrap/class.ViewFolder.php
 2014-02-01 16:15:46 +01:00
Uwe Steinmann
94b107b7bd theme and language selector can be turn off on login page 2014-02-01 16:06:12 +01:00
Uwe Steinmann
3596a7a191 add support for configuring folder sort method of folders 2014-02-01 15:23:19 +01:00
Uwe Steinmann
2c918eabe7 move operation into new controller 2014-01-10 08:22:25 +01:00
Uwe Steinmann
78b0b8a6fb clear output buffer before calling readfile() 2014-01-10 08:21:04 +01:00
Uwe Steinmann
558a0f25ed clear output buffer before calling readfile() 2014-01-10 08:19:48 +01:00
Uwe Steinmann
39f19f25bb Merge branch 'seeddms-4.3.2' into develop 
Conflicts:
	Makefile
 2013-11-27 14:10:05 +01:00
Uwe Steinmann
9609ff4ac7 issue error if folder is moved into sub folder 2013-11-25 22:12:48 +01:00
Uwe Steinmann
cf867792b2 Merge branch 'seeddms-4.3.2' into develop 2013-11-24 18:20:36 +01:00
Uwe Steinmann
76701aed03 remove echo statement when delete document from fulltext index 2013-11-24 18:19:42 +01:00
Uwe Steinmann
d647d27692 fix wrong header line 2013-10-30 09:58:17 +01:00
Uwe Steinmann
902cae2804 no more errors if url parameters are missing 2013-09-27 15:01:45 +02:00
Uwe Steinmann
9a6772b59a use defines S_DRAFT_APP and S_RELEASE instead of numbers 2013-09-27 08:24:09 +02:00
Uwe Steinmann
25a38e27a3 move most of functionality into controller 2013-09-20 13:44:47 +02:00
Uwe Steinmann
4e5ddaa2f9 use same mail mechanism as for notifications 2013-09-13 15:01:02 +02:00
Uwe Steinmann
9382c4d1b1 add config parameters for smtp username and password 2013-09-13 14:54:37 +02:00
Uwe Steinmann
7b1663479d add command for sending a test mail 2013-09-13 14:52:32 +02:00
Uwe Steinmann
d6f024dfb4 do not remove cookie if it isn't set, use controller to call hook 2013-09-11 18:41:36 +02:00
Uwe Steinmann
326b8fe5eb run controller 2013-09-09 09:36:57 +02:00
Uwe Steinmann
6e6fb20244 Merge branch 'hooks' into develop 
Conflicts:
	Makefile
 2013-09-05 08:52:37 +02:00
Uwe Steinmann
ae1f78228a ajax request can use post or get 2013-09-03 08:19:59 +02:00
Uwe Steinmann
6d4cf1f4f9 check if SeedDMS_Lucene_Search::search() returns false 
issue an error msg in that case
 2013-08-13 22:09:40 +02:00
Uwe Steinmann
f753d9fa47 Merge branch 'develop' into hooks 2013-08-07 22:00:56 +02:00
Uwe Steinmann
68e1d995b1 fix setting password when simple password strength is set 
no matter what password strength algorthm was set, the advanced
algorithm was used.
 2013-08-07 08:55:36 +02:00
Uwe Steinmann
857519033d do not allow to change workflow if it is mandatory 2013-08-06 14:21:40 +02:00
Uwe Steinmann
2883b61830 Merge branch 'develop' into hooks 
Conflicts:
	op/op.Login.php
 2013-08-03 09:48:49 +02:00
Uwe Steinmann
ea27bd41fd connect to ldap server which doesn't allow anonymous bind 2013-07-31 22:00:51 +02:00
Uwe Steinmann
79afdc7c55 include inc/inc.Extension.php 2013-07-31 21:43:09 +02:00
Uwe Steinmann
bb50129d44 set userid only if external authentification succeds 2013-07-31 17:28:44 +02:00
Uwe Steinmann
e87e60c89f call authentication hook if available 
authentication hooks are classes with a method authenticate() which
creates a user object if authentication was successfull
 2013-07-23 19:03:02 +02:00
Uwe Steinmann
77e976cb7a fix deleting cached extension file 
add missing parameter to constructor of extension mgr
 2013-07-23 18:03:32 +02:00
Uwe Steinmann
f793ee8a28 move delivery of document into controller 
done for being able to call a viewOnline::version hook
 2013-07-23 17:35:46 +02:00
Uwe Steinmann
2d08f870c7 use controller after login 
currently just used to run the postLogin hook
 2013-07-23 17:33:40 +02:00
Uwe Steinmann
daaaa596b3 call hook 'version' before downloading a document version 2013-07-21 11:53:28 +02:00
Uwe Steinmann
2979fc9648 Merge branch 'develop' into hooks 
Conflicts:
	views/bootstrap/class.ViewFolder.php
 2013-07-19 23:14:29 +02:00
Uwe Steinmann
a2a85e1e69 add command 'addtoclipboard' 
The command returns the new header menu item for the clipboard which
can be used to replace the current menu item
 2013-06-18 18:14:41 +02:00
Uwe Steinmann
c2dc213acf check if query term for full text search is valid 2013-06-17 10:49:55 +02:00
Uwe Steinmann
ed7d74ae57 remove documents from clipboard if they are in the target folder 2013-06-17 09:12:22 +02:00
Uwe Steinmann
d29f533fbc check if refferer is set 2013-06-17 09:12:04 +02:00
Uwe Steinmann
9df1a1eb08 check if attributes are posted 2013-06-16 20:34:43 +02:00
Uwe Steinmann
e06e7b6509 set correct values for folders/documents found 2013-06-14 19:06:08 +02:00
Uwe Steinmann
c46e290c8b fix searching for category in fulltext mode 2013-06-14 16:06:52 +02:00
Uwe Steinmann
9a7a8dc0c6 redirect to url passed in refferer 2013-06-14 16:05:54 +02:00
Uwe Steinmann
6b150e831a redirect to url passed in refferer 2013-06-14 16:04:56 +02:00
Uwe Steinmann
c7d80e8dd4 more splash messages 2013-06-14 10:27:17 +02:00
Uwe Steinmann
4acfa444f2 jump to refferer if set in url 2013-06-14 00:03:16 +02:00
Uwe Steinmann
6def97927d better error checking 2013-06-13 23:22:44 +02:00
Uwe Steinmann
9242992d69 scripts for clearing clipboard and moving it into a folder 2013-06-13 23:16:08 +02:00
Uwe Steinmann
77b0fdfd12 add new config option enableClipboard 2013-06-13 14:57:53 +02:00
Uwe Steinmann
095f20a462 fix lots of php warnings 2013-06-07 15:26:09 +02:00
Uwe Steinmann
f6ec61359e combine database and fulltext search into one form 2013-06-07 10:12:49 +02:00
Uwe Steinmann
72010b1bc0 Merge branch 'develop' into hooks 2013-06-06 16:02:28 +02:00
Uwe Steinmann
d344eaea9a another switch for taking the comment for the version 
if there is no version comment then the document comment can be taken
if the users forces it.
 2013-06-06 14:05:03 +02:00
Uwe Steinmann
31015784ac allow to use jqtree more than once on a page 
also uses just 'docid' for id in the document chooser instead of appending
the form name.
 2013-06-03 07:55:39 +02:00
Uwe Steinmann
f3c1e5ae8e users that cannot be deleted can be specified in settings 2013-05-31 11:59:12 +02:00
Uwe Steinmann
78dd186742 set url in notification email (Bug #56) 2013-05-31 07:55:40 +02:00