upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 14:23:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
77659 commits 874 branches 1195 tags 8.3 GiB
Commit graph

173 commits

Author SHA1 Message Date
Carl Schwan
719dbafd13
Add support for Delegation Settings for more apps 
* This adds support for the sharing, groupware, theming and user_ldap
  app
* This adds some code who disapeared during a rebase in the initial
  delegation PR (provisioning_api)

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-15 18:41:00 +02:00
J0WI
3b656446af Introduce ISecureRandom::CHAR_ALPHANUMERIC 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2021-07-08 15:11:31 +02:00
Gary Kim
b78f3a57d1
Migrate HintException to OCP 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2021-06-30 15:28:02 -04:00
John Molakvoæ (skjnldsv)
215aef3cbd
Update php licenses 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-06-04 22:02:41 +02:00
Valdnet
998bcad80c
l10n: Unify spelling 
Spelling unification in Nextcloud applications.

Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-05-20 09:22:58 +02:00
Christoph Wurst
99f2fa73d1
Fix usage of rename executeUpdate 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-05-05 10:35:25 +02:00
robottod
0451927994
Remove some deprecated calls from ShareByMailProvider.php 
This moves the execute calls to the executeQuery and executeUpdate calls
Resulting in less calls to deprecated functions

Signed-off-by: rtod <robottod@protonmail.com>
 2021-04-26 21:53:56 +02:00
John Molakvoæ
6b4cfc5805
Merge pull request #26231 from nextcloud/Valdnet-patch-6 
l10n: Add words user and because in ShareByMailProvider.php
 2021-03-22 09:42:01 +01:00
Valdnet
1dab60a79d
l10n: Add changes to text string for user 2021-03-22 09:01:45 +01:00
Daniel Calviño Sánchez
f99876997a
Remove duplicated query for email shares 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-03-22 06:50:47 +01:00
John Molakvoæ (skjnldsv)
a100186e5e
Sharing link & mail parity 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-03-22 06:50:45 +01:00
John Molakvoæ (skjnldsv)
100d5d9a47
Add labels to mail shares 
Now the email is shown on a second line if a label is set.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-03-22 06:34:09 +01:00
Valdnet
4b4b1f6ff1
l10n: Add word user in ShareByMailProvider.php 
Standardizing text strings with other Nextcloud applications.
 2021-03-20 15:37:32 +01:00
Roeland Jago Douma
69b26c73f3 Fix some redundant casts 
Happier psalm

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-08 08:51:08 +01:00
Roeland Jago Douma
d247a5fb47 Sharebymail: set expiration on creation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-04 13:49:21 +01:00
noiob
f28ee36e20 Remove double space so php-cs stops complaining 
Signed-off-by: Johannes Leuker <j.leuker@hosting.de>
 2021-02-24 11:33:19 +01:00
John Molakvoæ
946430862e
Merge pull request #24978 from dems54/issue24139 2021-02-19 08:20:58 +01:00
Nicolas SIMIDE
69bf0c8a9e ReplyTo option for sharebymail - Issue #24139 - Little bug fix 
Signed-off-by: Nicolas SIMIDE <2083596+dems54@users.noreply.github.com>
 2021-01-28 15:57:29 +01:00
dems54
1427a9a361 Update apps/sharebymail/lib/Settings/SettingsManager.php 
Small nitpicks

Co-authored-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Nicolas SIMIDE <2083596+dems54@users.noreply.github.com>
 2021-01-28 15:57:29 +01:00
dems54
0a8d9341dd Update apps/sharebymail/lib/Settings/SettingsManager.php 
Small nitpicks

Co-authored-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Nicolas SIMIDE <2083596+dems54@users.noreply.github.com>
 2021-01-28 15:57:29 +01:00
Nicolas SIMIDE
4ac636d252 ReplyTo option for sharebymail Issue #24139 
Signed-off-by: Nicolas SIMIDE <2083596+dems54@users.noreply.github.com>
 2021-01-28 15:57:29 +01:00
Morris Jobke
24d436cb60
Remove unneeded casts that were found by Psalm 
In preparation of the update of Psalm from 4.2.1 to 4.3.1+ (see https://github.com/nextcloud/server/pull/24521)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-11 13:14:41 +01:00
Christoph Wurst
2a054e6c04
Update the license headers for Nextcloud 20 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-08-24 14:54:25 +02:00
Daniel Kesselberg
4dd507675c
Generate password by password_policy app 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-08-11 21:58:51 +02:00
Roeland Jago Douma
0bcc643d6e
Cleanup share by mail a bit 
* Moved to ned IBootstrap
* Register everything via the capabilities api (So clients can use it as
  well)
  - This applies to the enforcing passwords
* Updated the sharing js code to use it
* removed app.php
* removed unused settings now
* typehints
* strict typing

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-06 09:45:08 +02:00
Joas Schilling
89ed2c37bf
Update share type constant usage 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-06-24 16:49:16 +02:00
Daniel Calviño Sánchez
e59e283cc2 Fix creating a mail share with a password 
When a mail share was created with a password the given password was not
hashed, so it was not possible to open the share with that password.
Moreover, if passwords were enforced the given password was ignored and
a new one was set (although in this case it was hashed so it worked as
expected). Now the given password is properly hashed and not overriden.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-05-28 21:51:22 +02:00
Christoph Wurst
cb057829f7
Update license headers for 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-29 11:57:22 +02:00
Christoph Wurst
28f8eb5dba
Add visibility to all constants 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:54:27 +02:00
Christoph Wurst
caff1023ea
Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Christoph Wurst
14c996d982
Use elseif instead of else if 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 10:35:09 +02:00
Christoph Wurst
41b5e5923a
Use exactly one empty line after the namespace declaration 
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 11:48:10 +02:00
Christoph Wurst
2fbad1ed72
Fix (array) indent style to always use one tab 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 10:16:08 +02:00
Christoph Wurst
1a9330cd69
Update the license headers for Nextcloud 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-31 14:52:54 +02:00
Christoph Wurst
b80ebc9674
Use the short array syntax, everywhere 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-26 16:34:56 +01:00
Robin Appelman
606f685457
properly set 'hide_download' as integer 
the database field is a smallint, not a boolean.

fixes postgresql tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-03-13 17:38:56 +01:00
Roeland Jago Douma
84a148aac1
Properly respect hide download on sharebymail 
fixes #19484

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-03-13 09:20:32 +01:00
Christoph Wurst
6127c288e8 Fix license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-13 14:23:49 +01:00
exner104
5c517baf98
additional fix to #18730 #18733 
regarding to advice from @kesselb
 2020-01-08 10:40:52 +01:00
exner104
44eba5cdc6
Wrong email sender fix #18730 
Wrong email sender in app sharebymail when sending password to owner fix #18730
 2020-01-08 09:47:55 +01:00
Christoph Wurst
5bf3d1bb38
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
Roeland Jago Douma
68748d4f85
Some php-cs fixes 
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-22 20:52:10 +01:00
Roeland Jago Douma
8085ca4cc4
Get all shares as iterable 
Sometimes we need all shares or rather a specific subset of shares but
creating dedicated functions is a pain. This just returns an iterable
object for all shares so we can loop over them without allocating all
the memory on the system.

It should not be used by any user called code. But in an occ command or
background job it is fine IMO.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-30 09:45:27 +01:00
Frederic Werner
b3f806a949 Change send to sent 
Signed-off-by: Frederic Werner <frederic-github@werner-net.work>
 2019-06-30 14:40:19 +02:00
Joas Schilling
b93aa586f4
Fix wrong method call 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-07 14:12:17 +01:00
Joas Schilling
9cc7efaedc
Make sure the relative path is always a string 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-07 13:44:35 +01:00
Bjoern Schiessle
53ce4a049b
improve mail subject for mails to the owner with the password 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-13 20:01:51 +01:00
Joas Schilling
11c39b6c16
Unshare from mail activity is missing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-04 16:42:07 +01:00
Morris Jobke
24a2107e03
Fix a case where "password_by_talk" was not a boolean (e.g. null or "0") and actively cast it to a boolean 
This was the error message that we have seen:

```
Argument 1 passed to OC\\Share20\\Share::setSendPasswordByTalk() must be of the type boolean, null given, called in apps/sharebymail/lib/ShareByMailProvider.php on line 981
```

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-12 17:01:54 +02:00
Joas Schilling
ea21aa3f7a
Use numeric placeholders if there are multiple, so that RTL languages can operate better 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-09 14:32:14 +02:00
rubo77
a3849e60ba sharebymail: Add linebreak before password 
Signed-off-by: Ruben Barkow <github@r.z11.de>
 2018-10-03 11:42:12 +02:00
Daniel Calviño Sánchez
d582a66bea Honour "sendPasswordByTalk" property in mail shares 
When a password was set for a mail share an e-mail was sent to the
recipient with the password. Now the e-mail is no longer sent if the
password is meant to be sent by Talk.

However, before the e-mail was not sent when the share was updated but
the password was not changed. Now an e-mail is sent in that case too if
switching from a password sent by Talk to a password sent by mail.

On the other hand, when switching from a password sent by mail to a
password sent by Talk it is mandatory to change the password; otherwise
the recipient would already have access to the share without having to
call the sharer to verify her identity.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:29 +02:00
Daniel Calviño Sánchez
dd0c5e297e Store "sendPasswordByTalk" property of mail shares in the database 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:28 +02:00
Bjoern Schiessle
eab4d96c4c
some small template fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
1ce519ad38
add direct link to the share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a29261175d
fix mail templates 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
73b88deeb8
add note to share object when reading it from the db 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
c116d116fa
improve mail template and escape html code 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a93f2a648b
allow to add a personal note to a share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Roeland Jago Douma
d805959e81
Add API to undelete delete group shares 
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.

This endpoint makes it possible to get back the share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-05 12:43:56 +02:00
Arthur Schiwon
38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Joas Schilling
339e320064
Fix existing usages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-15 12:18:51 +01:00
Morris Jobke
eb51f06a3b
Use ::class statement instead of string 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 12:03:47 +01:00
Morris Jobke
4dbee99b7b
Remove useless return statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:50:40 +01:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Joas Schilling
3119fd41ce
Set the data from the template 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Joas Schilling
8b37fe7f65
Set the subject with the email template to allow theming 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Stephan Müller
86265320b8
do not show hyphen after instance name in emails if slogan does not exist 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 09:20:46 +02:00
Joas Schilling
6dbb64c4a2
Merge setMetaData into constructor 
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 15:07:41 +02:00
Morris Jobke
404bd1be60
Implement metadata for email templates of remaining emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-30 22:56:14 +02:00
Morris Jobke
3cfe91bf0f
Add shareWith to email template metadata 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-29 16:09:25 +02:00
Morris Jobke
be23f7e1de
Allow the expiration date to be set to null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-28 17:49:16 +02:00
Morris Jobke
f0c34a3e89
Allow the expiration date to be set to null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-26 17:57:24 +02:00
Joas Schilling
09747b296a
Add meta information to emails for better customisation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-24 17:54:22 +02:00
Joas Schilling
3ff3c338c9 Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens 
Only use readable chars in Share Tokens
 2017-07-19 16:40:18 +02:00
Lukas Reschke
d8ec399454
Run phan over code base 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:11 +02:00
Joas Schilling
984933e586
Only use readable chars in Share Tokens 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-18 15:44:34 +02:00
Joas Schilling
90fa27694a
Use PNG version of the icons for shipped activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-20 13:48:51 +02:00
Bjoern Schiessle
1ef8ea5a7e
use the email address configured in Nextcloud as sender instead of the users email address 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-08 11:46:52 +02:00
comradekingu
864b21dd46 no "mail" or mid sentence "E-mail" 2017-05-29 18:16:09 +02:00
Bjoern Schiessle
adb60ae965
don't mention the owner of a file in case of a re-share by mail. The recipient doesn't care about the owner and probably don't even know it 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-08 19:20:31 +02:00
Joas Schilling
f43e7a9405
Fix past tense 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-26 09:27:41 +02:00
Morris Jobke
aa2bed44b6
Fix grammar 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-21 16:07:12 -05:00
Morris Jobke
6c294c3407
fix typo 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 16:33:27 +02:00
Morris Jobke
9d07ec5a96
Fix casing 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 16:33:27 +02:00
Bjoern Schiessle
aa54d31bd2
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:27 +02:00
Bjoern Schiessle
972b4c04e2
respect password policy for auto generated passwords 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
428d7cdb5e
improve mail text 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
f00c1eccf7
create activity if a password was send by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
d8dcd72118
allow admin to enforce password on mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Morris Jobke
16c4755e03
Rename renderHTML to renderHtml 
* fixes #4383
* improves consistency

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-19 15:46:41 -05:00
Lukas Reschke
b7fe28bba1
Fix indentation 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-19 12:03:54 +02:00
Lukas Reschke
203ef88509
Add "Reply-To" on ShareByMailProvider mails 
Fixes https://github.com/nextcloud/server/issues/4209

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-18 22:23:07 +02:00
Roeland Jago Douma
cab41118f6
Mail shares trigger the public key 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 15:19:23 +02:00
Joas Schilling
629b7c0fc3
Adjust docs and make !$currentAccess simpler 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:52 +02:00
Roeland Jago Douma
12afd7d1d5
Add mail element to access list 
* Each provider just returns what they have so adding an element won't
require changing everything
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:50 +02:00
Roeland Jago Douma
2cbac3357b
Offload acceslist creation to providers 
* This allows for effective queries.
* Introduce currentAccess parameter to speciy if the users needs to have
currently acces (deleted incomming group share). (For notifications)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:50 +02:00
Joas Schilling
983210de2e
Dont add click-button text for plaintext mails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:27 +02:00
Joas Schilling
506c7731a6
Don't duplicate the sentence with the header 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:26 +02:00
Morris Jobke
d0bae447fb
Use new email design for sharebymail emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 17:16:26 +02:00