gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-12 10:04:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,706 Commits 7 Branches 80 Tags 38 MiB
2da2f0af9a
Commit Graph

698 Commits

Author SHA1 Message Date
Uwe Steinmann
2cd37d90b1 send end date to end of day 2015-06-10 19:14:28 +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
380ac2f1bd add currenttab to link when redirecting to out/out.ViewDocument.php 2015-06-09 08:59:25 +02:00
Uwe Steinmann
bd85c0c25a set missing parameter [url] in email notification 2015-06-09 07:16:34 +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
20f28bb7df use /tmp for tempnam() 2015-06-08 22:00:27 +02:00
Uwe Steinmann
46dc4ea6e3 add code for downloading file into contoller 2015-06-08 21:59:56 +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
f7c8d39b5d pass resultmode to view 2015-06-08 09:08:32 +02:00
Uwe Steinmann
11bac92d2f if $_GE['export'] is set the search result will be downloaded as a 
zipfile
 2015-06-02 17:28:09 +02:00
Uwe Steinmann
1bc5e6116c document status S_DRAFT can be set 2015-06-02 10:04:01 +02:00
Uwe Steinmann
5a29cde314 set initial document status 2015-06-02 10:03:34 +02:00
Uwe Steinmann
d9d4d89a27 set initial document status 2015-06-02 10:02:46 +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
bd08e9b125 search for documents/folders only 2015-06-02 08:52:36 +02:00
Uwe Steinmann
45d3ebab3d place business login into controller class 2015-06-01 16:05:03 +02:00
Uwe Steinmann
34bd22f40e separate busines logic into controller 2015-06-01 14:01:56 +02:00
Uwe Steinmann
4e15fee3fb set url for notifaction mail 2015-06-01 14:01:02 +02:00
Uwe Steinmann
bcff843186 set comment in notification mail 2015-06-01 07:36:14 +02:00
Uwe Steinmann
5246c3a329 place code for updating document content into controller 2015-06-01 07:21:16 +02:00
Uwe Steinmann
19b9888d34 place business logic into controller 2015-06-01 07:16:21 +02:00
Uwe Steinmann
570e0fa782 some code reorganisation 2015-05-30 07:32:36 +02:00
Uwe Steinmann
220fa8a8fc split file into stub and controller 2015-05-29 20:44:16 +02:00
Uwe Steinmann
5b931afefb split AddDocument into stub and controller 2015-05-29 20:43:37 +02:00
Uwe Steinmann
b8d06babee add setting for library folder 2015-05-29 20:42:37 +02:00
Uwe Steinmann
536ead64ac allow to substitute user for regular users 2015-05-19 19:44:18 +02:00
Uwe Steinmann
a80f4090af add filter for documents in revision 2015-05-19 19:41:40 +02:00
Uwe Steinmann
06c71cc332 add handling of substitutes 2015-05-19 08:06:24 +02:00
Uwe Steinmann
eb7f3613ca add scripts for adding content to a transmittal 2015-05-13 18:43:28 +02:00
Uwe Steinmann
6f3594d294 add cmd [remove|update]transmittalitem 2015-05-13 17:34:50 +02:00
Uwe Steinmann
d7232aa8cd fix key of phrase 2015-05-13 17:34:23 +02:00
Uwe Steinmann
4101a83639 better error checking 2015-05-12 19:11:17 +02:00
Uwe Steinmann
4c74bda247 add files to download content of transmittal 2015-05-12 19:06:23 +02:00
Uwe Steinmann
71da44c618 add missing files for revising documents 2015-05-12 19:05:02 +02:00
Uwe Steinmann
9859737668 fix typo in file 2015-05-11 09:32:10 +02:00
Uwe Steinmann
608a86d45c rename reviser to revisor, added revision workflow to document page 2015-05-11 09:30:13 +02:00
Uwe Steinmann
a5c27190c1 no need to pass document status to addWorkflowAction() 2015-05-04 07:02:51 +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
fa43001824 use propper name of converters array in settings 2015-05-02 08:05: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
47d97e77d8 add files for transmittal management and receptions 2015-04-30 07:09:21 +02:00
Uwe Steinmann
52a2106155 include correct files in right direction 2015-04-29 20:08:46 +02:00
Uwe Steinmann
eefc346312 include correct files in right direction 2015-04-29 20:08:10 +02:00
Uwe Steinmann
c0ba8a6711 create checkout dir if required and allowed in the settings 2015-04-23 11:49:05 +02:00
Uwe Steinmann
08e768fc52 add missing files for document check out/іn 2015-04-22 17:23:54 +02:00
Uwe Steinmann
4f3c6ed090 add checkbox for creating checkout dir if it doesn't exists 2015-04-22 17:21:57 +02:00
Uwe Steinmann
0addaf56d3 add missing files for revision workflow and document reception 2015-04-22 10:33:49 +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
387f67dad4 enable/disable Acknowledge and Revision workflow 2015-04-20 13:44:45 +02:00
Uwe Steinmann
4e5bf5912f set proper msg when approver was deleted or already assigned 2015-04-20 13:40:10 +02:00
Uwe Steinmann
e00f440717 set checkout dir 2015-04-17 20:12:29 +02:00
Uwe Steinmann
a796c85e01 add validation of attributes 2015-04-17 20:09:20 +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
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