Compare commits

..

616 Commits

Author SHA1 Message Date
Daniel Molkentin 1b66cbece1 Fix version string 2016-06-29 11:22:23 +02:00
Daniel Molkentin 78fa15aeef ownCloud 8.2.6 2016-06-29 11:17:00 +02:00
Vincent Petry e070cbb023 Merge pull request #25227 from owncloud/usecorrecttype
use string array when fetching share ids
2016-06-23 18:02:27 +02:00
Jörn Friedrich Dreyer d1f94e84d6 use string array when fetching share ids 2016-06-23 16:44:51 +02:00
Vincent Petry a2a23a68ee Merge pull request #25229 from owncloud/stable8.2-enc-revertversionsize
[stable8.2] Rollback version must also adjust cached size
2016-06-22 18:11:27 +02:00
Vincent Petry 9345e0dd84 Rollback version must also adjust cached size 2016-06-22 15:32:58 +02:00
Vincent Petry 5b39016db4 Also increase htaccess version 2016-06-16 20:06:32 +02:00
Daniel Molkentin 908d358670 ownCloud 8.2.6 RC1 2016-06-16 18:33:01 +02:00
Vincent Petry d17b4742a8 Merge pull request #25139 from owncloud/stable82-backport-25126
[stable8.2] load authentication apps first
2016-06-16 14:32:33 +02:00
Joas Schilling 680ee05047 Merge pull request #25122 from owncloud/scanner-locking-shared-82
Fix scanner lock on shared storages resulting into locked files
2016-06-16 14:03:21 +02:00
Christoph Wurst 83128646f1 load authentication apps first 2016-06-16 11:40:43 +02:00
Robin Appelman 9df60c7956 Fix scanner lock on shared storages resulting into locked files 2016-06-15 16:10:25 +02:00
Vincent Petry 35e2407f1d Merge pull request #25101 from owncloud/cross-storage-move-updater-82
fix updating folder sizes with cross storage move
2016-06-15 13:00:34 +02:00
Robin Appelman 71992dcb18 fix updating folder sizes with cross storage move 2016-06-14 16:42:56 +02:00
Vincent Petry f882f6b551 Merge pull request #25037 from owncloud/handle_delete_with_unavailable_storage
Handle "storage not available" to show an error message
2016-06-13 15:56:29 +02:00
Juan Pablo Villafáñez 8e640faf3a Fix typo 2016-06-10 14:42:59 +02:00
Juan Pablo Villafáñez 5a8278d9e6 Handle storage not available to show an error message 2016-06-10 14:42:59 +02:00
Vincent Petry 12098383cc Merge pull request #25040 from owncloud/stable8.2-construct-path
[Stable8.2]  Construct path to the version file from the current directory and fil…
2016-06-09 16:21:29 +02:00
Victor Dubiniuk b92831943d Construct path to the version file from the current directory and filename. Fixes #22450 2016-06-08 20:59:21 +03:00
Vincent Petry 8b48a8f560 Merge pull request #24945 from owncloud/fix_21173_stable8.2
stable8.2: normalize path in getInternalPath
2016-06-02 15:30:55 +02:00
Vincent Petry ef6e26cb30 Merge pull request #24959 from owncloud/stable8.2_24869
[stable8.2] Use a capped memory cache for the user/group cache
2016-06-02 10:38:42 +02:00
Roeland Jago Douma f582521f12 Use a capped memory cache for the user/group cache
For #24403
When upgrading huge installations this can lead to memory problems as
the cache will only grow and grow.

Capping this memory will make sure we don't run out while during normal
operation still basically cache everything.
2016-06-01 21:36:10 +02:00
Georg Ehrke f8d819fbd0 normalize path in getInternalPath 2016-06-01 13:25:53 +02:00
Christoph Wurst e8e24cbe6c Merge pull request #24924 from owncloud/stable8.2-backport-24795
[8.2] Allow opening the password reset link in a new window when its a URL
2016-06-01 12:12:26 +02:00
Christoph Wurst 0d5f56b465 Merge pull request #24418 from owncloud/fix_24182_8.2
[stable8.2] first call the post_login hooks, before we call getUserFolder.
2016-06-01 12:04:26 +02:00
Vincent Petry c1257761f1 Merge pull request #23571 from owncloud/stable8.2-backport-23362
[stable8.2] Read available l10n files also from theme folder
2016-06-01 11:17:47 +02:00
Joas Schilling ed3d970322 Add a warning when the transaction isolation level is not READ_COMMITED (#24916) 2016-06-01 06:58:05 +02:00
Joas Schilling 31a37d4f19 Allow opening the password reset link in a new window when its a URL 2016-05-31 14:22:19 +02:00
Roeland Douma f94c8b8c18 Merge pull request #24893 from owncloud/scanner-size-propagation-82
[8.2] trigger size calculation after scanning
2016-05-31 10:45:50 +02:00
Robin Appelman c163ac6620 trigger size calculation after scanning 2016-05-30 14:23:13 +02:00
Georg Ehrke d4addbf511 dont update search onResize (#24862)
this.updateSearch() sets the current file list instance and clears the box. This is unnecessary and makes the search box unsuable on some mobile devices where a keyboard fade-in causes a onResize trigger, which would then clear and blur the box.
2016-05-30 12:12:35 +02:00
Roeland Douma e20c49dab6 Merge pull request #24841 from owncloud/islocal-cache
[8.2] cache isLocal for shared storage
2016-05-30 08:12:01 +02:00
Robin Appelman 7f9b28f2c1 cache isLocal for shared storage 2016-05-25 14:56:29 +02:00
Vincent Petry c6acbb4e8b Merge pull request #24818 from owncloud/filesystem_check_changes-8.2
clarify filesystem_check_changes in config.sample.php
2016-05-25 09:40:29 +02:00
Carla Schroder aa3e4637b5 clarify filesystem_check_changes in config.sample.php 2016-05-24 08:19:05 -07:00
Roeland Douma 0130314102 [Stable8.2] Use a CappedCache in the user database backend (#24413)
* Use a CappedCache in the user database backend

When running with a user database backend on large installations the
cache can grow to significant sizes. This can be especially problematic
when running big cron/repair jobs.

* Allow indirect set in CappedMemoryCache
2016-05-24 14:19:27 +02:00
Vincent Petry 36aa4e8aea Merge pull request #24704 from owncloud/locking-mark-reload-free-82
[8.2] free up memory when releasing the last shared lock
2016-05-19 10:28:33 +02:00
Vincent Petry 4439adaf27 Merge pull request #24692 from owncloud/stable8.2-fixchunkttl
[stable8.2] Allow chunk GC mtime tolerance for unfinished part chunks
2016-05-18 18:19:58 +02:00
Robin Appelman 8beb496719 free up memory when releasing the last shared lock 2016-05-18 16:20:30 +02:00
Vincent Petry 9bd8bffc0c Allow chunk GC mtime tolerance for unfinished part chunks
Whenever part chunks are written, every fwrite in the write loop will
reset the mtime to the current mtime. Only at the end will the touch()
operation set the mtime to now + ttl, in the future.

However the GC code is expecting that every chunk with mtime < now are
old and must be deleted. This causes the GC to sometimes delete part
chunks in which the write loop is slow.

To fix this, a tolerance value is added in the GC code to allow for
more time before a part chunk gets deleted.
2016-05-18 13:57:26 +02:00
Thomas Müller 1450cb2c82 [stable8.2] Wait a while even after successful connect ... (#24535)
Wait a while even after successful connect ...
2016-05-17 21:45:39 +02:00
Vincent Petry 8a7c8c3a65 Merge pull request #24656 from owncloud/can-not-disable-server2server-sharing-anymore
Correctly load server2server sharing configs
2016-05-17 11:02:16 +02:00
Joas Schilling 7ef9cbd64a Correctly load server2server sharing configs 2016-05-17 09:46:09 +02:00
Vincent Petry d856793db0 Merge pull request #24391 from owncloud/capped-normalized-cache-82
[8.2] cap the normalized path cache
2016-05-13 16:17:30 +02:00
Vincent Petry 8cd410539e Merge pull request #24498 from owncloud/backport-20804-8.2
[stable8.2] LDAP: do not attempt to process user records without display name, fi…
2016-05-13 16:16:55 +02:00
Vincent Petry 9664a3b8cd Merge pull request #24504 from owncloud/stable8.2-updater-server-configurable
[stable8.2] Make update server URL configurable
2016-05-13 16:14:19 +02:00
C Montero-Luque 9bb7860146 8.2.5 2016-05-12 15:57:38 -04:00
Thomas Müller 7af233cf8c Merge pull request #24573 from owncloud/stable8.2_24568
[Stable 8.2] Fix etag propegation test race condition
2016-05-11 16:29:17 +02:00
Roeland Jago Douma c141f48c46 Fix test race condition
E-tag propagation replies on the mtime of the file. Order of events:

1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.

Now this goes right often when 1 and 2 happen in the same second.
However imagine

1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)

Now the mtime will be set to the same time. Thus not chaning the etag.
2016-05-11 14:55:44 +02:00
Thomas Müller 1203ebab9a Merge pull request #24555 from owncloud/kill-en@pirate-stable8.2
[stable8.2] Yo-ho-oh - Murder all band 'o pirates
2016-05-11 14:29:23 +02:00
Thomas Müller 4951e1dd0c Yo-ho-oh - Murder all band 'o pirates 2016-05-11 11:29:49 +02:00
C Montero-Luque 08c798a45d 8.2.5 RC2 2016-05-10 15:49:25 -04:00
C Montero-Luque ccdfccc891 8.2.5 RC1 2016-05-09 18:42:48 -04:00
Thomas Müller d9a409606f Merge pull request #24508 from owncloud/backport-23901-app-disabled-on-legacy-job
[8.2] Catch the AutoloadNotAllowedException also for legacy jobs
2016-05-09 16:01:02 +02:00
Joas Schilling 027eaa4b2c Catch the AutoloadNotAllowedException also for legacy jobs 2016-05-09 13:31:47 +02:00
Lukas Reschke fadc9872b7 Make update server URL configurable
Currently testing the updates is a big problem and not really super easy possible. Since we now have a new updater server we should also make this configurable so that people can properly test updates.
2016-05-09 12:05:29 +02:00
Arthur Schiwon a4e658df39 LDAP: do not attempt to process user records without display name, fixes fatal error 2016-05-09 11:11:03 +02:00
Björn Schießle d9163c29f3 first call the post_login hooks, before we call getUserFolder.
The login process needs to be completed before we can safely create
the users home folder. For example we need to give encryption a chance
to initialize the users encryption keys in order to copy the skeleton
files correctly
2016-05-03 14:22:26 +02:00
Thomas Müller a3a53075d8 Fixes #23899 2016-05-03 14:21:57 +02:00
C Montero-Luque f5c39b70d8 8.2.4 2016-05-03 04:38:56 -04:00
Robin Appelman aab023b86c cap the normalized path cache 2016-05-02 15:25:31 +02:00
C Montero-Luque ec0a29cd52 8.2.4 RC2 2016-05-02 04:15:36 -04:00
C. Montero Luque fe26682644 Merge pull request #24344 from owncloud/stable8.2_24326
[Stable 8.2] Make ownCloud work again in php 7.0.6
2016-05-02 04:09:39 -04:00
Roeland Jago Douma 2fef88c5a6 Make ownCloud work again in php 7.0.6
See https://bugs.php.net/bug.php?id=72117
2016-04-29 11:27:20 +02:00
C Montero-Luque 2b18334162 8.2.4 RC1 2016-04-26 21:24:24 -04:00
Vincent Petry cac5afd85f Merge pull request #24283 from owncloud/backport-24262-stable8.2
[stable8.2] check whether index is set before using it
2016-04-26 20:49:29 +02:00
Roeland Douma 96ce579adc Merge pull request #24288 from owncloud/local-invalid-82
[8.2] error out if a local storage isn't setup correctly
2016-04-26 20:23:25 +02:00
Robin Appelman e2437c51b5 add tests 2016-04-26 16:10:09 +02:00
Robin Appelman dca1945e87 error out if a local storage isn't setup correctly 2016-04-26 16:10:06 +02:00
Arthur Schiwon 898266f0dc check whether index is set before using it 2016-04-26 14:47:59 +02:00
blizzz f5f5dffd86 Merge pull request #24243 from owncloud/stable8.2-backport-24052
[stable8.2] Fix LDAP race conditions
2016-04-26 13:04:42 +02:00
Morris Jobke 9828ae4b3f Merge pull request #24260 from owncloud/scanner-locking-82
[8.2] add locks in the scanner to prevent multiple scanners running on the …
2016-04-26 10:57:49 +02:00
Robin Appelman c58f16899b add locks in the scanner to prevent multiple scanners running on the same files 2016-04-25 18:25:54 +02:00
Robin Appelman 6c0d61c9a8 Revert "add locks in the scanner to prevent multiple scanners running on the same files"
This reverts commit fd8e3f7301.
2016-04-25 18:23:26 +02:00
Morris Jobke 94aa8f9306 Merge pull request #24237 from owncloud/backport-24214-stable8.2
[stable8.2] on clone Connection, do not take over the existing LDAP resource
2016-04-25 16:37:44 +02:00
Robin Appelman fd8e3f7301 add locks in the scanner to prevent multiple scanners running on the same files 2016-04-25 15:48:03 +02:00
Morris Jobke 80052995d5 Fix LDAP race conditions
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
  return only non-null values
2016-04-25 13:44:22 +02:00
Arthur Schiwon 26869c1a93 on clone Connection, do not take over the existing LDAP resource
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-25 12:43:33 +02:00
blizzz 505e2b35b0 Merge pull request #24144 from owncloud/stable8.2-filelist-redirectonstoragenotavailable
Fix StorageNotAvailable exception string detection
2016-04-23 01:25:12 +02:00
Thomas Müller 3ab41be506 Merge pull request #24181 from owncloud/backport-24145-limit-background-job-runtime-8.2
[8.2] Make sure that CLI cron doesn't run for ever, but makes use of the ne…
2016-04-22 17:25:14 +02:00
Thomas Müller 4ed979df5f Merge pull request #24197 from owncloud/backport-24183-change-background-job-sort-order-8.2
[8.2] Change the sort order of background jobs to be DESC instead of ASC
2016-04-22 15:17:32 +02:00
Joas Schilling 6c1680addc Change the sort order of background jobs to be DESC instead of ASC
In theory, if your instance ever creates more jobs then your system cron can
handle, the default background jobs get never executed anymore. Because
everytime when the joblist returns the next job it looks for the next ID,
however there is always a new next ID, so it will never wrap back to execute
the low IDs. But when we change the sort order to be DESC, we make sure that
these low IDs are always executed, before the system jumps back up to
execute the new IDs.
2016-04-22 14:17:45 +02:00
Joas Schilling db6b6d832e Make sure that CLI cron doesn't run for ever, but makes use of the next spawn 2016-04-22 10:01:22 +02:00
Thomas Müller 05b9503400 Merge pull request #24171 from owncloud/stable8.2-certificate
[stable8.2] Ignore certificate file if it starts with file://
2016-04-22 09:36:17 +02:00
Vincent Petry 1e017ea69f Merge pull request #24162 from owncloud/backport-23461-activity-without-sharing-8.2
Fix "AutoloadNotAllowedException" when files_sharing is disabled
2016-04-22 09:23:45 +02:00
Vincent Petry e912db00a8 Merge pull request #23807 from owncloud/backport-of-#23760-1
[stable8.2] Fix conditional check in MySQL setup
2016-04-22 09:18:35 +02:00
Christoph Wurst 4648f63431 Merge pull request #24152 from owncloud/remember-email-when-setting-expiration
[stable8.2] remember email when setting expiration date
2016-04-21 20:31:59 +02:00
Lukas Reschke d3f585c329 [stable8.2] Ignore certificate file if it starts with file:// 2016-04-21 18:56:58 +02:00
Thomas Müller 8bd3ea08eb Merge pull request #24113 from owncloud/backport-24111-chunking-users-in-background-jobs-8.2
[8.2] Chunk the users correctly in the trashbin and versions background job
2016-04-21 16:21:27 +02:00
Joas Schilling d727ade11d Fix "AutoloadNotAllowedException" when files_sharing is disabled 2016-04-21 16:13:28 +02:00
Thomas Müller 8f2759de21 Merge pull request #23548 from owncloud/stable8.2-quota-recognizeremoteunlimitedquota
[stable8.2] Workaround to be able to recognize unlimited quota in fed shares
2016-04-21 12:56:57 +02:00
Christoph Wurst 699691f910 remember email when setting expiration date
fixes #22947
2016-04-21 12:32:41 +02:00
Vincent Petry 88613ded7f Fix StorageNotAvailable exception string detection 2016-04-21 10:23:21 +02:00
Morris Jobke 2aed501f7f Merge pull request #24130 from owncloud/stable82_24108
[stable8.2] Allow setting can edit permissions on federated shares in webUI
2016-04-20 22:34:47 +02:00
Morris Jobke af5d08d97f Merge pull request #23984 from owncloud/fix-infinite-loop-in-unavailable-mount
[stable8.2] Fixes a possible infinite change-dir-loop
2016-04-20 21:07:20 +02:00
Roeland Jago Douma c53acac91e Allow setting can edit permissions on federated shares in webUI
Fixes #24032

Since we have a slightly different UI for the federated shares our
normal logic fails us. This makes sure to add the correct permissions
when it is a federated share.
2016-04-20 19:19:21 +02:00
Björn Schießle 3a83912300 Merge pull request #24100 from owncloud/fix_23632_8.2
[stable8.2] init users mount point before recovery
2016-04-20 17:05:45 +02:00
Vincent Petry b54faa994b Merge pull request #23363 from owncloud/smb-1.0.8-82
[8.2] update icewind/smb to 1.0.8
2016-04-20 11:04:32 +02:00
Vincent Petry 2d59027064 Merge pull request #24000 from owncloud/shared-islocal-82
[8.2] implement isLocal for shared storage
2016-04-20 10:56:59 +02:00
Joas Schilling 85a860a369 Copy the 9.0 method for the background jobs 2016-04-20 10:43:58 +02:00
Vincent Petry aa408deef9 Merge pull request #23402 from owncloud/backport-23282-stable8.2
[stable8.2] fix writing to cache when fallback server should be used immediately
2016-04-20 10:42:59 +02:00
Joas Schilling f052f0e59a Chunk the users correctly in the trashbin and versions background job 2016-04-20 10:41:56 +02:00
Roeland Douma 36c43bad53 Merge pull request #24008 from owncloud/fix_repeating_user_list
Fix repeating user list in webUI
2016-04-19 20:12:37 +02:00
Roeland Jago Douma 60680cb28c Fix repeating user list in webUI
Steps:

1. create a folder A
2. share A with user1, user2 and user3
3. create a folder A/B
4. share A/B with user4 ("Shared in A with user1, user2, user3" appears in the sidebar below the share input field)
5. share A/B with user5 (the text is expanded with ", user1, user2, user3")

After:

user1, user2, user3 is only shown once
2016-04-19 19:31:20 +02:00
Björn Schießle d5b2d94f78 we need to initialize the mount points of the given user before we recover
access to his files
2016-04-19 17:18:26 +02:00
Morris Jobke b818e24e28 Merge pull request #24044 from owncloud/stable8.2-autoload
[stable8.2] Exclude autoload_static.php
2016-04-18 08:47:55 +02:00
Lukas Reschke fdc157fe97 Exclude autoload_static.php 2016-04-17 11:14:04 +02:00
Robin Appelman fd3f090280 implement isLocal for shared storage 2016-04-14 15:50:28 +02:00
Arthur Schiwon 39004c2b7b Fixes a possible infinite change-dir-loop
Those can occure when browsing in a mount that got unavailable
2016-04-13 22:43:33 +02:00
Morris Jobke d45ecadba7 Merge pull request #23785 from owncloud/stable8.2-backport-23304
[stable8.2] Fix PHP memory leak in file_get_contents()
2016-04-12 10:42:10 +02:00
Joas Schilling 511487e961 Correctly return an empty string for empty files 2016-04-08 15:12:01 +02:00
Daniel Hansson f07323d6c0 [stable9] Fix conditional check in MySQL setup
Backport of "Fix conditional check in MySQL setup #23760"
2016-04-05 16:06:17 +02:00
Morris Jobke acb67a84c2 Fix PHP memory leak in file_get_contents()
* ref https://bugs.php.net/bug.php?id=61961
* ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256
* code is based on the proposal of @chriseqipe
* fixes #20261
2016-04-04 18:19:08 +02:00
Lukas Reschke cb9d0b9c7c Merge pull request #23711 from owncloud/fix_encryption_versions_on_external_storages_8.2
[stable8.2] fix creation of versions of encrypted files on external storages
2016-04-01 08:49:40 +02:00
Bjoern Schiessle 1b663a875a fix creation of versions of encrypted files on external storages
in order to create a 1:1 copy of a file if a version gets created
we need to store this information on copyBetweenStorage(). This
allows us to by-pass the encryption wrapper if we read the source file.
2016-03-31 23:19:51 +02:00
Morris Jobke f24f3b1bb9 Read available l10n files also from theme folder
The old behaviour was that only languages could be used for an app
that are already present in the apps/$app/l10n folder. If there is
a themed l10n that is not present in the apps default l10n folder
the language could not be used and the texts are not translated.

With this change this is possible and also the l10n files are
loaded even if the default l10n doesn't contain the l10n file.
2016-03-24 17:59:12 +01:00
Vincent Petry 7c86d79374 Workaround to be able to recognize unlimited quota in fed shares
Fixes issues where a user cannot upload to a fed share on OC >= 9.0
where the sharer has unlimited quota (-3)
2016-03-24 14:11:06 +01:00
Vincent Petry 3b3780f532 Merge pull request #23505 from owncloud/ee-1149-share-propagation-entries-in-db
Grab the values for share propagation manually from the DB
2016-03-23 14:40:56 +01:00
Morris Jobke 579f50bc9b Merge pull request #23457 from owncloud/backport-23329-stable8.2
[stable8.2] Avatar must be saved after login is done and external storages set up…
2016-03-23 13:04:22 +01:00
Joas Schilling aa95ac6bc8 Chunk the shareId query 2016-03-23 11:16:37 +01:00
Joas Schilling a951858000 Grab the values for share propagation manually from the DB 2016-03-23 10:54:30 +01:00
Thomas Müller 0d8617a1f0 Merge pull request #23481 from owncloud/smb-handle-forbidden-82
[8.2] handle forbidden exceptions in smb backend
2016-03-23 09:12:22 +01:00
Robin Appelman 2b36716b18 handle forbidden exceptions in smb backend 2016-03-22 15:37:21 +01:00
Thomas Müller d0ad124505 Merge pull request #23433 from owncloud/stable82_fix_22128
Do not show hash if parent is shared by link
2016-03-22 10:18:12 +01:00
Arthur Schiwon cf73db11b5 Avatar must be saved after login is done and external storages set up properly, fixes #21555 2016-03-21 22:38:18 +01:00
Roeland Jago Douma 22ca4c5654 Do not show hash if parent is shared by link
fixes #22128

Since we store the password in the shared_with field of the database we
need to do some extra processing not to show it.
2016-03-21 19:51:00 +01:00
Morris Jobke 8ba36692bf Merge pull request #23391 from owncloud/stable8.2-share-keepoptioncheckboxinblocks
[stable8.2] Keep share checkboxes together
2016-03-21 14:13:08 +01:00
Arthur Schiwon 01d12ec74e fix writing to cache when fallback server should be used immediately 2016-03-18 20:41:00 +01:00
Roeland Douma efad504707 Merge pull request #23379 from owncloud/stable8.2-backport-23370
[stable8.2] Update avatar on username change if avatar is set
2016-03-18 15:53:34 +01:00
Vincent Petry b706ba41e0 Keep share checkboxes together
- removed leading spaces before markup which can affect rendering in
  some cases
- added shareOption CSS class to group and keep share option checkbox +
  label
- moved ".showCruds" arrow into the matching shareOption to keep the
  arrow together with the checkbox
2016-03-18 14:31:37 +01:00
Vincent Petry 65971f16d1 Merge pull request #22766 from owncloud/ceph-keystone-readiness-stable8.2
Synchronise files_external and objectstore Docker tests with master
2016-03-18 11:24:58 +01:00
Morris Jobke 1179462f4e Update avatar on username change if avatar is set
* fixes #20455
2016-03-18 08:59:47 +01:00
Thomas Müller 9c00957da0 Merge pull request #23354 from owncloud/stable8.2_backport_23346
[Stable 8.2] Set proper public webdav permissions when public upload disabled
2016-03-17 20:50:53 +01:00
Robin Appelman b88acd51d2 update icewind/smb to 1.0.8 2016-03-17 16:16:37 +01:00
Roeland Jago Douma 499eba593e Set proper public webdav permissions when public upload disabled
Fixes #23325

It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.

To make sure this is handled correctly we need to check the config value
and reduce the permissions.

Fix is kept small to be easy backportable.
2016-03-17 13:56:24 +01:00
Vincent Petry a110bdb10f Merge pull request #23312 from owncloud/check-syntax-travis-stable8.2
[stable8.2] Execute parallel-lint
2016-03-16 18:10:28 +01:00
Lukas Reschke aee10f0281 [stable8.2] Execute parallel-lint
Backport of https://github.com/owncloud/core/pull/22994 and https://github.com/owncloud/core/pull/23303
2016-03-16 15:10:45 +01:00
Morris Jobke 7e92ef37e3 Merge pull request #23234 from owncloud/stable8.2-fix_21678
[stable8.2] Gracefull handle link shares rename hook
2016-03-16 13:21:00 +01:00
Lukas Reschke cd78b90daf Merge pull request #23266 from owncloud/fix_22907_8.2
allow group shares, even if not all public keys are available
2016-03-15 19:07:06 +01:00
Bjoern Schiessle 38f8f2837e allow group shares, even if not all public keys are available 2016-03-15 15:14:45 +01:00
Roeland Jago Douma 1acc045e0c Gracefull handle link shares rename hook
Fixes #21678

The hook is called on all renames. However when we use a link share
the getUserFolder fails. We now just opt out.
2016-03-14 17:29:18 +01:00
Vincent Petry a5de6b3713 Merge pull request #22934 from owncloud/stable8.2-backport-22872
[stable8.2] Update error text for link passwords
2016-03-14 16:17:00 +01:00
Thomas Müller 4b8094abc1 Merge pull request #22944 from owncloud/backport-22800-stable8.2
[8.2] don't hide server not available exception, fixes #20536
2016-03-14 16:15:31 +01:00
Morris Jobke 127f764ee5 Merge pull request #23103 from owncloud/stable8.2-backport-23094
[stable8.2] Fake LOCK statement for Windows 7, 8 and 10 network mounts
2016-03-13 14:53:17 +01:00
Morris Jobke 24f94eeffc Fake LOCK statement for Windows 7, 8 and 10 network mounts
* fixes #22596
2016-03-10 16:01:06 +01:00
Morris Jobke 236d16e57b Merge pull request #23025 from owncloud/stable8.2-backport-22986
[stable8.2] Remove disabled autocorrect for new file names
2016-03-09 17:31:30 +01:00
Morris Jobke 755ca52e48 Remove disabled autocorrect for new file names
* ref #22784
2016-03-09 15:01:51 +01:00
Morris Jobke 0010c874c4 Merge pull request #22842 from owncloud/stable82_22830
[Stable 8.2] Rename and move permissions are set when a file is updatable
2016-03-09 08:44:18 +01:00
Morris Jobke a03173caee Merge pull request #22923 from owncloud/stable8.2-share-archivenamedownloadall
[stable8.2] Fix archive file name when downloading public share
2016-03-09 08:43:11 +01:00
Morris Jobke 7a94a58543 Merge pull request #22935 from owncloud/stable8.2-remove-wrongly-backported-test
Remove wrongly backported test
2016-03-09 08:42:33 +01:00
Morris Jobke 6ebaef54f0 Merge pull request #22927 from owncloud/stable8.2-files-newmenu-removebrowsercomplete
[stable8.2] Remove browser autocomplete in new file menu
2016-03-09 08:34:57 +01:00
C Montero-Luque fc18c0506a 8.2.3 2016-03-08 09:02:46 -05:00
Arthur Schiwon 35200de653 don't hide server not available exception, fixes #20536 2016-03-08 12:48:26 +01:00
Thomas Müller c2f3127d24 Fix casing - causes failure on php 5.4 2016-03-08 10:31:38 +01:00
Morris Jobke 9464d71d75 Remove wrongly backported test
* backported with #22752
2016-03-08 09:57:53 +01:00
Morris Jobke 9cd2ef6e8a Update error text for link passwords
* this removes the old tooltip first before showing
  the new one to update the text - otherwise the old
  text will be shown
2016-03-08 09:06:12 +01:00
Vincent Petry 9b22ecd1c0 Remove browser autocomplete in new file menu 2016-03-07 22:04:57 +01:00
Vincent Petry 4bc0eb546c Remove "files" arg from download URL in public link page
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
2016-03-07 21:50:45 +01:00
Vincent Petry f9a14e5c54 Fix archive file name when downloading public share
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.

This fix makes sure to trigger the correct logic when no file list was
given.
2016-03-07 21:50:41 +01:00
C Montero-Luque c51ae5f8ee 8.2.3 RC2 2016-03-04 18:15:14 -05:00
C. Montero Luque 0c03e7c384 Merge pull request #22868 from owncloud/stable8.2-backport-22865
[stable8.2] Run cleanup of expired DB file locks to background job
2016-03-04 14:25:53 -05:00
C. Montero Luque bf9be4b2c8 Merge pull request #22862 from owncloud/stable8.2-trashbin-checkpath
[stable8.2] Properly check path validity before deleting to trash
2016-03-04 13:33:43 -05:00
Morris Jobke 12e006c1f5 Run cleanup of expired DB file locks to background job
* fixes #22819

The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.

This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
2016-03-04 17:03:41 +01:00
Vincent Petry 152e2e361d Properly check path validity before deleting to trash
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
2016-03-04 15:34:35 +01:00
Roeland Jago Douma b66d536fc1 Rename and move permissions are set when a file is updatable
* Fix unit tests
2016-03-04 09:38:34 +01:00
Frank Karlitschek 78f40de835 Merge pull request #22802 from RealRancor/backport_22776_stable8.2
Add Versions app header to config.sample.php
2016-03-03 14:10:22 -05:00
RealRancor dd36bed3e0 Add Versions app header to config.sample.php 2016-03-03 08:44:27 +01:00
C Montero-Luque 61a71c6f69 8.2.3 RC1 2016-03-01 20:27:56 -05:00
Robin McCorkell 1fa95c3a4c Synchronise files_external and objectstore Docker tests with master
Checkout files from 4d69e562a0
2016-03-01 23:01:57 +00:00
Vincent Petry 5200baa966 Merge pull request #22752 from owncloud/part-file-root-82
[stable8.2] allow putting the part file in the view root
2016-03-01 20:43:54 +01:00
Thomas Müller ee4d57660d Merge pull request #22751 from owncloud/stable8.2-codecheckeruses
[stable8.2] Fixing CodeChecker usage
2016-03-01 15:26:10 +01:00
Vincent Petry d32fc2d771 Don't apply quota in stream wrapper for part files
When overwriting shared files as recipient, the part file is written on
the uploader's storage before overwriting the target file.

If the uploader has no quota left, they should still be able to
overwrite that file with Webdav. To make this work, they need to be able
to write the part file to their own storage first.
2016-03-01 15:25:33 +01:00
Robin Appelman cf63a16935 add config sample 2016-03-01 14:51:31 +01:00
Robin Appelman c120578735 allow putting the part file in the view root 2016-03-01 14:43:40 +01:00
Thomas Müller af44b5e573 Fixing CodeChecker usage 🙈 2016-03-01 13:42:54 +01:00
Vincent Petry f19ba49c60 Merge pull request #22325 from owncloud/dav-upload-scan-in-lock-82
[8.2] scan the file in the write lock when uploading over dav
2016-03-01 13:26:06 +01:00
Morris Jobke b74ad0c457 Merge pull request #22705 from owncloud/backport-22677-theme-overwriting-language
[8.2] Allow to overwrite a single language string via the theme folder
2016-03-01 11:54:21 +01:00
Vincent Petry d774cbe546 Merge pull request #22657 from owncloud/stable8.2-backport-21854
[stable8.2] Fix addUserToGroup hook of the share code
2016-03-01 10:24:29 +01:00
Vincent Petry 9987424496 Improved JS L10N bundle merging + tests 2016-03-01 09:54:56 +01:00
Morris Jobke 1820dc2fbe Merge pull request #22712 from owncloud/kill-coverage-on-scrutinizer-stable8.2
Update .scrutinizer.yml
2016-02-29 18:03:14 +01:00
Thomas Müller 0b965a4344 Update .scrutinizer.yml 2016-02-29 11:03:02 +01:00
Thomas Müller b7780a71fd Merge pull request #22665 from owncloud/backport-22599-stable8.2
[backport] [stable8.2] take the first result of that array, if present. Fixes 2nd display na…
2016-02-29 11:01:46 +01:00
Joas Schilling d9824ca9f4 Allow to overwrite a single language string via the theme folder 2016-02-29 09:14:05 +01:00
Morris Jobke 98e94de18f Merge pull request #22685 from owncloud/stable8.2-fix-thrashbin-cronjob
[Stable8.2] fix thrashbin cronjob
2016-02-29 08:31:10 +01:00
Victor Dubiniuk 3285f5e585 Skip users with no trashbin 2016-02-26 18:34:15 +03:00
Morris Jobke bbfc5bbf30 Merge pull request #22676 from owncloud/fed-share-etag-82
[8.2] use the default view for propagation if possible
2016-02-26 14:56:31 +01:00
Robin Appelman 1384bf5066 use the default view for propagation if possible 2016-02-26 13:55:12 +01:00
Robin Appelman e17bc565b7 Add test for owner etag propagation 2016-02-26 13:50:35 +01:00
Roeland Douma 54f8ec8be0 Merge pull request #22574 from owncloud/backport-22419-console-add-user-group-with-shares
[8.2] Make sure to init the users Filesystem so we can add group shares
2016-02-26 08:18:10 +01:00
Arthur Schiwon 36a8f22dc3 take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled. 2016-02-26 02:09:25 +01:00
Morris Jobke 2ef8483b6d Fix addUserToGroup hook of the share code
* sets up the filesystem of the user that is added to a group
  to properly accept shares
* fixes #18499
2016-02-25 18:42:41 +01:00
Thomas Müller 696ee349ea Merge pull request #22649 from owncloud/external-share-manager-82
inject the correct external share manager into the storage
2016-02-25 17:13:00 +01:00
Thomas Müller 83fa9a1f54 Merge pull request #22629 from owncloud/stable8.2-fedshare-testremote-after-404
[stable8.2] Properly trigger testRemote after getting a 404 from remote fed share
2016-02-25 16:56:38 +01:00
Vincent Petry 4c3f9bd489 Merge pull request #22633 from owncloud/stable8.2-backport-22565
[stable8.2] Avoids scanning the root storage
2016-02-25 16:49:11 +01:00
Robin Appelman 3415933bd8 inject the correct external share manager into the storage 2016-02-25 15:43:38 +01:00
Björn Schießle 75f9587915 Merge pull request #22626 from owncloud/fix_broken_unencrypted_size_8.2
[stable8.2] Heal unencrypted file sizes at download time
2016-02-25 14:51:04 +01:00
Bjoern Schiessle f8e25419e5 recalculate unencrypted size if we assume that the size stored in the db is not correct 2016-02-25 11:16:15 +01:00
Morris Jobke 60ff1de286 Avoids scanning the root storage
This check will skip the background scan for the root storage
because there is nothing in the root storage that isn't already
in another (mostly user-) storage.

Fixes #22501
2016-02-24 17:27:07 +01:00
Morris Jobke a0bd774ca5 Merge pull request #22614 from owncloud/backport-22358-stable8.2
[Backport][stable8.2] Fix race condition when switching filter mode.
2016-02-24 17:07:03 +01:00
Vincent Petry bb1db1ef5b Properly trigger testRemote after getting a 404 from remote fed share
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
2016-02-24 16:33:20 +01:00
Arthur Schiwon 5102458c3f Fix race condition when switching filter mode. Fixes #22278 2016-02-24 11:14:52 +01:00
Morris Jobke 300953c3ef Merge pull request #22571 from owncloud/stable8.2-backport-21544
[stable8.2] set etag and permission fields for trashbin entries
2016-02-24 11:10:43 +01:00
Joas Schilling 0e999ab3b4 Make sure to init the users Filesystem so we can add group shares 2016-02-22 15:52:26 +01:00
Roeland Douma 2a29d7a4ff Merge pull request #22557 from owncloud/backport-22496-share-group-problem
[8.2] Fix on shared groups assignment.
2016-02-22 15:47:28 +01:00
Robin Appelman bdbdd27e47 set etag and permission fields for trashbin entries 2016-02-22 15:29:16 +01:00
Morris Jobke 8614497f91 Merge pull request #22562 from owncloud/stable8.2-ie-publicpagefooter
[stable8.2] Fix public page footer position in IE
2016-02-22 13:30:07 +01:00
Vincent Petry 4a156bb9d1 Fix public page footer position in IE
The content element needs hasLayout, so triggering it with a display
attribute.

Without this, the #content element's height would be as high as the
window's height instead of adjusting itself to its contents' height.
2016-02-22 11:40:53 +01:00
Vincent Petry 5bda7f84b5 Merge pull request #22556 from owncloud/stable8.2-fix-pagination-in-ie
[stable8.2] Fixes pagination in IE
2016-02-22 11:40:27 +01:00
Leonardo Diez 7affaeb906 Fix on shared groups assignment. 2016-02-22 10:41:35 +01:00
Morris Jobke 1f87d1aff1 Fixes pagination in IE
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
2016-02-22 10:30:13 +01:00
Morris Jobke 3f16fae206 Merge pull request #22456 from owncloud/stable8.2-files-select-closesidebar
[stable8.2] Close file detail sidebar when selecting/unselecting files
2016-02-17 15:29:26 +01:00
Vincent Petry 550983bd02 Close file detail sidebar when selecting/unselecting files
Interacting with the checkboxes, also "Select all" will automatically
close the sidebar now.
2016-02-17 10:35:17 +01:00
Morris Jobke 91aa1bb045 Merge pull request #22372 from owncloud/stable8.2-backport-22369
[stable8.2] Fix BMP support
2016-02-16 09:16:25 +01:00
Roeland Douma 95c815fcd2 Merge pull request #22364 from owncloud/backport-20152-stable8.2
[stable8.2] Remove invalid type-cast
2016-02-15 19:40:45 +01:00
Morris Jobke ce4d5185fa Fix BMP support
* fixes #16461
2016-02-14 09:32:04 +01:00
Lukas Reschke 81b1ce4db0 Remove invalid type-cast
This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required.

Fixes https://github.com/owncloud/core/issues/20095
2016-02-13 14:30:37 +01:00
Thomas Müller 5bbf8eda23 Merge pull request #22040 from owncloud/stable8.2-backport-21999
[stable8.2] [user_ldap] properly decode cached objects
2016-02-11 18:52:50 +01:00
Robin Appelman afeb3f3eec scan the file in the write lock when uploading over dav 2016-02-11 14:44:22 +01:00
Thomas Müller aef1def9be Merge pull request #22323 from owncloud/stable8.2-22322
[stable8.2] Fix typo
2016-02-11 14:25:45 +01:00
Morris Jobke 38470ef317 Fix typo
backport of #22322
2016-02-11 14:06:19 +01:00
Vincent Petry a580785da8 Merge pull request #22262 from owncloud/stable8.2-backport-21251
[stable8.2] occ command can only be called from ownCloud root directory
2016-02-11 11:46:00 +01:00
Morris Jobke 70817a61e4 Merge pull request #22293 from owncloud/stable8.2-versions-fixpathasrecipient
[stable8.2] Fix versions path as share recipient when different than owner path
2016-02-10 17:34:36 +01:00
Vincent Petry 4457323878 Use full path of known file when handling versions
Instead of relying on the versions API response, use the known file path
when populating version models.
2016-02-10 16:49:23 +01:00
Vincent Petry e40abfbbfe Remove path from versions response
The path attribute contains the path relative to the owner's home
folder, not the one from the recipient, which is useless for the client
and needlessly discloses the owner's original path.

The requested already has access to the full path of the file, so no
need to add it to the response.
2016-02-10 16:49:18 +01:00
Morris Jobke 57fc56b5f3 Merge pull request #22261 from owncloud/stable8.2-backport-21459
[stable8.2] Make LDAP more robust to exceptions and log them properly
2016-02-10 15:23:58 +01:00
Morris Jobke e23c67b0fd occ command can only be called from ownCloud root directory
* this changes into the ownCloud root directory and then should run just fine
* avoids weird error messages that are caused by this
2016-02-10 09:51:31 +01:00
Morris Jobke 1911fd5d9f Make LDAP more robust to exceptions and log them properly 2016-02-10 09:46:21 +01:00
Vincent Petry 3350d62b75 Merge pull request #22250 from owncloud/stable8.2-ldap_2nddispname
Backport of LDAP second display name
2016-02-09 18:37:15 +01:00
Arthur Schiwon eedf9a6b8a adjust test 2016-02-09 18:19:58 +01:00
Arthur Schiwon b858550e66 Backport of LDAP second display name
From c1871f5787
2016-02-09 16:29:08 +01:00
Thomas Müller b4bbd4a70f Merge pull request #22185 from farukuzun/stable8.2
[stable8.2] Introduce some mimetypes for richdocuments
2016-02-09 11:25:48 +01:00
Faruk Uzun 0d3b333210 Introduce some mimetypes for richdocuments
* application/vnd.lotus-wordpro
* application/vnd.visio
* application/vnd.wordperfect
* application/msonenote

Backport of #21766
2016-02-08 05:52:44 +02:00
Morris Jobke 47b1b67b4c Merge pull request #22172 from owncloud/stable8.2-backport-22143
[stable 8,2] When a user is removed we should remove the right shares
2016-02-06 09:26:20 +01:00
Roeland Jago Douma 814ca88398 When a user is removed we should remove the right shares
* This means all the shares directly shared with them
* Or all group shares having a special share with them

This patch fixes the operator precedece (AND before OR).
So before this patch:

(share_with = <deleted user> AND share_type = 0) OR share_type=2

So it deleted all user specific shares

Now:
share_with = <deleted user> AND (share_type = 0 OR (share_type=2)
2016-02-05 20:07:26 +01:00
Lukas Reschke decd956683 Merge pull request #22147 from owncloud/stable8.2-backport-22146
[stable8.2] Allow to delete the email address in user management
2016-02-05 16:21:29 +01:00
Morris Jobke bca6c78d24 Allow to delete the email address in user management 2016-02-05 10:31:03 +01:00
Roeland Douma 4e10c8b8f6 Merge pull request #22087 from RealRancor/RealRancor-patch-2
Backport #22086 to stable8.2
2016-02-03 13:21:44 +01:00
RealRancor 2843ced28b Backport #22086 to stable8.2 2016-02-03 09:42:43 +01:00
Thomas Müller 2b9fcac462 Merge pull request #22047 from owncloud/stable8.2-backport-21953
[stable8.2] Make enable_avatars setting more robust
2016-02-01 16:16:53 +01:00
Thomas Müller 0fd92a2851 Merge pull request #22006 from owncloud/backport-21987-background-job-get-all
[8.2] Do not create a loop that generates thousands of jobs
2016-02-01 14:16:45 +01:00
Morris Jobke 85692194d5 Make enable_avatars setting more robust
* handles the setting in the same way everywhere
* fixes #21949
2016-02-01 14:13:41 +01:00
Morris Jobke 7f327ab5ab [user_ldap] properly decode cached objects
* fixes #21896
2016-02-01 09:50:26 +01:00
Joas Schilling e6780b164f Remove other broken usages in deprecated methods 2016-01-29 10:10:38 +01:00
Joas Schilling 950ce22118 Deprecate the method and warn against using it
Conflicts:
	lib/private/backgroundjob/joblist.php
2016-01-29 10:10:16 +01:00
Joas Schilling 882b34b01e Do not create a loop that generates thousands of jobs
Conflicts:
	cron.php
2016-01-29 10:08:57 +01:00
Thomas Müller 3b40e85c42 Merge pull request #21938 from owncloud/stable8.2_sabre_2_1_9
[Stable8.2] Bump sabre/dav 2 1 9
2016-01-29 07:43:03 +01:00
Roeland Jago Douma 4390526c27 Bump sabre/dav to 2.1.9 2016-01-28 20:44:24 +01:00
Morris Jobke fb943f0c8a Merge pull request #21863 from owncloud/sync-certificates-with-upstream-82
[stable8.2] Sync certificates with upstream
2016-01-25 08:23:43 +01:00
Lukas Reschke e6fd925650 Sync certificates with upstream 2016-01-22 22:11:18 +01:00
Vincent Petry 19b8359600 Merge pull request #21799 from owncloud/stable8.2-backport-21705
[stable8.2] improve background job error message
2016-01-22 14:43:02 +01:00
Thomas Müller 22bba7c46a Add message key to context of logException 2016-01-20 11:06:34 +01:00
Morris Jobke c27dee56ac use logException() to properly log the exception 2016-01-20 11:06:27 +01:00
Morris Jobke 67fb58b4ee Improved error message for failing background job 2016-01-20 11:06:18 +01:00
Morris Jobke 821663e397 Merge pull request #21747 from owncloud/stable8.2-backport-20927
[stable8.2] Handle return code of streamCopy in WebDAV put
2016-01-19 00:30:23 +01:00
Morris Jobke bb3d257eef Handle return code of streamCopy in WebDAV put
* throw a different exception if streamCopy failed
2016-01-16 11:29:19 +01:00
Thomas Müller 66f1ca36fc Merge pull request #21693 from owncloud/stable8.2-users-scrolltop
[stable8.2] Keep scroll position in users page when sorting
2016-01-15 13:19:03 +01:00
Vincent Petry 2a9a1b8a4d Keep scroll position in users page when sorting
When sorting, some browsers like Chrome will lose the scroll position,
possibly because the sorting code is touching the DOM elements.

This fix saves the scroll position before sorting and sets it back
afterwards.
2016-01-13 15:37:10 +01:00
Vincent Petry f56e05fde0 Merge pull request #21666 from owncloud/smb-statcache-cap-82
[8.2] cap the number of entries we cache in smb's statcache
2016-01-13 10:41:49 +01:00
Robin Appelman aa51fe1095 cap the number of entries we cache in smb's statcache 2016-01-12 18:12:27 +01:00
Morris Jobke 47a1fbe248 Merge pull request #21631 from owncloud/backport-17924-stable8.2
[backport] [stable8.2] always use an LDAP URL when connecting to LDAP
2016-01-12 10:33:13 +01:00
Arthur Schiwon a0760ca489 always use an LDAP URL when connecting to LDAP 2016-01-11 21:31:33 +01:00
Morris Jobke 458a90c5a1 Merge pull request #21614 from owncloud/fix_21598_8.2
[stable8.2] fix public link sharing if the master key is enabled
2016-01-11 15:35:46 +01:00
Björn Schießle 640f12706f only use master key ID if a user is logged in. Otherwise keep the public link share key 2016-01-11 13:53:07 +01:00
Morris Jobke d97aba0ca5 Merge pull request #21611 from owncloud/stable8.2-users-dropdownscroll
[stable8.2] Fix users list dropdown position after scroll
2016-01-11 13:47:31 +01:00
Vincent Petry f9980de6fc Fix users list dropdown position after scroll
When scrolling, the position calculation of the multiselect dropdown was
wrong. Adding "position: relative" to the list container makes the
button calculation relative to it instead of the whole page. In this
case the dropdown is properly aligned with the field regardless of
scrolling.
2016-01-11 12:47:25 +01:00
Morris Jobke d32f5c1280 Merge pull request #21565 from owncloud/ext-smb-dep-stable8.2
[stable8.2] Check libsmbclient-php as well as smbclient binary
2016-01-11 11:36:14 +01:00
Vincent Petry a047983ebb Merge pull request #21585 from owncloud/bakport-21575
[stable8.2] Use ISession::clear
2016-01-11 11:24:52 +01:00
Vincent Petry 693067e6cf Merge pull request #21603 from owncloud/backport-21548-correctly-display-notify-option-for-shares
[8.2] Check the correct config for displaying the "notify by email" option
2016-01-11 11:22:05 +01:00
Joas Schilling ea5b7585f9 Check the correct config for displaying the "notify by email" option
Conflicts:
	core/js/tests/specs/sharedialogshareelistview.js
2016-01-11 10:08:46 +01:00
Lukas Reschke ba66805ece Use ISession::clear
The native approach using the PHP calls will not work properly with the cryptowrapper and thus this code is effectively doing nothing at the moment.
2016-01-10 16:50:31 +01:00
Robin McCorkell d948687caa Check libsmbclient-php as well as smbclient binary 2016-01-09 09:19:39 +00:00
Thomas Müller dce584e7f3 Merge pull request #21539 from endocode/kayrus/cookies_auth_fix
[stable8.2] Fixed double file upload on failed auth using WebDAV
2016-01-08 20:09:27 +01:00
Thomas Müller f4a7991562 Merge pull request #21118 from owncloud/makeurltypeconfigurable
[stable8.2] make swift url type configurable
2016-01-08 13:46:01 +01:00
kayrus 9e5bb2b241 Fixed double file upload on failed auth using WebDAV
Backport of this fix: https://github.com/owncloud/core/pull/21491
  Fixes https://github.com/owncloud/core/issues/21486
2016-01-08 11:54:16 +01:00
Jörn Friedrich Dreyer 18379cd1f6 add isset for optional params 2016-01-07 09:46:53 +01:00
Morris Jobke 5e76f5e020 Merge pull request #21265 from owncloud/backport20996-remove-password-reset
Backport 20996 remove password reset
2016-01-05 10:08:51 +01:00
Joas Schilling 3b59de7e33 Fix missing import of IUser 2016-01-05 09:47:23 +01:00
Thomas Müller c74fe461b2 Merge pull request #21441 from owncloud/fix-dutch-typo
Fix the markup for the dutch translation
2016-01-04 14:58:18 +01:00
Morris Jobke f450603fdd Merge pull request #21439 from owncloud/backport-21289-retain-background-jobs
[8.2] Do not delete background jobs, in case an exception occured
2016-01-04 14:47:55 +01:00
Joas Schilling 9a4dd056c4 Fix the markup for the dutch translation 2016-01-04 14:13:09 +01:00
Joas Schilling b995862723 Fix the test to expect the new behaviour 2016-01-04 13:29:03 +01:00
Joas Schilling fa206d550f Do not delete background jobs, in case an exception occured
This approach is not valid anymore. It initially was added for jobs
of non existing apps. But jobs of non-existing apps can not be created
so they will never be executed and so this call just catches other
cases which were not intended.

This reverts commit 4f4ad72460.
2016-01-04 13:28:32 +01:00
Thomas Müller 4e3ace33d1 Merge pull request #21391 from owncloud/stable8.2-backport-undefined-user-agent
[stable8.2] Fix undefined HTTP_USER_AGENT
2015-12-29 17:20:31 +01:00
Thomas Müller 8e205c6854 Fix undefined HTTP_USER_AGENT 2015-12-29 11:45:34 +01:00
Vincent Petry 6b9b12e0c0 Merge pull request #21262 from owncloud/backport-21260-stable8.2
[backport] [stable8.2] initialize l10n instance earlier, fixes an undefined var warning foll…
2015-12-24 15:55:10 +01:00
Vincent Petry 6707df6470 Merge pull request #21313 from owncloud/scanner-skip-not-available-82
[8.2] Skip unavailable storages in scanner
2015-12-24 15:50:02 +01:00
Roeland Douma e9036a0cad Merge pull request #21295 from owncloud/backport-21255-stable8.2
user management: show password error temporary (backport for stable8.2)
2015-12-23 08:25:46 +01:00
Thomas Müller fad03d639e Merge pull request #21341 from owncloud/fix-unit-tests-stable8.1
[stable8.2] Fix unit tests
2015-12-23 07:09:40 +01:00
Lukas Reschke fa1a9a5cc6 Fix unit tests 2015-12-22 21:26:02 +01:00
Morris Jobke c4964f710b Merge pull request #21261 from owncloud/stable8.2-backport-21244
[stable8.2] enforce_home_folder_naming_rule cannot be configured in config.php
2015-12-22 19:14:28 +01:00
Morris Jobke f628c21f08 Merge pull request #21274 from owncloud/stable82_20884
[Stable 8.2] [Sharing] Respect disabled incoming federated shares
2015-12-22 19:13:49 +01:00
Morris Jobke e51da34aa9 Merge pull request #21234 from owncloud/stable8.2-backport-21232
[stable8.2] Use name of ICollection for exception message
2015-12-22 19:11:37 +01:00
Robin Appelman 369ec64709 also log exception 2015-12-21 16:21:18 +01:00
Robin Appelman 188857c691 Skip unavailable storages in scanner 2015-12-21 16:21:13 +01:00
C Montero-Luque d60d903e75 8.2.2 2015-12-21 07:22:04 -05:00
C Montero-Luque 6a7399808f 8.2.2 RC2 2015-12-18 17:30:17 -05:00
michag86 1a6e3e8b08 Update users.js 2015-12-18 17:04:36 +01:00
Roeland Jago Douma b720c9616d [Sharing] Respect disabled incoming federated shares
Only fetch the incoming federated shares if incoming shares are actually
enabled.

Fixes #20713
2015-12-18 09:11:00 +01:00
Robin Appelman f85ee56a01 Check if user isset in $_REQUEST first 2015-12-17 16:37:48 +01:00
Joas Schilling 04c2247b0d Allow specifying a custom reset-password-url
Conflicts:
	core/js/config.php
2015-12-17 16:35:46 +01:00
Joas Schilling 5fe8f5a254 Remove password reset when the user can not change the password 2015-12-17 16:33:38 +01:00
Arthur Schiwon 6c5c14fc69 initialize l10n instance earlier, fixes an undefined var warning followed by a php error 2015-12-17 15:48:45 +01:00
blizzz 8dc74d9b52 enforce_home_folder_naming_rule cannot be configured in config.php 2015-12-17 15:43:44 +01:00
Morris Jobke 6e3648cc2f add unit test for #21230 2015-12-16 16:16:35 +01:00
Morris Jobke e66e33f12c Use name of ICollection for exception message
* fixes #21230
2015-12-16 16:16:27 +01:00
C Montero-Luque f152228f4c 8.2.2 RC1 2015-12-15 16:05:32 -05:00
Vincent Petry 346d8452c8 Merge pull request #21197 from owncloud/backport-21133-stable8.2
[backport] [stable8.2] Fix shared files of deleted users, detect DN change when checking for existence on LDAP
2015-12-15 18:42:13 +01:00
Vincent Petry 36701a2865 Merge pull request #21211 from owncloud/stable8.2-handle-enforce-home-folder-rule-setting
[stable8.2] properly preserve home folder naming enforcement setting
2015-12-15 18:42:00 +01:00
Thomas Müller 9154c5d8f4 Merge pull request #21198 from owncloud/fix_20296_8.2
[stable8.2] don't allow to create a federated share if source and target are the same
2015-12-15 13:17:46 +01:00
Morris Jobke 5ac6cacd90 properly preserve home folder naming enforcement setting 2015-12-15 10:23:50 +01:00
Arthur Schiwon 780b97d7b1 throw NoUserException in getHome when the requested user does not exist anymore
look for DN changes before marking a user as deleted
2015-12-14 22:46:54 +01:00
Vincent Petry 3fc5039054 Fixed JS unit tests for fed owner display name 2015-12-14 18:12:09 +01:00
Björn Schießle c21e055c36 show display name but internally use the user name 2015-12-14 17:35:10 +01:00
Björn Schießle 171062fed3 don't allow to create a federated share if source and target server are the same 2015-12-14 17:30:50 +01:00
Morris Jobke 486fdcb34f Merge pull request #21152 from owncloud/backport-20978-stable8.2
reset mailadress/displayname on blur (backport for stable8.2)
2015-12-14 17:30:04 +01:00
Lukas Reschke c3c642740f Merge pull request #21194 from owncloud/preview-non-existing-82
[8.2] Handle non existing files in version previews
2015-12-14 17:23:14 +01:00
Robin Appelman b7c217290f Handle non existing files in version previews 2015-12-14 16:07:31 +01:00
Vincent Petry c47f214cf3 Merge pull request #21182 from owncloud/stable8.2-share-allowdeleteinshareoverview
[stable8.2] Bring back delete permission in share overview
2015-12-14 13:58:23 +01:00
Vincent Petry 709f9231e9 Bring back delete permission in share overview 2015-12-14 10:55:28 +01:00
Thomas Müller a042ffafac Merge pull request #21157 from owncloud/trashbin-loggedout-82
[8.2] Fix trashbin wrapper when no user is loggedin
2015-12-14 10:26:42 +01:00
Lukas Reschke cccf4b6073 Use XMLWriter to generate response
Gets rid of manual XML generation.
2015-12-14 09:40:07 +01:00
Morris Jobke cd4cc15ac9 Merge pull request #21154 from owncloud/stable8.2-files-deleteactiontext
[stable8.2] Stable8.2 files deleteactiontext
2015-12-11 16:09:45 +01:00
Robin Appelman 71f4877816 skip test if we cant use the filesystem when not logged in 2015-12-11 15:41:08 +01:00
Robin Appelman b0842228f0 Fix thrashbin wrapper when no user is loggedin 2015-12-11 15:41:03 +01:00
Vincent Petry 5da3d5616c Bring back file delete action text to be based on context
For received shares, the delete action becomes "Unshare" and for
personal mounts it becomes "Disconnect storage".

This also makes it possible from now on to pass a function to a file
action's "displayName" attribute.
2015-12-11 15:20:11 +01:00
michag86 8ec7faa26d reset mailadress/displayname on blur 2015-12-11 14:59:52 +01:00
Lukas Reschke 411e400705 Merge pull request #21127 from owncloud/stable8.2-backport-21119
[stable8.2] Make AppManager->checkAppForUser more robust
2015-12-11 14:01:27 +01:00
Thomas Müller 19d15938e3 Merge pull request #21046 from owncloud/stable8.2-catchexceptionindirectdownloadurl
[stable8.2] Catch exception when querying direct download link
2015-12-11 10:49:42 +01:00
Roeland Douma 30b54d3853 Merge pull request #21115 from owncloud/stable8.2-backport-21109
[stable8.2] Deduplicate version expire jobs
2015-12-10 21:14:34 +01:00
Morris Jobke 7748faf362 Merge pull request #21113 from owncloud/memcache-lock-ttl-82
[8.2] Add ttl for redis based locking
2015-12-10 18:58:26 +01:00
Vincent Petry acc2291f9e Merge pull request #21124 from owncloud/remove-db-locking-performance-warning-stable8.2
Remove info about database locking performance
2015-12-10 18:10:59 +01:00
Morris Jobke 6cdf398a41 Make AppManager->checkAppForUser more robust
* if the JSON that is stored in the DB is corrupt an error was thrown
* with this change it is properly handled and the app is disabled
2015-12-10 16:58:16 +01:00
Thomas Müller 066db75c14 Remove info about database locking performance 2015-12-10 16:12:54 +01:00
Jörn Friedrich Dreyer b314da9a25 make url type configurable 2015-12-10 14:37:53 +01:00
Vincent Petry a83b3dd736 Merge pull request #21090 from owncloud/backport-20995-stable8.2
[backport] [stable8.2] ensure multiselect always receives an array when setting its value, f…
2015-12-10 14:31:42 +01:00
Morris Jobke 049f7f9af1 Merge pull request #21101 from owncloud/stable8.2_20989
[Stable 8.2] Update parent when moving share into recieved share
2015-12-10 13:57:17 +01:00
Vincent Petry a96cf5d01c Merge pull request #21112 from owncloud/db-lock-ttl-82
[8.2] Remove all locks after ttl from the db
2015-12-10 13:52:23 +01:00
Vincent Petry f829ddfea5 Merge pull request #21100 from owncloud/stable8.2_21005
[Stable 8.2] The ajax code path unshares a link share when updating the password
2015-12-10 13:46:27 +01:00
Morris Jobke 6890933e4a Deduplicate version expire jobs
* versionSize is calculated anyway in the expire job - > dropped
* offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation
* fixes #21108
2015-12-10 13:42:26 +01:00
Robin Appelman 5ea5d7fa52 ttl for memcache locking backends that support it 2015-12-10 13:07:27 +01:00
Robin Appelman e15792a6aa Add interface for memcache backends that support setting ttl on exisiting keys 2015-12-10 13:07:18 +01:00
Robin Appelman b2eecfb946 Remove all locks after ttl from the db 2015-12-10 13:04:39 +01:00
Vincent Petry c02381243c Merge pull request #21044 from owncloud/group-propagation-82
[8.2] Group share etag propagation
2015-12-10 11:24:34 +01:00
Roeland Douma e1809dbaf6 Merge pull request #21099 from owncloud/stable8.2_20949
[Stable 8.2] [Sharing] Properly check if a group already has access
2015-12-10 11:22:48 +01:00
Thomas Müller ab6a34b0e2 Merge pull request #20985 from owncloud/fix-mysql-setup-unix-socket-stable8.2
Add unix_socket support for mysql during initial installation - fixes…
2015-12-10 10:14:32 +01:00
Roeland Douma 96bb4672c3 Merge pull request #21080 from owncloud/stable8.2-share-computesharepermissions-notstore
[stable8.2] Fix (re)share permission checks in a few code paths
2015-12-10 09:09:18 +01:00
Roeland Jago Douma 0dae2b8296 Update parent when moving share into recieved share
Fixes #20769

When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.
2015-12-10 08:16:58 +01:00
Roeland Jago Douma 59c27e0fb4 The ajax code path unshares a link share when updating the password
In order to not mess up existing shares if the password gets verified we
should first fire this validation.
2015-12-10 08:10:16 +01:00
Roeland Jago Douma 3bdca9beb4 [Sharing] Properly check if a group already has access
The old code check was to liberal resulting in wrong matches if a user
with the same name as the group already had access.

Fixes 20892
2015-12-10 08:04:10 +01:00
Arthur Schiwon eba656c748 ensure multiselect always receives an array when setting its value, fixes #18734 2015-12-09 20:07:38 +01:00
Vincent Petry fc0e6f2b11 Merge pull request #21069 from owncloud/personal-mount-mountid-82
[8.2] Dont set the string storage id to the numeric storage id for personal mounts
2015-12-09 20:03:52 +01:00
Vincent Petry 9bc3a9cddd Merge pull request #21084 from owncloud/occ-shall-not-fail-hard-in-maintenance-mode-stable8.2
Don't load commands of apps when in maintenance mode
2015-12-09 19:57:09 +01:00
Vincent Petry 565d7b2b12 Catch exception when querying direct download link 2015-12-09 18:01:28 +01:00
Thomas Müller 5755d16b6e Don't load commands of apps when in maintenance mode - fixes #20939 2015-12-09 16:38:52 +01:00
Vincent Petry da83c854f0 Add explicit check for groups excluded from sharing
Since isSharable() doesn't do the check for groups excluded from
sharing, adding an explicit check in the sharing code.
2015-12-09 15:47:32 +01:00
Vincent Petry 6004eb5edf Fix more unit tests to pass a mock storage instead of null to FileInfo 2015-12-09 15:47:24 +01:00
Vincent Petry edffde2f28 Add reshare permission checks
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
2015-12-09 15:46:00 +01:00
Vincent Petry fccafd915b Compute share permissions in the view
The share permissions are now computed in the View/FileInfo instead of
storing them directly/permanently on the storage
2015-12-09 15:45:05 +01:00
Robin Appelman 63a2e36816 fix etag propagation with group reshares 2015-12-09 13:35:31 +01:00
Robin Appelman f72db4ea07 Add test case for group share propagation 2015-12-09 13:13:56 +01:00
Robin Appelman 163d92109b Add tests 2015-12-09 12:24:11 +01:00
Robin Appelman b5a7408193 Dont set the string storage id to the numeric storage id for personal mounts 2015-12-09 12:24:07 +01:00
Morris Jobke a581b8b20f Merge pull request #21041 from owncloud/backport-21037-stable8.2
[backport][stable8.2] passing an empty base in this diagnosis call will not result  in LDAP…
2015-12-08 18:01:45 +01:00
Arthur Schiwon c1b2d2549c passing an empty base in this diagnosis call will not result in LDAP errors
Neither in "Invalid DN syntax" nor in "Object not found"
2015-12-08 15:03:26 +01:00
Thomas Müller ff638bd331 Merge pull request #21024 from owncloud/stable8.2-share-unsharelinkpapercut
[stable8.2] Fix unshare link click element
2015-12-08 13:50:52 +01:00
Vincent Petry e84c58a13f Fix unshare link click element
When clicking on the unshare link (trash icon), the correct link element
needs to be used instead of whatever child was clicked. Then, that
element might contain a visible loading icon.

This fixes the spinner detection and also prevents a full page reload in
case the spinner was visible.
2015-12-08 08:44:02 +01:00
Morris Jobke 21adfe77d2 Merge pull request #21012 from owncloud/stable8.2-share-forbidlinkshare-duplicatefield
[stable8.2] Fix duplicate bogus share field when link sharing is not allowed
2015-12-08 00:21:19 +01:00
Vincent Petry 66f11f461f Fix duplicate bogus share field when link sharing is not allowed
Whenever link share is not allowed, it was outputting a bogus sharing
field which name would conflict with the regular sharing field.

This fix makes sure that the bogus sharing field with "Resharing not
allowed" message only appears when triggered by removed share
permissions.
2015-12-07 17:32:24 +01:00
Vincent Petry 7b2d3a933c Merge pull request #21007 from owncloud/backport-20993-stop-overwriting-language
[8.2] Do not overwrite the language when it's just missing for one app
2015-12-07 17:08:18 +01:00
Joas Schilling a091b3f588 Do not overwrite the language when it's just missing for one app 2015-12-07 16:52:32 +01:00
Morris Jobke e1bb567a8c Merge pull request #20997 from owncloud/backport-20981-multiple-emails-for-sharelink
[8.2] Allow sending a share email to multiple users
2015-12-07 16:26:04 +01:00
Joas Schilling 3cd0770e32 Add a unit test for single user case as well 2015-12-07 15:46:54 +01:00
Joas Schilling 96be3a4a7d Allow sending a share email to multiple users 2015-12-07 15:46:46 +01:00
Thomas Müller ac3c323144 Add unix_socket support for mysql during initial installation - fixes #20210 2015-12-07 12:01:40 +01:00
Vincent Petry 16c057e076 Merge pull request #20955 from owncloud/stable8.2-backport-20877
[stable8.2] Check the expiration date for null
2015-12-04 16:47:56 +01:00
Morris Jobke 9aff749ea5 Check the expiration date for null
* null is always less than any value -> expirationDate gets null
  which is "no date set"
* ref https://github.com/owncloud/core/issues/20590#issuecomment-158393075
2015-12-04 14:58:11 +01:00
Lukas Reschke 5ad07552b6 Merge pull request #20915 from owncloud/backport-20900-invalid-sharee
[8.2] Only return the exact match for sharees when it's allowed
2015-12-03 12:02:22 +01:00
Joas Schilling 1d6d756f73 Only return the exact match, when it's allowed 2015-12-03 10:11:00 +01:00
Morris Jobke 06428bb75f Merge pull request #20869 from owncloud/backport-l10n-for-20842
[stable8.2] update germand translation to fit into the UI
2015-12-01 14:37:08 +01:00
Morris Jobke 676ae6d87b update germand translation to fit into the UI 2015-12-01 13:49:10 +01:00
Thomas Müller 152952be68 Merge pull request #20488 from owncloud/backport-20487-8.2
[8.2] Activity oracle sql error for favorites
2015-12-01 09:38:01 +01:00
Thomas Müller 741392b8a8 Merge pull request #20846 from owncloud/stable8.2-backport-20843
[stable8.2] Fix the width of the share with input
2015-11-30 22:46:53 +01:00
Morris Jobke 42f2ae6326 Fix the width of the share with input
* the ID of this has changed to #shareWith-viewNUMBER and shouldn't
  be used in CSS
* now uses the proper classes
2015-11-30 17:38:31 +01:00
Morris Jobke 506dbdfca5 Merge pull request #20794 from owncloud/stable8.2-backport-20790
[stable8.2] Deduplicate queued trashbin expire jobs
2015-11-30 15:59:52 +01:00
Morris Jobke 5275a71c40 Merge pull request #20830 from owncloud/catch-missing-route-82
[8.2] Dont die when we're missing a route
2015-11-30 14:28:21 +01:00
Robin Appelman c9ac47a593 Dont die when we're missing a route 2015-11-30 14:10:00 +01:00
Morris Jobke 36d9328afc Deduplicate queued trashbin expire jobs
* fixes #20425
* this removes the argument trashbin size from the expire job - it is now
  calculated in the expire job
* the queue now detects properly that the job is already queue and doesn't
  add it again
2015-11-27 14:43:08 +01:00
Vincent Petry dde7c8b8fc Merge pull request #20761 from owncloud/scan-eventsource-no-paths-82
[8.2] Dont output paths in scan.php
2015-11-26 16:39:47 +01:00
Robin Appelman 703b6d1803 Dont output paths in scan.php 2015-11-26 16:32:33 +01:00
Vincent Petry 73b8518f2f Merge pull request #20457 from owncloud/backport-checkbox-accessibility
Backport: Make new checkbox style accessible for screenreaders
2015-11-25 16:39:17 +01:00
Vincent Petry 30518ec1be Merge pull request #20535 from owncloud/stable8.2-fakelocking-for-mac
[stable8.2] Add fake locker plugin
2015-11-25 16:32:26 +01:00
Morris Jobke 76dde0f1e6 Merge pull request #20690 from owncloud/stable8.2-redis-password
[stable8.2] Add support for Redis password auth
2015-11-24 00:03:27 +01:00
Lukas Reschke a57f153ad7 Add support for Redis password auth
For enhanced security it is recommended to configure Redis to only accept connections with a password. (http://redis.io/topics/security)

This is especially critical since Redis supports the LUA scripting language and thus a simple SSRF vulnerability (as proven in http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/ for example) may lead to a remote code execution.
2015-11-23 17:14:39 +01:00
Morris Jobke b2d9a3a08d Merge pull request #20677 from owncloud/backport-joblist-fix
[8.2] Make the JobList test more robust by sorting the result of getAll bef…
2015-11-23 11:39:10 +01:00
Joas Schilling 92b1c865d3 Make the JobList test more robust by sorting the result of getAll before comparison 2015-11-23 10:43:26 +01:00
Morris Jobke d4ab933e61 Merge pull request #20596 from owncloud/stable8.2-backport-use-proper-variable
[stable8.2] Use proper variable
2015-11-19 09:43:55 +01:00
Lukas Reschke 900b646447 Use proper variable
`$shares` is not defined. Introduced with https://github.com/owncloud/core/commit/c3e7d324c5e61eb087fb2ea5102d332f9f08db3d and thus also in stable8.2
2015-11-18 22:55:48 +01:00
Joas Schilling 61dbfb996f Add a unit test that executes the query 2015-11-18 10:37:23 +01:00
Joas Schilling e3434fecfe Oracle can not return statements but only values
So evaluate the condition directly and return 1 or 0
2015-11-18 10:36:50 +01:00
C Montero-Luque 8f71705c2e 8.2.1 2015-11-17 11:27:51 -05:00
C Montero-Luque 64a6bfd2b5 8.2.1 RC4 2015-11-17 06:16:17 -05:00
Thomas Müller d68d41f3c6 Merge pull request #20542 from owncloud/password_policy-is-not-experimantal-stable8.2
password_policy is a shipped app
2015-11-16 16:51:01 +01:00
Thomas Müller 22d43d0d82 password_policy is a shipped app 2015-11-16 16:38:00 +01:00
Lukas Reschke 5641e4c103 [stable8.2] Add fake locker plugin 2015-11-16 15:03:59 +01:00
C Montero-Luque 583dd64458 8.2.1 RC3 (previous commit incorrect) 2015-11-13 14:48:08 +01:00
C Montero-Luque 00d6bdc86d 8.2.1 2015-11-13 14:42:22 +01:00
Hendrik Leppelsack c8cb8f5bbd make new checkbox style accessible for screenreaders 2015-11-11 15:09:36 +01:00
C Montero-Luque d7aadcb5df 8.2.1 RC2 2015-11-10 22:54:28 +01:00
C. Montero Luque 3447381186 Merge pull request #20446 from owncloud/backport-20093+20124-stable8.2
[stable8.2] [Backport] of #20093 and #20124
2015-11-10 18:54:37 +01:00
Vincent Petry febfa83e5f Merge pull request #20443 from owncloud/stable8.2-set-ie-class-for-ie10plus
[stable8.2] Set "ie" CSS class for IE10, IE11
2015-11-10 17:45:03 +01:00
Arthur Schiwon 17219162de Backport of #20093 and #20124
#20093 LDAP fix quota and case
 #20124 remove uselessly used parameter, read all user attributes also when looking up users in groups

fix update quota with known value

fix attribute casing to ensure array keys work

remove uselessly used parameter, read all user attributes also when looking up users in groups
2015-11-10 17:34:07 +01:00
Vincent Petry 0c813ce231 Set "ie" CSS class for IE10, IE11
Fixed border in file action menu
2015-11-10 17:06:24 +01:00
Morris Jobke c4154e5374 Merge pull request #20440 from owncloud/stable8.2-checkbox
use new checkbox style for Apps mgmt settings
2015-11-10 16:32:40 +01:00
Vincent Petry 7b0c27fcc4 Merge pull request #20432 from owncloud/cache-escape-like-82
[8.2] Escape like parameter in cache operations
2015-11-10 16:30:09 +01:00
Morris Jobke 2f03557290 Merge pull request #20441 from owncloud/stable8.2-font-style
[stable8.2] move font back from Light to Regular for body text on normal-res screens, fix #18954
2015-11-10 16:27:51 +01:00
Jan-Christoph Borchardt 0d03452822 move font back from Light to Regular for body text on normal-res screens, fix #18954 2015-11-10 16:20:37 +01:00
Jan-Christoph Borchardt 824205f860 use new checkbox style for Apps mgmt settings 2015-11-10 16:17:54 +01:00
Morris Jobke 4fcad83a06 Merge pull request #20308 from owncloud/stable8.2-backport-use-actual-mimetype-detection-instead-of-oath
[stable8.2] Use actual mimetype detection instead of extension
2015-11-10 15:55:58 +01:00
Robin Appelman 0b9b91fc60 escape like parameter in cache move 2015-11-10 13:14:32 +01:00
Robin Appelman 0c2dc0158f Add test for special character during move 2015-11-10 13:10:01 +01:00
Robin Appelman e3c52022a8 define escape character for like statements on oracle 2015-11-10 13:09:54 +01:00
Robin Appelman 6b53de48dc define escape character for like statements on sqlite 2015-11-10 13:09:47 +01:00
Vincent Petry be4d758981 Merge pull request #20392 from owncloud/storage_not_available_8.2
[stable8.2] use a HintException to have some useful user output in case of an error
2015-11-10 11:54:10 +01:00
Vincent Petry eaad2d2c5b Merge pull request #20411 from owncloud/stable8.2-20383
[stable8.2] Properly detect setup check messages set in the HTML template
2015-11-10 11:52:11 +01:00
Björn Schießle 94d483caf8 use a HintException to have some useful user output in case of an error 2015-11-10 10:55:18 +01:00
Morris Jobke cd393d9275 Merge pull request #20417 from owncloud/stable82_20403_backport
[Stable8.2] Fix Error message when sharing outside of group
2015-11-10 09:16:32 +01:00
Vincent Petry abb6026e24 Merge pull request #20410 from owncloud/backport-20333-stable8.2
[backport][stable8.2] make all the buttons beautiful
2015-11-10 08:51:32 +01:00
Roeland Jago Douma 5a50445bd5 Fix Error message when sharing outside of group
For #19788
2015-11-10 08:13:33 +01:00
Robin McCorkell db3209a4d9 Properly detect setup check messages set in the HTML template 2015-11-09 17:26:11 +00:00
Arthur Schiwon a354b07773 make all the buttons beautiful 2015-11-09 18:19:07 +01:00
Vincent Petry 3a754b68c7 Merge pull request #20328 from owncloud/stable8.2-users-fixeveryonecount
[stable8.2] Fix everyone count for subadmins
2015-11-09 13:23:09 +01:00
Vincent Petry 4ab6452679 Merge pull request #20361 from owncloud/stable8.2-extstorage-gdrive-forceapproval
[stable8.2] Force approval in GDrive oauth to get refresh_token
2015-11-09 13:00:00 +01:00
Vincent Petry 0110fe001d Merge pull request #20387 from owncloud/backport-20348-integer-group-names
Make sure that group names are strings not integers
2015-11-09 11:11:11 +01:00
Vincent Petry 1095d22e48 Merge pull request #20326 from owncloud/getfileinfo-locking82
[8.2] Don't lock if we're only reading cache metadata
2015-11-09 10:55:53 +01:00
Vincent Petry 070e874fe1 Merge pull request #20331 from owncloud/fix_20234_8.2
[stable8.2] make sure that we update the unencrypted size for the versions
2015-11-09 09:57:09 +01:00
Joas Schilling ad64a24081 Make sure that group names are strings not integers 2015-11-09 09:51:06 +01:00
Morris Jobke 71b18939dc Merge pull request #20357 from owncloud/backport-20271-stable8.2
[Backport] [stable8.2] attempt to connect to backup server again
2015-11-06 15:14:40 +01:00
Thomas Müller 279bdc574e Merge pull request #20366 from owncloud/stable8.2-backport-20346
[stable8.2] Show the language code in personal settings for unknown languages
2015-11-06 14:51:35 +01:00
Thomas Müller dfecc6eb0f Merge pull request #20364 from owncloud/stable8.2-backport-20359
Mark files_drop as shipped
2015-11-06 14:14:20 +01:00
Morris Jobke 774d9b7643 Show the language code in personal settings for unknown languages
Steps to reproduce:
* having an unknown language set in oc_preferences
* browse the personal settings
* only get listed the first letter of this language in the language chooser
2015-11-06 13:41:18 +01:00
Lukas Reschke 5424e00e4b Mark files_drop as shipped
Fixes https://github.com/owncloud/enterprise/issues/895
2015-11-06 13:38:48 +01:00
Vincent Petry 2f99ee4fe5 Force approval in GDrive oauth to get refresh_token
Forcing the approval of app permissions makes sure that the GDrive API
will always return a refresh_token.

In the case of apps that were already authorized for the current user/domain,
the API doesn't return the refresh_token which causes expiration issues.
2015-11-06 12:47:47 +01:00
Arthur Schiwon 7b76c7788f integration tests 2015-11-06 12:25:37 +01:00
Arthur Schiwon 86289d70f4 LDAP: attempt to connect to backup server again, if main server is not available. Fixes #18701 2015-11-06 12:25:30 +01:00
Morris Jobke 8cea444f4e Merge pull request #20344 from owncloud/backport-20215
[8.2] Close user menu when clicking on other menus
2015-11-06 09:09:16 +01:00
Joas Schilling b08861c603 Use the normal OC.menu JS for handling the Settings menu 2015-11-06 08:42:37 +01:00
Joas Schilling d732a7b32f Close the user menu when clicking it again 2015-11-06 08:39:46 +01:00
Morris Jobke 9f550fa33d Merge pull request #20337 from owncloud/stable8.2-error-button-color
fix button text color
2015-11-05 22:53:59 +01:00
Morris Jobke 3de6e3fbc8 Merge pull request #20338 from owncloud/l10n-8.2-backport
Backport translations for 8.2
2015-11-05 20:35:10 +01:00
Vincent Petry a68fbcfa53 Merge pull request #20245 from owncloud/backport-20192-stable8.2
[backport] [stable8.2] if a user that is flag as deleted shows up again, remove that flag. F…
2015-11-05 17:26:11 +01:00
Joas Schilling b688de07f8 Backport translations for 8.2 2015-11-05 16:31:50 +01:00
Jan-Christoph Borchardt da99c8f456 fix button text color 2015-11-05 16:10:23 +01:00
Morris Jobke 75858264ba Merge pull request #20324 from owncloud/stable8.2-backport-20301
[stable8.2] [files_external] fix empty user mounts setting
2015-11-05 13:15:50 +01:00
Björn Schießle 6d6e5c1b37 make sure that we update the unencrypted size for the versions 2015-11-05 13:12:24 +01:00
Vincent Petry e5035494a7 Fix everyone count for subadmins
Also moved the logic to the UsersController

Backport of 781bca2437 from master,
adjusted to use the old SubadminFactory way
2015-11-05 12:35:10 +01:00
Robin Appelman 7fb5092a39 when a file is locked use old cache data 2015-11-05 12:04:09 +01:00
Robin Appelman 046c72c84a only lock in getDirectoryContent if we need to update the cache 2015-11-05 12:04:06 +01:00
Robin Appelman 7d9f190079 only lock in getFileInfo if we need to update the cache 2015-11-05 12:03:44 +01:00
Robin Appelman 6d711fbde2 Split checkUpdate 2015-11-05 12:03:40 +01:00
Morris Jobke 44ab8dde33 [files_external] fix empty user mounts setting
* fixes #19858
* if no backend is allowed to be mounted also the user mount setting should be disabled
2015-11-05 11:40:15 +01:00
Joas Schilling c89058bc49 Merge pull request #20159 from owncloud/cache-move-final-update-transaction-82
[8.2] Cache move final update transaction 82
2015-11-05 10:57:39 +01:00
Lukas Reschke 5814e636fb Use actual mimetype detection instead of extension
We cannot rely on the extension as the file may also be a valid TAR or ZIP file without such content. Especially when getting resources from the ownCloud appstore.
2015-11-04 17:58:25 +01:00
Morris Jobke ffb73fa012 Merge pull request #20297 from owncloud/backport-20155-8.2
[backport] [stable8.2] add port to host only, if an URL is used instead of a plain hostname
2015-11-04 15:26:57 +01:00
Arthur Schiwon c247ef87fa add port to host only, if an URL is used instead of a plain hostname 2015-11-04 12:37:39 +01:00
Morris Jobke 40bffcda3b Merge pull request #20221 from owncloud/files-filter-triger-once-82
[8.2] dont trigger the scroll event of every single item we filter in the file list
2015-11-04 11:32:46 +01:00
C Montero-Luque af1077637d fix in $OC_VersionString 2015-11-03 17:58:29 -05:00
C Montero-Luque abe65fd70f fix typo in $OV_Version 2015-11-03 17:50:26 -05:00
C Montero-Luque 304cf28f4a 8.2.1 RC1 2015-11-03 17:33:55 -05:00
Morris Jobke 6073704ace Merge pull request #20241 from owncloud/backport-20191-stable8.2
[backport] [stable8.2] add method to count users by loginname and use it for diagnose test, …
2015-11-03 08:45:29 +01:00
Vincent Petry bc1c247a13 Merge pull request #20240 from owncloud/backport-ldap-tooltip
Backport of "Add tooltip to ldap server wizard"
2015-11-03 07:54:02 +01:00
Arthur Schiwon eef80b0d30 if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 2015-11-02 22:20:28 +01:00
Hendrik Leppelsack 3a5ba033d5 add tooltip to ldap server wizard 2015-11-02 21:31:43 +01:00
Arthur Schiwon 6fd0734944 add method to count users by loginname and use it for diagnose test, fixes #20151 2015-11-02 21:26:00 +01:00
Robin Appelman 9a461d31e4 dont trigger the scroll event of every single item we filter in the file list 2015-11-02 13:14:44 +01:00
Raghu Nayyar ee05b1b6d6 Merge pull request #20187 from owncloud/stable8.2-login-arrow
Stable8.2: remove unneeded icons from input fields to not distract from submit button, fix #18940
2015-11-02 17:27:31 +05:30
Jan-Christoph Borchardt af7616743e remove unneeded icons from input fields to not distract from submit button, fix #18940 2015-10-30 16:43:47 +01:00
Thomas Müller 0cd61b01fd Merge pull request #20158 from owncloud/stable8.2-files-consolidateiconupdate
[stable8.2] Fix icon update to be more consistent
2015-10-29 23:49:27 +01:00
Robin Appelman fe0e567bbc include the final update in the transaction when moving a folder in the cache 2015-10-29 16:52:30 +01:00
Vincent Petry 1c370506e4 Fix icon update to be more consistent
Makes the details bar show the same icon as in the list.
2015-10-29 16:49:52 +01:00
Morris Jobke b61bb83680 Merge pull request #20154 from owncloud/backport-19871
[8.2] Backport 19871
2015-10-29 15:36:54 +01:00
Joas Schilling 01816a2ba2 Use the method 2015-10-29 15:13:36 +01:00
Joas Schilling 3f3bcbeb47 Add a repair step that checks for group membership on shares 2015-10-29 15:13:25 +01:00
Joas Schilling b71cf0b903 Remove shares where the parent does not exist anymore 2015-10-29 15:13:11 +01:00
Morris Jobke 07257762e2 Merge pull request #20138 from owncloud/LukasReschke-patch-3
[stable8.2] Update certificate bundle
2015-10-29 14:27:14 +01:00
Thomas Müller 5a177b42df Merge pull request #19991 from owncloud/stable8.2_3rdparty_sabre_2.1.7
[stable8.2] 3rdparty bump for full upgrade of sabre/dav-2.1.7
2015-10-29 10:43:37 +01:00
Lukas Reschke 24be4e5add [stable8.2] Update certificate bundle
Backport of #20126
2015-10-29 10:37:53 +01:00
Roeland Jago Douma efe8384f5c 3rdparty bump for full upgrade of sabre/dav-2.1.7 2015-10-29 09:26:15 +01:00
Thomas Müller 044db63190 Merge pull request #20104 from owncloud/stable8.2-backport-20097
[stable8.2] Revert "setting to skip migration tests by default"
2015-10-28 12:43:41 +01:00
Vincent Petry 5fc440b98a Merge pull request #20101 from owncloud/stable8.2-ie9-share-donotsendplaceholderaspassword
[stable8.2] [IE9] Don't send link share password placeholder
2015-10-28 12:41:19 +01:00
Morris Jobke 99b26d6916 Revert "setting to skip migration tests by default"
This reverts commit 7cbdd9b90b.
2015-10-28 09:51:17 +01:00
Vincent Petry ee1e7d9726 [IE9] Don't send link share password placeholder
When exiting the password field in the share dialog, IE9 would
mistakenly think that the password has changed and would send the
placeholder.

This fix prevents changing the password whenever the placeholder is set
as value.
2015-10-28 09:03:58 +01:00
Morris Jobke daf14861e4 Merge pull request #20091 from owncloud/backport-tipsy-body
Backport: append tipsys to body
2015-10-27 17:53:29 +01:00
Hendrik Leppelsack cbcdcda436 append tipsys to body 2015-10-27 16:49:52 +01:00
Joas Schilling 4e9e85816d Merge pull request #20077 from owncloud/stable8.2-20076
[Stable8.2] Verify the src exists in webdav MOVE
2015-10-27 13:28:22 +01:00
Roeland Jago Douma 997c307251 Verify the src exists in webdav MOVE
* Unit test added
2015-10-27 10:30:36 +01:00
Joas Schilling e627c7942e Merge pull request #20072 from owncloud/backport-apps-donotdisplaybrokenappiconininternetexplorer-stable8.2
Disable app icon preview in apps page for IE
2015-10-27 08:39:44 +01:00
Vincent Petry 54ad29c3ed Disable app icon preview in apps page for IE
All IE versions are not able to properly upscale SVG icons unless the
said SVG files contain a "viewBox" attribute, which is not always the
case. Also we cannot guarantee that all third party apps will have this
attribute in their icons.

So for now, app icons will not be displayed in IE instead of broken
ones.
2015-10-26 23:25:47 +01:00
Thomas Müller 7573ba9a4d Merge pull request #19976 from owncloud/db-keep-shared-locks-82
[8.2] Keep shared locks until the end of the request so we can reuse them
2015-10-26 17:14:15 +01:00
Thomas Müller 0dc31ee2fe Merge pull request #20052 from owncloud/stable8.2-share-clicklinkfocus
[stable8.2] Fix share link focus on click
2015-10-26 17:13:44 +01:00
Thomas Müller 24eb04f724 Merge pull request #20041 from owncloud/backport-fix-link-sharing-regression-master-stable8.2
Backport fix link sharing regression master stable8.2
2015-10-26 15:22:05 +01:00
Vincent Petry e1b59ad7f0 Fix share link focus on click
Clicking on the link share must focus and select it
2015-10-26 15:14:27 +01:00
Lukas Reschke 73750f0c1e Merge pull request #20048 from owncloud/dont-lock-user-files-82
[8.2] Dont lock /$user/files
2015-10-26 14:31:52 +01:00
Robin Appelman ad95e308ba Dont lock /$user/files 2015-10-26 13:50:47 +01:00
Morris Jobke 937a1b2b93 Merge pull request #20042 from owncloud/stable8.2-ext-dropbox-removecacheafterupload
[stable8.2] Remove Dropbox metadata from cache after upload
2015-10-26 13:50:10 +01:00
Vincent Petry 019e72040a Remove Dropbox metadata from cache after upload
This will make sure that the next calls that read the mtime will get the
correct value.
2015-10-26 11:55:39 +01:00
Roeland Jago Douma 6d0e167c4d Fix for broken ajax/share.php endpoint
Even more code mess :(
All tests pass again. But I'm really not happy with this endpoint.
2015-10-26 11:54:55 +01:00
Thomas Müller 2a0460d885 Ensure the password is only hashed in case it's changed on the client - fixes #19950 2015-10-26 11:54:48 +01:00
Morris Jobke 7d2bb6c028 Merge pull request #20036 from owncloud/stable8.2-backport-19957
Stable8.2 backport 19957
2015-10-26 10:59:22 +01:00
Steffen Lindner dbec295647 Add syslog_tag docu to sample config 2015-10-26 10:01:44 +01:00
Volker Fröhlich a2be470dce Expose syslog tag in the configuration 2015-10-26 10:01:31 +01:00
Lukas Reschke 0aca631216 Merge pull request #19997 from owncloud/backport-fix-deleted-ldap-user-sharing-stable8.2
[8.2] handle NoUserException in sharing code
2015-10-23 18:14:33 +02:00
Thomas Müller d935bdfd6a Merge pull request #20001 from owncloud/make-getCurrentUser-behave-similar-to-auth
[stable8.2] Make get current user behave similar to auth
2015-10-23 14:38:13 +02:00
Joas Schilling 25ef9909f0 Merge pull request #19999 from owncloud/backport-19970
[8.2] Fix "Call to a member function getUID() on boolean" in Crypt
2015-10-23 14:22:07 +02:00
Lukas Reschke e1642400f5 Make getCurrentUser behaviour similar to auth
If DAV_AUTHENTICATED is a null value this is a valid web session and we should return the user name as we also do in `auth`.
2015-10-23 13:39:12 +02:00
Joas Schilling 2b4ac38a08 Fix "Call to a member function getUID() on boolean" in Crypt 2015-10-23 13:01:57 +02:00
Morris Jobke eb12cac973 handle NoUserException in sharing code
* setup LDAP users
* share from an LDAP user
* delete that LDAP user
* log in as share recipient
* before: unhandled NoUserException
* after: NoUserEception is logged and share is not shown anymore
2015-10-23 12:20:11 +02:00
Robin Appelman 86b822dd52 Keep shared locks until the end of the request so we can reuse them 2015-10-22 14:50:43 +02:00
Lukas Reschke 79932c6d98 Merge pull request #19942 from owncloud/backport-19918
[8.2] Update: state which step we are going to start and warn if it might b…
2015-10-22 00:13:23 +02:00
Lukas Reschke 6209b40647 Merge pull request #19955 from owncloud/backport-19954
[stable8.2] Use IRequest's `getScriptName` functionality instead of $_SERVER
2015-10-21 20:44:14 +02:00
Lukas Reschke 8f04555e22 Merge pull request #19956 from owncloud/stable8.2-fix-webui-upload-and-conflicts
[stable8.2] Fix file upload, conflict dialog, also in public link
2015-10-21 20:19:37 +02:00
Vincent Petry d3d18b1abc Fix file upload, conflict dialog, also in public link
- Use "FileList" instead of "OCA.Files.App.fileList" that doesn't exist in public
link page.
- Fix public link upload by properly adding the form data using a new
  utility function "addFormData". That one is needed because IE8 upload
  and regular upload use a different format...
2015-10-21 18:19:55 +02:00
Lukas Reschke 4035bcf26a Use IRequest's getScriptName functionality instead of $_SERVER['SCRIPT_NAME'] 2015-10-21 17:41:49 +02:00
Lukas Reschke 74e54da304 Remove dependency on ICrypto + use XOR 2015-10-21 17:41:43 +02:00
Joas Schilling 70be8a309f Update: state which step we are going to start and warn if it might be slow 2015-10-21 14:51:14 +02:00
Lukas Reschke 74a33b0e56 Merge pull request #19939 from owncloud/stable8.2-detailsview-donotopenonrename
[stable8.2] Do not display details bar after rename
2015-10-21 14:27:26 +02:00
Vincent Petry ea6917d18a Do not display details bar after rename 2015-10-21 14:16:07 +02:00
Thomas Müller a399905aff Merge pull request #19913 from owncloud/fix-memcached-warning-stable8.2
[stable8.2] Fix memcached/memcache module check
2015-10-21 10:33:47 +02:00
Vincent Petry aba6b938f9 Merge pull request #19896 from owncloud/backport-19895
Backport #19895
2015-10-21 10:19:54 +02:00
Thomas Müller 84e69f4931 Merge pull request #19882 from owncloud/backport-ceph-stop-script-changes
Backport objectstore fixes to 8.2
2015-10-21 09:50:58 +02:00
Robin McCorkell ab87fc7d3a Fix memcached/memcache module check 2015-10-20 22:57:33 +01:00
Hendrik Leppelsack 234d9d8a58 fix pagination on public file list 2015-10-20 16:14:15 +02:00
Morris Jobke c2f5fd44c5 Merge pull request #19893 from owncloud/locking_exception_8.2
[stable8.2] catch all exception if table doesn't exists
2015-10-20 15:56:06 +02:00
Morris Jobke 06036df9f7 Merge pull request #19777 from owncloud/backport-19764
Variables don't have a class, so we can't use toString() on it
2015-10-20 15:54:22 +02:00
Morris Jobke 462fc21b06 Merge pull request #19765 from owncloud/backport-19580
[8.2.1] Make sure that remote shares use the correct uid casing
2015-10-20 15:52:47 +02:00
Morris Jobke 7a2ef950b3 Merge pull request #19876 from owncloud/backport-19820-stable8.2
[stable8.2] When sharing with the owner show the path
2015-10-20 15:51:56 +02:00
Morris Jobke a4d9d9f845 Merge pull request #19766 from owncloud/stable8.2-proppatch-lastmodified
[stable8.2] Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
2015-10-20 15:50:30 +02:00
Morris Jobke 7164178cd3 Merge pull request #19844 from owncloud/stable8.2-share-fix-spinner-position
[stable8.2] Fix spinner positions in share tab
2015-10-20 15:49:28 +02:00
Morris Jobke 0f3adb856f Merge pull request #19819 from owncloud/stable8.2-filelist-preventerrorwhennosidebar
[stable8.2] Do not register sidebar panels when no sidebar
2015-10-20 15:48:52 +02:00
Morris Jobke a2b5a2f109 Merge pull request #19782 from owncloud/stable8.2-passwordchange-hidestrengthify-2
[stable8.2] [resend] Properly hide strengthify after password change
2015-10-20 15:48:16 +02:00
Morris Jobke f3d58eebfc Merge pull request #19780 from owncloud/stable8.2-files-delete-hidenotif
[stable8.2] Hide notification on delete
2015-10-20 15:47:30 +02:00
Morris Jobke 0ea4274c8d Merge pull request #19779 from owncloud/stable8.2-trash-deletesectionposition-2
[stable8.2] Move trashbin specific CSS that modifies sidebar
2015-10-20 15:45:26 +02:00
Morris Jobke b0cecfb92a Merge pull request #19772 from owncloud/stable8.2-sidebar-alt-favorite
[stable8.2] Move alt text for favorite action to image
2015-10-20 15:44:54 +02:00
Morris Jobke cddf111dbb Merge pull request #19778 from owncloud/stable8.2-files-canceluploaddebounce-re
[stable8.2] Debounce cancel upload message
2015-10-20 15:43:06 +02:00
Morris Jobke 1cf1119b0b Merge pull request #19774 from owncloud/stable8.2-notif-showtemporary
[stable8.2] showTemporary instead of show for notifications
2015-10-20 15:42:27 +02:00
Morris Jobke 394751a985 Merge pull request #19775 from owncloud/stable8.2-trashbin-removesidebar
[stable8.2] Remove sidebar for trashbin view
2015-10-20 15:37:24 +02:00
Thomas Müller 26d98e9772 Merge pull request #19800 from owncloud/backport-19731
[8.2] Update list of deprecated methods
2015-10-20 15:35:17 +02:00
Thomas Müller 7ddbaf649f Merge pull request #19835 from owncloud/stable8.2-share-checkboxuniqueids
[stable8.2] Fix DOM element ids in share dialog
2015-10-20 15:34:54 +02:00
Morris Jobke 9c5dcb4cbf Merge pull request #19771 from owncloud/stable8.2-share-emailsenterror
[stable8.2] Fix share email sending feedback
2015-10-20 15:33:48 +02:00
Morris Jobke dbf5c266c7 Merge pull request #19769 from owncloud/stable8.2-users-deletebeforecreate
[stable8.2] Delete last undoable user before user creation
2015-10-20 15:27:05 +02:00
Morris Jobke 7010f42986 Merge pull request #19770 from owncloud/stable8.2-fix-ie-pain
[stable8.2] Fix more IE issues
2015-10-20 15:21:10 +02:00
Björn Schießle 530f313dff catch all exception if table doesn't exists 2015-10-20 14:57:40 +02:00
Thomas Müller f4e68ca36a Fix termination of the ceph docker 2015-10-20 09:52:05 +02:00
Thomas Müller 4408507fc7 Fix termination of the ceph docker 2015-10-20 09:52:05 +02:00
Robin Appelman 68a92f8186 fix encryption migration test 2015-10-20 09:51:27 +02:00
Robin Appelman 541474d5ec Fix listing of trash files in test 2015-10-20 09:51:27 +02:00
Robin Appelman cf84a1128d Fix trashbin handling of unknown/unlimited free space 2015-10-20 09:51:27 +02:00
Robin Appelman 490101a3a1 Fix rename shared versions test 2015-10-20 09:51:27 +02:00
Robin Appelman 7cbc348780 handle versions expire for home storages with unlimited quota 2015-10-20 09:51:27 +02:00
Robin Appelman 331750a3b7 fix delete orphan shares test with object home storage 2015-10-20 09:51:27 +02:00
Robin Appelman ca811d3079 Fix preserving file ids when restoring a file with object storage 2015-10-20 09:51:27 +02:00
Robin Appelman 37efd1d001 fix objectstore files having create permissions 2015-10-20 09:50:24 +02:00
Robin Appelman 4dd5efd464 dont assume home storage is local in trash test 2015-10-20 09:50:06 +02:00
Robin Appelman 9ca706b046 Make shared folder size propagation test work with object home storage 2015-10-20 09:49:59 +02:00
Robin Appelman 970a9c2382 detect object homestorage in share code 2015-10-20 09:49:52 +02:00
Robin Appelman be9df999fc Fix shared storage tests for non local home storage 2015-10-20 09:49:44 +02:00
Robin Appelman 96feb6f05b fix sabre connector tests when using a non local home storage 2015-10-20 09:49:36 +02:00
Robin Appelman be9e72084d Add tests for double cache rename 2015-10-20 09:49:29 +02:00
Robin Appelman 38c7902795 Skip checkupdate test for swift 2015-10-20 09:49:17 +02:00
Jörn Friedrich Dreyer 36066e1382 don't move files in cache twice, fixes renaming for objectstores 2015-10-20 09:49:02 +02:00
Thomas Müller e3a35506c4 Fix error in stop script 2015-10-20 09:43:57 +02:00
Roeland Jago Douma 99b78345a0 Check for error when resharing 2015-10-19 20:31:06 +02:00
Roeland Jago Douma 206eb29331 When sharing with the owner show the path
The error message should contain the path that is being shared not the
numeric id.
2015-10-19 20:28:41 +02:00
C Montero-Luque 8ee2009de3 8.2.0 2015-10-19 08:24:40 -04:00
C. Montero Luque ab0fc36a5f Merge pull request #19867 from owncloud/stable8.2-GreenArchon-fix-memberof-regression
[stable8.2] green archon fix memberof regression
2015-10-19 07:48:02 -04:00
Lukas Reschke 0cdece9bd4 Adjust unit tests 2015-10-19 13:20:39 +02:00
Lukas Reschke f8870a07b4 Fix style 2015-10-19 13:20:35 +02:00
Frédéric Fortier 01bff3bc24 Revert "adjust to nested group fix
This reverts commit 845485cfe, which fixes #19816 regression.
2015-10-19 13:20:32 +02:00
Morris Jobke 6bd1b03288 Merge pull request #19860 from owncloud/fix-streamed-download-of-subfolders-stable8.2
The full name has to be tested if it's a dir
2015-10-19 10:43:37 +02:00
Thomas Müller 90d436e1e0 The full name has to be tested if it's a dir - fixes #19854 2015-10-19 10:09:27 +02:00
Lukas Reschke bd835f9ecc Merge pull request #19850 from owncloud/increase-app-versions-8.2
Increase the 2nd digit of shipped apps for 8.2
2015-10-18 19:29:13 +02:00
Joas Schilling 0d868a9843 Increase the 2nd digit of shipped apps for 8.2 2015-10-17 08:54:12 +02:00
C Montero-Luque ab84f785d3 8.2 RC3 2015-10-16 14:30:26 -04:00
Vincent Petry 063c2db084 Fix spinner positions in share tab
Also fix missing spinner when removing link share
2015-10-16 18:38:54 +02:00
Vincent Petry 68f0d107f5 Fix DOM element ids in share dialog
- Rely on class names instead of global ids
- When global ids are needed for label+checkbox, append the view id
  (cid) to the element's id

This fixes the checkboxes when multiple sidebars exist in the DOM.
2015-10-16 15:27:42 +02:00
Vincent Petry 1d04317fbc Do not register sidebar panels when no sidebar 2015-10-16 08:40:39 +02:00
Thomas Müller dc3aee5acc Merge pull request #19783 from owncloud/stable8.2_backport_19727
[Stable8.2] Return path instead of itemsource
2015-10-15 19:58:05 +02:00
Morris Jobke 2729c0417d Merge pull request #19796 from owncloud/stable8.2-language-compat
[stable8.2] Remove arbitrary expression in empty
2015-10-15 10:41:58 +02:00
Joas Schilling c4c8296495 The constant is now deprecated 2015-10-15 08:40:26 +02:00
Morris Jobke 0eb374fe12 update deprecation message 2015-10-15 08:40:18 +02:00
Joas Schilling 8165c08cc5 Update list of deprecated methods 2015-10-15 08:40:08 +02:00
Frank Karlitschek 614a22cf32 Merge pull request #19763 from owncloud/backport-19744
Backport admin checkboxes #19744 to stable8.2
2015-10-14 21:18:55 -03:00
Lukas Reschke 6f20f60f5c Remove arbitrary expression in empty
Those are only allowed in PHP 5.5, thus making our code incompatible with PHP 5.4

Fixes https://github.com/owncloud/core/issues/19793
2015-10-14 22:40:31 +02:00
Roeland Jago Douma 8ac5398f4e Return path instead of itemsource
Fixes #19678

Errors should contain paths and not internal ids
2015-10-14 15:46:10 +02:00
Vincent Petry ba46cfed3a Properly hide strengthify after password change 2015-10-14 15:11:17 +02:00
Lukas Reschke c8da73667b Merge pull request #19781 from owncloud/revert-19768-stable8.2-passwordchange-hidestrengthify
Revert "[stable8.2] Properly hide strengthify after password change"
2015-10-14 15:09:14 +02:00
Lukas Reschke a50643ebc9 Revert "[stable8.2] Properly hide strengthify after password change" 2015-10-14 15:09:07 +02:00
Lukas Reschke 718edf7828 Merge pull request #19768 from owncloud/stable8.2-passwordchange-hidestrengthify
[stable8.2] Properly hide strengthify after password change
2015-10-14 15:08:45 +02:00
Vincent Petry 71144522c9 Hide notification on delete
In case a permanent notification "storage full" was displayed, it will
be hidden after deleting a file.

Directly after that a getstoragestats.php call is made that will decide
whether to reshow the notification based on the new free space.
2015-10-14 15:02:06 +02:00
Vincent Petry 9f052e44c8 Move trashbin specific CSS that modifies sidebar
Only when trashbin is enabled, its sidebar nav element must be fixed at
the bottom.
2015-10-14 14:56:08 +02:00
Vincent Petry cc03a1df0b Debounce cancel upload message 2015-10-14 14:44:42 +02:00
Joas Schilling a470b4917c Variables don't have a class, so we can't use toString() on it 2015-10-14 14:32:33 +02:00
Vincent Petry 4a0ca37cb3 Remove sidebar for trashbin view 2015-10-14 14:28:11 +02:00
Vincent Petry a4cbdfdc1f showTemporary instead of show for notifications 2015-10-14 14:26:16 +02:00
Vincent Petry b6f5e13b32 Move alt text for favorite action to image 2015-10-14 14:22:01 +02:00
Roeland Jago Douma da3cfb8710 Add unit tests for sending e-mail for link shares 2015-10-14 14:20:09 +02:00
Vincent Petry b0abb583c9 Fix share email sending feedback
Redisplay email address after failure
2015-10-14 14:20:04 +02:00
Vincent Petry f2ed3e726a [IE8] Fix button background color
IE8 doesn't support rgba...
2015-10-14 14:17:49 +02:00
Vincent Petry 2ff3e87f74 [IE8] Fix "new" button width 2015-10-14 14:17:45 +02:00
Vincent Petry f4ffa94e7f [IE9] Set explicit height to file actions menu icon
IE9 flattened the icons, so give it an explicit height.
2015-10-14 14:17:42 +02:00
Vincent Petry a1ce7ac872 [IE] Add border to dropdown menus
As a fallback because box-shadow doesn't give the same effect and drop
shadow doesn't work with IE.
2015-10-14 14:17:38 +02:00
Vincent Petry f7b62abcce Delete last undoable user before user creation 2015-10-14 14:14:50 +02:00
Vincent Petry baac1ad489 Properly hide strengthify after password change 2015-10-14 14:13:41 +02:00
Vincent Petry 7b00b943ee Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
Fix regression that makes PROPPATCH of mtime work like it did in OC <=
8.0.
The PROPPATCH must be done on the "lastmodified" property.
The "getlastmodified" now return 403 again.
2015-10-14 14:02:59 +02:00
Joas Schilling 02493563a2 Make sure that remote shares use the correct uid casing 2015-10-14 13:30:42 +02:00
Hendrik Leppelsack ee80cea2bd apply new checkbox style to admin settings 2015-10-14 13:08:06 +02:00
C Montero-Luque 06bfe1139b 8.2 RC2 2015-10-13 19:13:27 -04:00
9717 changed files with 456231 additions and 895875 deletions
-15
View File
@@ -1,15 +0,0 @@
codecov:
branch: master
ci:
- drone.nextcloud.com
- !scrutinizer-ci.com
coverage:
precision: 2
round: down
range: "70...100"
status:
project: off
patch: off
comment: off
-2317
View File
File diff suppressed because it is too large Load Diff
-2
View File
@@ -1,2 +0,0 @@
*/Activity/* @nickvergessen
*/Notifications/* @nickvergessen
+7 -42
View File
@@ -1,40 +1,25 @@
# the default generated dir + db file
/data
/owncloud
/config/config.php
/config/*.config.php
/config/mimetype*.json
/config/mount.php
/apps/inc.php
/assets
/.htaccess
/translationfiles
/translationtool.phar
# ignore all apps except core ones
/apps*/*
!/apps/accessibility
!/apps/comments
!/apps/dav
!/apps/files
!/apps/federation
!/apps/federatedfilesharing
!/apps/sharebymail
!/apps/files_encryption
!/apps/encryption
!/apps/encryption_dummy
!/apps/files_external
!/apps/files_sharing
!/apps/files_trashbin
!/apps/files_versions
!/apps/lookup_server_connector
!/apps/user_ldap
!/apps/oauth2
!/apps/provisioning_api
!/apps/systemtags
!/apps/testing
!/apps/admin_audit
!/apps/updatenotification
!/apps/theming
!/apps/twofactor_backupcodes
!/apps/workflowengine
!/apps/user_webdavauth
!apps/provisioning_api
/apps/files_external/3rdparty/irodsphp/PHPUnitTest
/apps/files_external/3rdparty/irodsphp/web
/apps/files_external/3rdparty/irodsphp/prods/test
@@ -42,8 +27,6 @@
/apps/files_external/3rdparty/irodsphp/prods/test*
/apps/files_external/tests/config.*.php
# apps modules
/apps/*/node_modules
# ignore themes except the example and the README
@@ -79,16 +62,13 @@ RCS/*
.project
.settings
# netbeans
# netbeans
nbproject
# phpStorm
.idea
*.iml
# vscode
.vscode
# geany
*.geany
@@ -98,10 +78,7 @@ nbproject
# vim ex mode
.vimrc
# ack(-grep)
.ackrc
# Mac OS
.DS_Store
@@ -116,12 +93,9 @@ nbproject
/build/node_modules/
# nodejs
/build/bin
/build/lib/
/build/jsdocs/
/npm-debug.log
/PhantomJS_*
/build/package-lock.json
# puphpet
puphpet
@@ -133,19 +107,10 @@ Vagrantfile
# Tests - auto-generated files
/data-autotest
/tests/coverage*
/tests/css
/tests/karma-coverage
/tests/autoconfig*
/tests/autotest*
/tests/data/lorem-copy.txt
/tests/data/testimage-copy.png
/tests/ui-regression/out/
/tests/ui-regression/node_modules/
/tests/ui-regression/package-lock.json
/config/config-autotest-backup.php
/config/autoconfig.php
clover.xml
# Tests - dependencies
tests/acceptance/composer.lock
tests/acceptance/vendor/
+1 -1
View File
@@ -1,3 +1,3 @@
[submodule "3rdparty"]
path = 3rdparty
url = https://github.com/nextcloud/3rdparty.git
url = https://github.com/owncloud/3rdparty.git
+15 -36
View File
@@ -1,12 +1,10 @@
# Version: 8.2.6
<IfModule mod_headers.c>
<IfModule mod_setenvif.c>
<IfModule mod_fcgid.c>
<IfModule mod_fcgid.c>
<IfModule mod_setenvif.c>
SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
</IfModule>
<IfModule mod_proxy_fcgi.c>
SetEnvIfNoCase Authorization "(.+)" HTTP_AUTHORIZATION=$1
</IfModule>
</IfModule>
<IfModule mod_env.c>
@@ -14,25 +12,18 @@
Header set X-Content-Type-Options "nosniff"
Header set X-XSS-Protection "1; mode=block"
Header set X-Robots-Tag "none"
Header set X-Download-Options "noopen"
Header set X-Permitted-Cross-Domain-Policies "none"
Header set Referrer-Policy "no-referrer"
Header set X-Frame-Options "SAMEORIGIN"
SetEnv modHeadersAvailable true
</IfModule>
# Add cache control for static resources
<FilesMatch "\.(css|js|svg|gif)$">
Header set Cache-Control "max-age=15778463"
</FilesMatch>
# Let browsers cache WOFF files for a week
<FilesMatch "\.woff$">
Header set Cache-Control "max-age=604800"
# Add cache control for CSS and JS files
<FilesMatch "\.(css|js)$">
Header set Cache-Control "max-age=7200, public"
</FilesMatch>
</IfModule>
<IfModule mod_php5.c>
php_value upload_max_filesize 511M
php_value post_max_size 511M
php_value upload_max_filesize 513M
php_value post_max_size 513M
php_value memory_limit 512M
php_value mbstring.func_overload 0
php_value always_populate_raw_post_data -1
@@ -42,30 +33,18 @@
SetEnv htaccessWorking true
</IfModule>
</IfModule>
<IfModule mod_php7.c>
php_value upload_max_filesize 511M
php_value post_max_size 511M
php_value memory_limit 512M
php_value mbstring.func_overload 0
php_value default_charset 'UTF-8'
php_value output_buffering 0
<IfModule mod_env.c>
SetEnv htaccessWorking true
</IfModule>
</IfModule>
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteCond %{HTTP_USER_AGENT} DavClnt
RewriteRule ^$ /remote.php/webdav/ [L,R=302]
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
RewriteRule ^\.well-known/carddav /remote.php/carddav/ [R=301,L]
RewriteRule ^\.well-known/caldav /remote.php/caldav/ [R=301,L]
RewriteRule ^apps/calendar/caldav\.php remote.php/caldav/ [QSA,L]
RewriteRule ^apps/contacts/carddav\.php remote.php/carddav/ [QSA,L]
RewriteRule ^remote/(.*) remote.php [QSA,L]
RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
RewriteCond %{REQUEST_URI} !^/\.well-known/(acme-challenge|pki-validation)/.*
RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
RewriteRule ^(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
</IfModule>
<IfModule mod_mime.c>
AddType image/svg+xml svg svgz
+1 -4
View File
@@ -28,10 +28,7 @@
"_": true,
"OC": true,
"OCA": true,
"OCP": true,
"t": true,
"n": true,
"escapeHTML": true,
"Promise": true
"n": true
}
}
+32 -45
View File
@@ -16,8 +16,8 @@ Andreas Schönebeck <aschoenebeck@web.de>
Andreas Ergenzinger <andreas.ergenzinger@gmx.de> AndreasErgenzinger <andreas.ergenzinger@gmx.de>
Andrew Brown <andrew@casabrown.com>
André Gaul <gaul@web-yard.de>
Arthur Schiwon <blizzz@arthur-schiwon.de> Arthur Schiwon <blizzz@owncloud.com>
Arthur Schiwon <blizzz@arthur-schiwon.de> blizzz <blizzz@owncloud.com>
Arthur Schiwon <blizzz@owncloud.com> Arthur Schiwon <blizzz@arthur-schiwon.de>
Arthur Schiwon <blizzz@owncloud.com> blizzz <blizzz@owncloud.com>
Artur Duque de Souza <asouza@kde.org>
Axel Roenn <axel@mpim-bonn.mpg.de>
Bagera <victor@baquero-wihlborg.se>
@@ -30,16 +30,14 @@ Benjamin Diele <benjamin@diele.be>
Benjamin Liles <benliles@arch.tamu.edu>
Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <nukeawhale@gmail.com>
Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <Raydiation@users.noreply.github.com>
Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <BernhardPosselt@users.noreply.github.com>
Bernhard Reiter <ockham@raz.or.at>
Birk Borkason <daniel.niccoli@gmail.com>
Björn Schießle <bjoern@schiessle.org> Bjoern Schiessle <schiesbn@woody.(none)>
Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiesbn@potato.(none)>
Björn Schießle <bjoern@schiessle.org> Björn Schiessle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Bjoern Schießle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Bjoern Schiessle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiessle@owncloud.com>
Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiesbn@woody.(none)>
Björn Schießle <schiessle@owncloud.com> Björn Schießle <bjoern@schiessle.org>
Björn Schießle <schiessle@owncloud.com> Björn Schießle <schiesbn@potato.(none)>
Björn Schießle <schiessle@owncloud.com> Björn Schiessle <schiessle@owncloud.com>
Björn Schießle <schiessle@owncloud.com> Bjoern Schießle <schiessle@owncloud.com>
Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiessle@owncloud.com>
BlackEagle <ike.devolder@gmail.com>
Boris Rybalkin <ribalkin@gmail.com>
Borjan Tchakaloff <borjan@tchakaloff.fr>
@@ -63,8 +61,6 @@ Christian Berendt <berendt@b1-systems.de>
Christian Kampka <christian@kampka.net>
Christian Koch <koch.chris@gmail.com>
Christian Reiner <github@christian-reiner.info> Christian Reiner <arkascha@balder.site>
Christoph Wurst <christoph@owncloud.com> Christoph Wurst <ChristophWurst@users.noreply.github.com>
Christoph Wurst <christoph@owncloud.com> Christoph Wurst <christoph@winzerhof-wurst.at>
Christopher Bunn <b11.chris@gmail.com>
Christopher Schäpers <kondou@ts.unde.re> Christopher <kondou@ts.unde.re>
Christopher Schäpers <kondou@ts.unde.re> kondou <kondou@ts.unde.re>
@@ -100,7 +96,6 @@ derkostka <sebastian.kostka@gmail.com>
Diederik de Haas <diederik@cknow.org>
Dominik Schmidt <dev@dominik-schmidt.de>
Donald Buczek <buczek@molgen.mpg.de>
Donquixote <marjunebatac@gmail.com> Donquixote <marjunebatac@gmailcom>
Doug Neiner <doug@pixelgraphics.us>
drarko <drarko@users.noreply.github.com>
dratini0 <dratini0@gmail.com>
@@ -128,26 +123,24 @@ Florian Vichot <florian.vichot@gmail.com>
Florin Peter <github@florin-peter.de> Florin Peter <fp@datawerk.de>
Florin Peter <github@florin-peter.de> FlorinPeter <github@florin-peter.de>
Francesco Piraneo G. <fpiraneo@iface.ch>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@dev.(none)>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@devel.(none)>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@oc.(none)>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@owncloud.org>
Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <karlitschek@kde.org>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@dev.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@devel.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@oc.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@gmx.de>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@kde.org>
François Kubler <francois@kubler.org>
Frédéric Fortier <frederic.fortier@oronospolytechnique.com> Frédéric Fortier <frederic.fortier@polymtl.ca>
Frederik Gladhorn <gladhorn@kde.org>
Gadzy <dev@gadzy.fr>
ganomi <ganomi@gmail.com>
Gaël Beaudoin <gaboo@home.gaboo.org>
geez0x1 <geez0x1@users.noreply.github.com>
gekmihesg <markus@gekmihesg.de>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <dev@georgswebsite.de>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <developer@georgehrke.com>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <ownclouddev@georgswebsite.de>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <devgeorg@ownCloud.com>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <georg@ownCloud.com>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <georg@owncloud.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <dev@georgswebsite.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <developer@georgehrke.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <ownclouddev@georgswebsite.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <devgeorg@ownCloud.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg@ownCloud.com>
Golnaz Nilieh <g382nilieh@gmail.com>
Grundik <grundik@ololo.cc>
Guillaume AMAT <guillaume.amat@informatique-libre.com>
@@ -180,13 +173,12 @@ Jean-Louis Dupond <jean-louis@dupond.be>
Jenkins for ownCloud <owncloud-bot@tmit.eu> Jenkins for ownCloud <thomas.mueller@tmit.eu>
Jens-Christian Fischer <jens-christian.fischer@switch.ch>
Jernej Virag <jernej.virag@gmail.com>
Jesus Macias <jmacias@full-on-net.com>
Jesus Macias Portela <jesus.macias.portela@gmail.com>
Jesús Macias <jmacias@solidgear.es> Jesus Macias <jmacias@full-on-net.com>
jknockaert <jasper@knockaert.nl>
Joan <aseques@gmail.com>
Joar Wandborg <git@wandborg.com>
Joas Schilling <coding@schilljs.com> Joas Schilling <nickvergessen@gmx.de>
Joas Schilling <coding@schilljs.com> Joas Schilling <nickvergessen@owncloud.com>
Joas Schilling <nickvergessen@owncloud.com> Joas Schilling <nickvergessen@gmx.de>
joel hansson <joel.hansson@gmail.com>
Johan Björk <johanimon@gmail.com>
Johannes Twittmann <github.com@deryo.de>
@@ -213,8 +205,8 @@ Sebastian Döll <sebastian.doell@libasys.de> libasys <sebastian.doell@libasys.de
Lode Hoste <zillode@zillode.be>
lolozere <laurent@chedanne.pro>
Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
Lukas Reschke <lukas@statuscode.ch> Lukas Reschke <lukas@owncloud.com>
Lukas Reschke <lukas@statuscode.ch> Lukas Reschke <lukas@owncloud.org>
Lukas Reschke <lukas@owncloud.com> Lukas Reschke <lukas@owncloud.org>
Lukas Reschke <lukas@owncloud.com> Lukas Reschke <lukas@statuscode.ch>
Luke Policinski <lpolicinski@gmail.com>
Lyonel Vincent <lyonel@ezix.org>
macjohnny <estebanmarin@gmx.ch>
@@ -305,19 +297,16 @@ Riccardo Iaconelli <riccardo@kde.org>
Richard Clarkson <robert@trash-mail.com>
rnveach <rveach02@gmail.com>
Robert Jäckel <rjaeckel@users.noreply.github.com>
Robin Appelman <robin@icewind.nl> icewind1991 <icewind1991@gmail.com>
Robin Appelman <robin@icewind.nl> icewind1991 <robin@icewind.nl>
Robin Appelman <robin@icewind.nl> Robin <Robin Appelman icewind1991@gmail.com>
Robin Appelman <robin@icewind.nl> Robin <robin@Amaya.(none)>
Robin Appelman <robin@icewind.nl> Robin Appelman <icewind1991@gmail.com>
Robin Appelman <robin@icewind.nl> Robin Appelman <icewind1991@gmail>
Robin Appelman <robin@icewind.nl> Robin Appelman <icewind@owncloud.com>
Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@karoshi.org.uk>
Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@owncloud.com>
Robin Appelman <icewind@owncloud.com> icewind1991 <icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> icewind1991 <robin@icewind.nl>
Robin Appelman <icewind@owncloud.com> Robin <Robin Appelman icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> Robin <robin@Amaya.(none)>
Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
Robin McCorkell <rmccorkell@karoshi.org.uk> Robin McCorkell <rmccorkell@owncloud.com>
Rodrigo Hjort <rodrigo.hjort@gmail.com>
Roeland Jago Douma <roeland@famdouma.nl> Roeland Jago Douma <rullzer@owncloud.com>
Roeland Jago Douma <roeland@famdouma.nl> Roeland Douma <rullzer@users.noreply.github.com>
Roger Szabo <roger.szabo@web.de> root <roger.szabo@web.de>
Roeland Jago Douma <roeland@famdouma.nl>
rok <brejktru@gmail.com>
Roland Hager <roland.hager@tu-berlin.de>
Roland van Laar <roland@micite.net>
@@ -377,7 +366,6 @@ TheSFReader <TheSFReader@gmail.com>
Thibaut GRIDEL <tgridel@free.fr>
thomas <thomas@thomas-VirtualBox.(none)>
Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
Thomas Müller <thomas.mueller@tmit.eu> Thomas Müller <DeepDiver1975@users.noreply.github.com>
Thomas Olsen <tol@tanghus>
Thomas Schmidt <tschmidt@suse.de>
Thomas Tanghus <thomas@tanghus.net>
@@ -403,7 +391,6 @@ Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <victor.dubiniuk@gmail.com>
Vincent Cloutier <vincent1cloutier@gmail.com>
Vincent Petry <pvince81@owncloud.com> Vincent Petry <PVince81@yahoo.fr>
Vincent Petry <pvince81@owncloud.com> Vincent Petry <vincent@vvortex.site>
Vinicius Cubas Brand <vinicius@eita.org.br> Vinicius Cubas Brand <viniciuscb@gmail.com>
Vitaly Kuznetsov <vitty@altlinux.ru>
Vladimir Sapronov <vladimir.sapronov@gmail.com>
Volkan Gezer <volkangezer@gmail.com> Volkan Gezer <wakeup@users.noreply.github.com>
+1 -13
View File
@@ -1,11 +1,3 @@
before_commands:
- 'git submodule update --init --recursive'
checks:
php:
excluded_dependencies:
- etsy/phan
filter:
excluded_paths:
- '3rdparty/*'
@@ -14,7 +6,6 @@ filter:
- 'l10n/*'
- 'core/l10n/*'
- 'apps/*/l10n/*'
- 'apps/*/tests/*'
- 'lib/l10n/*'
- 'core/vendor/*'
- 'core/js/tests/lib/*.js'
@@ -22,10 +13,7 @@ filter:
- 'core/js/jquery-showpassword.js'
- 'core/js/jquery-tipsy.js'
- 'core/js/placeholders.js'
- 'settings/l10n/*'
- 'tests/*'
- 'build/*'
- 'lib/composer/*'
imports:
- javascript
+25
View File
@@ -0,0 +1,25 @@
sudo: false
language: php
php:
- 5.4
branches:
only:
- master
- /^stable\d+(\.\d+)?$/
script:
- sh -c "if [ '$TC' = 'syntax' ]; then composer install && vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/patchwork/utf8/class/Patchwork/Utf8/Bootup/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .; fi"
matrix:
include:
- php: 5.4
env: DB=sqlite;TC=syntax
- php: 5.5
env: DB=sqlite;TC=syntax
- php: 5.6
env: DB=sqlite;TC=syntax
- php: 7.0
env: DB=sqlite;TC=syntax
fast_finish: true
-135
View File
@@ -1,135 +0,0 @@
[main]
host = https://www.transifex.com
lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
[nextcloud.core]
file_filter = translationfiles/<lang>/core.po
source_file = translationfiles/templates/core.pot
source_lang = en
type = PO
[nextcloud.files]
file_filter = translationfiles/<lang>/files.po
source_file = translationfiles/templates/files.pot
source_lang = en
type = PO
[nextcloud.settings-1]
file_filter = translationfiles/<lang>/settings.po
source_file = translationfiles/templates/settings.pot
source_lang = en
type = PO
[nextcloud.lib]
file_filter = translationfiles/<lang>/lib.po
source_file = translationfiles/templates/lib.pot
source_lang = en
type = PO
[nextcloud.dav]
file_filter = translationfiles/<lang>/dav.po
source_file = translationfiles/templates/dav.pot
source_lang = en
type = PO
[nextcloud.files_encryption]
file_filter = translationfiles/<lang>/encryption.po
source_file = translationfiles/templates/encryption.pot
source_lang = en
type = PO
[nextcloud.files_external]
file_filter = translationfiles/<lang>/files_external.po
source_file = translationfiles/templates/files_external.pot
source_lang = en
type = PO
[nextcloud.files_sharing]
file_filter = translationfiles/<lang>/files_sharing.po
source_file = translationfiles/templates/files_sharing.pot
source_lang = en
type = PO
[nextcloud.files_trashbin]
file_filter = translationfiles/<lang>/files_trashbin.po
source_file = translationfiles/templates/files_trashbin.pot
source_lang = en
type = PO
[nextcloud.files_versions]
file_filter = translationfiles/<lang>/files_versions.po
source_file = translationfiles/templates/files_versions.pot
source_lang = en
type = PO
[nextcloud.user_ldap]
file_filter = translationfiles/<lang>/user_ldap.po
source_file = translationfiles/templates/user_ldap.pot
source_lang = en
type = PO
[nextcloud.comments]
file_filter = translationfiles/<lang>/comments.po
source_file = translationfiles/templates/comments.pot
source_lang = en
type = PO
[nextcloud.federatedfilesharing]
file_filter = translationfiles/<lang>/federatedfilesharing.po
source_file = translationfiles/templates/federatedfilesharing.pot
source_lang = en
type = PO
[nextcloud.federation]
file_filter = translationfiles/<lang>/federation.po
source_file = translationfiles/templates/federation.pot
source_lang = en
type = PO
[nextcloud.oauth2]
file_filter = translationfiles/<lang>/oauth2.po
source_file = translationfiles/templates/oauth2.pot
source_lang = en
type = PO
[nextcloud.sharebymail]
file_filter = translationfiles/<lang>/sharebymail.po
source_file = translationfiles/templates/sharebymail.pot
source_lang = en
type = PO
[nextcloud.systemtags]
file_filter = translationfiles/<lang>/systemtags.po
source_file = translationfiles/templates/systemtags.pot
source_lang = en
type = PO
[nextcloud.updatenotification]
file_filter = translationfiles/<lang>/updatenotification.po
source_file = translationfiles/templates/updatenotification.pot
source_lang = en
type = PO
[nextcloud.theming]
file_filter = translationfiles/<lang>/theming.po
source_file = translationfiles/templates/theming.pot
source_lang = en
type = PO
[nextcloud.twofactor_backupcodes]
file_filter = translationfiles/<lang>/twofactor_backupcodes.po
source_file = translationfiles/templates/twofactor_backupcodes.pot
source_lang = en
type = PO
[nextcloud.workflowengine]
file_filter = translationfiles/<lang>/workflowengine.po
source_file = translationfiles/templates/workflowengine.pot
source_lang = en
type = PO
[nextcloud.accessibility]
file_filter = translationfiles/<lang>/accessibility.po
source_file = translationfiles/templates/accessibility.pot
source_lang = en
type = PO
+2 -2
View File
@@ -1,5 +1,5 @@
upload_max_filesize=511M
post_max_size=511M
upload_max_filesize=513M
post_max_size=513M
memory_limit=512M
mbstring.func_overload=0
always_populate_raw_post_data=-1
+23 -293
View File
@@ -1,296 +1,26 @@
Nextcloud is written by:
- 1 Man Projects <reed@1manprojects.de>
- AW-UC <git@a-wesemann.de>
- Aaron Wood <aaronjwood@gmail.com>
- Achim Königs <garfonso@tratschtante.de>
- Adam Williamson <awilliam@redhat.com>
- Administrator "Administrator@WINDOWS-2012"
- Aldo "xoen" Giambelluca <xoen@xoen.org>
- Alex Weirig <alex.weirig@technolink.lu>
- Alexander Bergolth <leo@strike.wu.ac.at>
- Allan Nordhøy <epost@anotheragency.no>
- Andreas Fischer <bantu@owncloud.com>
- Andreas Pflug <dev@admin4.org>
- Andrew Brown <andrew@casabrown.com>
- Andrius <andrius.kulbis@ktu.lt>
- André Gaul <gaul@web-yard.de>
- Ardinis <Ardinis@users.noreply.github.com>
- Artem Kochnev <MrJeos@gmail.com>
- Artem Sidorenko <artem@posteo.de>
- Arthur Schiwon <blizzz@arthur-schiwon.de>
- Axel Helmert <axel.helmert@luka.de>
- Bart Visscher <bartv@thisnet.nl>
- Bartek Przybylski <bart.p.pl@gmail.com>
- Bastien Ho <bastienho@urbancube.fr>
- Benjamin Diele <benjamin@diele.be>
- Benjamin Liles <benliles@arch.tamu.edu>
- Bernhard Posselt <dev@bernhard-posselt.com>
- Bernhard Reiter <ockham@raz.or.at>
- Birk Borkason <daniel.niccoli@gmail.com>
- Bjoern Schiessle <bjoern@schiessle.org>
- Björn Schießle <bjoern@schiessle.org>
- Boris Rybalkin <ribalkin@gmail.com>
- Borjan Tchakaloff <borjan@tchakaloff.fr>
- Brent Bloxam <brent.bloxam@gmail.com>
- Brice Maron <brice@bmaron.net>
- Byron Marohn <combustible@live.com>
- Carla Schroder <carla@owncloud.com>
- Carlos Cerrillo <ccerrillo@gmail.com>
- Carlos Damken <carlos@damken.com>
- Christian Berendt <berendt@b1-systems.de>
- Christian Jürges <christian@eqipe.ch>
- Christian Kampka <christian@kampka.net>
- Christian Weiske <cweiske@cweiske.de>
- Christoph Schaefer "christophł@wolkesicher.de"
- Christoph Wickert <cwickert@suse.de>
- Christoph Wurst <christoph@owncloud.com>
- Christopher Bartz <bartz@dkrz.de>
- Christopher Schäpers <kondou@ts.unde.re>
- Christopher T. Johnson <ctjctj@gmail.com>
- Clark Tomlinson <fallen013@gmail.com>
- Cornelius Kölbel <cornelius.koelbel@netknights.it>
- Damjan Georgievski <gdamjan@gmail.com>
- Dan Bartram <daneybartram@gmail.com>
- Daniel Calviño Sánchez <danxuliu@gmail.com>
- Daniel Hansson <daniel@techandme.se>
- Daniel Jagszent <daniel@jagszent.de>
- Daniel Molkentin <daniel@molkentin.de>
- Daniel Tosello <tosello.daniel@gmail.com>
- David Prévot <taffit@debian.org>
- David Toledo <dtoledo@solidgear.es>
- Derek <derek.kelly27@gmail.com>
- Dominik Schmidt <dev@dominik-schmidt.de>
- Donquixote <marjunebatac@gmail.com>
- Fabian Henze <flyser42@gmx.de>
- Fabrizio Steiner <fabrizio.steiner@gmail.com>
- Felix A. Epp <work@felixepp.de>
- Felix Epp <work@felixepp.de>
- Felix Heidecke <felix@heidecke.me>
- Felix Moeller <mail@felixmoeller.de>
- Felix Rupp <github@felixrupp.com>
- Florin Peter <github@florin-peter.de>
- Frank Isemann <frank@isemann.name>
- Frank Karlitschek <frank@karlitschek.de>
- François Kubler <francois@kubler.org>
- Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
- Gadzy <dev@gadzy.fr>
- Georg Ehrke <oc.list@georgehrke.com>
- Hemanth Kumar Veeranki <hems.india1997@gmail.com>
- Hendrik Leppelsack <hendrik@leppelsack.de>
- Ilja Neumann <ineumann@owncloud.com>
- Individual IT Services <info@individual-it.net>
- Jakob Sack <mail@jakobsack.de>
- Jan-Christoph Borchardt <hey@jancborchardt.net>
- Jan-Philipp Litza <jplitza@users.noreply.github.com>
- Jarkko Lehtoranta <devel@jlranta.com>
- Jean-Louis Dupond <jean-louis@dupond.be>
- Jens-Christian Fischer <jens-christian.fischer@switch.ch>
- Jesús Macias <jmacias@solidgear.es>
- Joachim Bauch <bauch@struktur.de>
- Joachim Sokolowski <github@sokolowski.org>
- Joas Schilling <coding@schilljs.com>
- Johan Björk <johanimon@gmail.com>
- Johannes Ernst <jernst@indiecomputing.com>
- Johannes Schlichenmaier <johannes@schlichenmaier.info>
- Johannes Willnecker <johannes@willnecker.com>
- John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- John Molakvoæ <skjnldsv@users.noreply.github.com>
- Jonny007-MKD <1-23-4-5@web.de>
- Juan Pablo Villafañez <jvillafanez@solidgear.es>
- Juan Pablo Villafáñez <jvillafanez@solidgear.es>
- Juan Pablo Villafáñez <jvillafanez@solidgear.es>
- Julius Haertl <jus@bitgrid.net>
- Julius Härtl <jus@bitgrid.net>
- Jörn Friedrich Dreyer <jfd@butonic.de>
- Jürgen Haas <juergen@paragon-es.de>
- KB7777 <k.burkowski@gmail.com>
- Kamil Domanski <kdomanski@kdemail.net>
- Kawohl <john@owncloud.com>
- Kenneth Newwood <kenneth@newwood.name>
- Klaas Freitag <freitag@owncloud.com>
- Knut Ahlers <knut@ahlers.me>
- Ko- <k.stoffelen@cs.ru.nl>
- Kristof Provost <github@sigsegv.be>
- Lars <winnetou+github@catolic.de>
- Laurens Post <Crote@users.noreply.github.com>
- Laurens Post <lkpost@scept.re>
- Lennart Rosam <hello@takuto.de>
- Lennart Rosam <lennart.rosam@medien-systempartner.de>
- Leon Klingele <git@leonklingele.de>
- Leon Klingele <leon@struktur.de>
- Loki3000 <github@labcms.ru>
- Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
- Lukas Reschke <lukas@statuscode.ch>
- Luke Policinski <lpolicinski@gmail.com>
- Lyonel Vincent <lyonel@ezix.org>
- Magnus Walbeck <mw@mwalbeck.org>
- Manish Bisht <manish.bisht490@gmail.com>
- Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
- Marin Treselj <marin@pixelipo.com>
- Mario Kolling <mario.kolling@serpro.gov.br>
- Marius Blüm <marius@lineone.io>
- Markus Goetz <markus@woboq.com>
- Martin <github@diemattels.at>
- Martin Konrad <info@martin-konrad.net>
- Martin Konrad <konrad@frib.msu.edu>
- Martin Mattel <martin.mattel@diemattels.at>
- Marvin Thomas Rabe <mrabe@marvinrabe.de>
- Masaki Kawabata Neto <masaki.kawabata@gmail.com>
- Matthew Setter <matthew@matthewsetter.com>
- Maxence Lange <maxence@artificial-owl.com>
- Maxence Lange <maxence@nextcloud.com>
- Maxence Lange <maxence@pontapreta.net>
- Michael Gapczynski <GapczynskiM@gmail.com>
- Michael Göhler <somebody.here@gmx.de>
- Michael Jobst <mjobst+github@tecratech.de>
- Michael Letzgus <www@chronos.michael-letzgus.de>
- Michael Roitzsch <reactorcontrol@icloud.com>
- Michael Roth <michael.roth@rz.uni-augsburg.de>
- Michael U <mdusher@users.noreply.github.com>
- Miguel Prokop <miguel.prokop@vtu.com>
- Miha Frangez <miha.frangez@gmail.com>
- Mitar <mitar.git@tnode.com>
- Morris Jobke <hey@morrisjobke.de>
- Nicolai Ehemann <en@enlightened.de>
- Nicolas Grekas <nicolas.grekas@gmail.com>
- Nils <git@to.nilsschnabel.de>
- Nmz <nemesiz@nmz.lt>
- Noveen Sachdeva <noveen.sachdeva@research.iiit.ac.in>
- Oliver Gasser <oliver.gasser@gmail.com>
- Oliver Kohl D.Sc. <oliver@kohl.bz>
- Olivier Mehani <shtrom@ssji.net>
- Olivier Paroz <github@oparoz.com>
- Owen Winkler <a_github@midnightcircus.com>
- Pascal de Bruijn <pmjdebruijn@pcode.nl>
- Patrick Paysant <patrick.paysant@linagora.com>
- Patrick Paysant <ppaysant@linagora.com>
- Patrik Kernstock <info@pkern.at>
- Pauli Järvinen <pauli.jarvinen@gmail.com>
- Pellaeon Lin <nfsmwlin@gmail.com>
- Petr Svoboda <weits666@gmail.com>
- Phiber2000 <phiber2000@gmx.de>
- Phil Davis <phil.davis@inf.org>
- Philipp Kapfer <philipp.kapfer@gmx.at>
- Philipp Schaffrath <github@philipp.schaffrath.email>
- Philippe Jung <phil.jung@free.fr>
- Pierre Ozoux <pierre@ozoux.net>
- Pierre Rudloff <contact@rudloff.pro>
- Piotr Filiciak <piotr@filiciak.pl>
- Piotr M <mrow4a@yahoo.com>
- Piotr Mrowczynski <mrow4a@yahoo.com>
- Piotr Mrówczyński <mrow4a@yahoo.com>
- Qingping Hou <dave2008713@gmail.com>
- Raghu Nayyar <me@iraghu.com>
- Ralph Krimmel <rkrimme1@gwdg.de>
- Ramiro Aparicio <rapariciog@gmail.com>
- Randolph Carter <RandolphCarter@fantasymail.de>
- RealRancor <Fisch.666@gmx.de>
- RealRancor <fisch.666@gmx.de>
- Rello <Rello@users.noreply.github.com>
- Remco Brenninkmeijer <requist1@starmail.nl>
- Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca>
- Robert Scheck <robert@fedoraproject.org>
- Robin Appelman <robin@icewind.nl>
- Robin McCorkell <robin@mccorkell.me.uk>
- Roeland Jago Douma <roeland@famdouma.nl>
- Roger Szabo <roger.szabo@web.de>
- Roman Kreisel <mail@romankreisel.de>
- Ross Nicoll <jrn@jrn.me.uk>
- SA <stephen@mthosting.net>
- Sam Tuke <mail@samtuke.com>
- Sander <brantje@gmail.com>
- Sander Ruitenbeek <sander@grids.be>
- Sandro Lutz <sandro.lutz@temparus.ch>
- Sascha Sambale <mastixmc@gmail.com>
- Sean Comeau <sean@ftlnetworks.ca>
- Sebastian Döll <sebastian.doell@libasys.de>
- Sebastian Wessalowski <sebastian@wessalowski.org>
- Semih Serhat Karakaya <karakayasemi@itu.edu.tr>
- Senorsen <senorsen.zhang@gmail.com>
- Serge Martin <edb@sigluy.net>
- Sergio Bertolin <sbertolin@solidgear.es>
- Sergio Bertolín <sbertolin@solidgear.es>
- Simon Könnecke <simonkoennecke@gmail.com>
- Sjors van der Pluijm <sjors@desjors.nl>
- Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
- Stefan Rado <owncloud@sradonia.net>
- Stefan Schneider <stefan.schneider@squareweave.com.au>
- Stefan Weil <sw@weilnetz.de>
- Steffen Lindner <mail@steffen-lindner.de>
- Stephan Müller <mail@stephanmueller.eu>
- Stephan Peijnik <speijnik@anexia-it.com>
- Steven Bühner <buehner@me.com>
- Sujith H <sharidasan@owncloud.com>
- Thibaut GRIDEL <tgridel@free.fr>
- Thomas Citharel <tcit@tcit.fr>
- Thomas Ebert <thomas.ebert@usability.de>
- Thomas Müller <thomas.mueller@tmit.eu>
- Thomas Pulzer <t.pulzer@kniel.de>
- Thomas Tanghus <thomas@tanghus.net>
- Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
- Tim Dettrick <t.dettrick@uq.edu.au>
- Tobia De Koninck <tobia@ledfan.be>
- Tobias Brunner <tobias@tobru.ch>
- Tobias Kaminsky <tobias@kaminsky.me>
- Tom Needham <tom@owncloud.com>
- Torben Dannhauer <torben@dannhauer.de>
- Ujjwal Bhardwaj <ujjwalb1996@gmail.com>
- Victor Dubiniuk <dubiniuk@owncloud.com>
- Viktor Szépe <viktor@szepe.net>
- Vincent Chan <plus.vincchan@gmail.com>
- Vincent Cloutier <vincent1cloutier@gmail.com>
- Vincent Petry <pvince81@owncloud.com>
- Vinicius Cubas Brand <vinicius@eita.org.br>
- Volkan Gezer <volkangezer@gmail.com>
- William Pain <pain.william@gmail.com>
- Xuanwo <xuanwo@yunify.com>
- adrien <adrien.waksberg@believedigital.com>
- alexweirig <alex.weirig@technolink.lu>
- bline <scottbeck@gmail.com>
- brumsel <brumsel@losecatcher.de>
- cetra3 <peter@parashift.com.au>
- cmeh <cmeh@users.noreply.github.com>
- coderkun <olli@coderkun.de>
- dartcafe <github@dartcafe.de>
- davidgumberg <davidnoizgumberg@gmail.com>
- davitol <dtoledo@solidgear.es>
- derkostka <sebastian.kostka@gmail.com>
- duritong <peter.meier+github@immerda.ch>
- eduardo <eduardo@vnexu.net>
- fabian <fabian@web2.0-apps.de>
- felixboehm <felix@webhippie.de>
- helix84 <helix84@centrum.sk>
- hkjolhede <hkjolhede@gmail.com>
- iamfool <praveenraonp@gmail.com>
- ideaship <ideaship@users.noreply.github.com>
- j-ed <juergen@eisfair.org>
- jknockaert <jasper@knockaert.nl>
- josh4trunks <joshruehlig@gmail.com>
- justin-sleep <justin@quarterfull.com>
- karakayasemi <karakayasemi@itu.edu.tr>
- macjohnny <estebanmarin@gmx.ch>
- martin-rueegg <martin.rueegg@metaworx.ch>
- martin.mattel@diemattels.at <martin.mattel@diemattels.at>
- michag86 <micha_g@arcor.de>
- mmccarn <mmccarn-github@mmsionline.us>
- nhirokinet <nhirokinet@nhiroki.net>
- nishiki <nishiki@yaegashi.fr>
- noveens <noveen.sachdeva@research.iiit.ac.in>
- oparoz <owncloud@interfasys.ch>
- phisch <git@philippschaffrath.de>
- rakekniven <mark.ziegler@rakekniven.de>
- root "root@oc.(none)"
- root <root@localhost.localdomain>
- scambra <sergio@entrecables.com>
- scolebrook <scolebrook@mac.com>
- shkdee <louis.traynard@m4x.org>
- sualko <klaus@jsxc.org>
- tbartenstein <tbartenstein@users.noreply.github.com>
- tbelau666 <thomas.belau@gmx.de>
- tux-rampage <tux-rampage@users.noreply.github.com>
- v1r0x <vinzenz.rosenkranz@gmail.com>
- vkuimov "vkuimov@nextcloud"
- voxsim "Simon Vocella"
ownCloud is written by:
Frank Karlitschek
Robin Appelman
Jakob Sack
Jan-Christoph Borchardt
Michael Gapczynski
Arthur Schiwon
Bart Visscher
Georg Ehrke
Brice Maron
Tom Needham
Marvin Thomas Rabe
Florian Pritz
Bartek Przybylski
Thomas Müller
Klaas Freitag
Sam Tuke
Simon Birnbach
Lukas Reschke
Christian Reiner
Daniel Molkentin
Vincent Petry
With help from many libraries and frameworks including:
Open Collaboration Services
-4
View File
@@ -1,4 +0,0 @@
Changelog
=========
The change log is at [https://nextcloud.com/changelog/](https://nextcloud.com/changelog/).
-9
View File
@@ -1,9 +0,0 @@
In the Nextcloud community, participants from all over the world come together to create Free Software for a free internet. This is made possible by the support, hard work and enthusiasm of thousands of people, including those who create and use Nextcloud software.
Our code of conduct offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
The Code of Conduct is shared by all contributors and users who engage with the Nextcloud team and its community services. It presents a summary of the shared values and “common sense” thinking in our community.
You can find our full code of conduct on our website: https://nextcloud.com/code-of-conduct/
Please, keep our CoC in mind when you contribute! That way, everyone can be a part of our community in a productive, positive, creative and fun way.
+32 -38
View File
@@ -1,6 +1,6 @@
## Submitting issues
If you have questions about how to install or use Nextcloud, please direct these to our [forum][forum]. We are also available on [IRC][irc].
If you have questions about how to install or use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
### Short version
@@ -11,58 +11,52 @@ If you have questions about how to install or use Nextcloud, please direct these
- Go to one of the repositories, click "issues" and type any word in the top search/command bar.
- You can also filter by appending e. g. "state:open" to the search string.
- More info on [search syntax within github](https://help.github.com/articles/searching-issues)
* This repository ([server](https://github.com/nextcloud/server/issues)) is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
* __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/nextcloud) or security@nextcloud.com following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker.
* The issues in other components should be reported in their respective repositories: You will find them in our [GitHub Organization](https://github.com/nextcloud/)
* This repository ([core](https://github.com/owncloud/core/issues)) is *only* for issues within the ownCloud core code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
* The issues in other components should be reported in their respective repositories:
- [Android client](https://github.com/owncloud/android/issues)
- [iOS client](https://github.com/owncloud/ios-issues/issues)
- [Desktop client](https://github.com/owncloud/mirall/issues)
- [Documentation](https://github.com/owncloud/documentation/issues)
- Apps:
- [Activity](https://github.com/owncloud/activity/issues)
- [Bookmarks](https://github.com/owncloud/bookmarks/issues)
- [Calendar](https://github.com/owncloud/calendar/issues)
- [Contacts](https://github.com/owncloud/contacts/issues)
- [Documents](https://github.com/owncloud/documents/issues)
- [Gallery](https://github.com/owncloud/gallery/issues)
- [Mail](https://github.com/owncloud/mail/issues)
- [Music](https://github.com/owncloud/music/issues)
- [News](https://github.com/owncloud/news/issues)
- [Notes](https://github.com/owncloud/notes/issues)
- [Shorty](https://github.com/owncloud/shorty/issues)
- [Tasks](https://github.com/owncloud/tasks/issues)
- [All other apps](https://github.com/owncloud/apps/issues)
* Report the issue using our [template][template], it includes all the information we need to track down the issue.
Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
[template]: https://raw.githubusercontent.com/nextcloud/server/master/issue_template.md
[forum]: https://help.nextcloud.com/
[irc]: https://webchat.freenode.net/?channels=nextcloud
[template]: https://raw.github.com/owncloud/core/master/issue_template.md
[mailinglist]: https://mailman.owncloud.org/mailman/listinfo/owncloud
[forum]: https://forum.owncloud.org/
[irc]: https://webchat.freenode.net/?channels=owncloud&uio=d4
## Contributing to Source Code
Thanks for wanting to contribute source code to Nextcloud. That's great!
Thanks for wanting to contribute source code to ownCloud. That's great!
Please read the [Developer Manuals][devmanual] to learn how to create your first application or how to test the Nextcloud code with PHPUnit.
Before we're able to merge your code into the ownCloud core, you need to sign our [Contributor Agreement][agreement].
### Tests
Please read the [Developer Manuals][devmanual] to learn how to create your first application or how to test the ownCloud code with PHPUnit.
In order to constantly increase the quality of our software we can no longer accept pull request which submit un-tested code.
It is a must have that changed and added code segments are unit tested.
In some areas unit testing is hard (aka almost impossible) as of today - in these areas refactoring WHILE fixing a bug is encouraged to enable unit testing.
### Sign your work
We use the Developer Certificate of Origin (DCO) as a additional safeguard
for the Nextcloud project. This is a well established and widely used
mechanism to assure contributors have confirmed their right to license
their contribution under the project's license.
Please read [contribute/developer-certificate-of-origin][dcofile].
If you can certify it, then just add a line to every git commit message:
````
Signed-off-by: Random J Developer <random@developer.example.org>
````
Use your real name (sorry, no pseudonyms or anonymous contributions).
If you set your `user.name` and `user.email` git configs, you can sign your
commit automatically with `git commit -s`. You can also use git [aliases](https://git-scm.com/book/tr/v2/Git-Basics-Git-Aliases)
like `git config --global alias.ci 'commit -s'`. Now you can commit with
`git ci` and the commit will be signed.
### Apply a license
In case you are not sure how to add or update the license header correctly please have a look at [contribute/HowToApplyALicense.md][applyalicense]
[devmanual]: https://docs.nextcloud.org/server/13/developer_manual/
[dcofile]: https://github.com/nextcloud/server/blob/master/contribute/developer-certificate-of-origin
[applyalicense]: https://github.com/nextcloud/server/blob/master/contribute/HowToApplyALicense.md
[agreement]: https://owncloud.org/about/contributor-agreement/
[devmanual]: https://owncloud.org/dev
## Translations
Please submit translations via [Transifex][transifex].
[transifex]: https://www.transifex.com/nextcloud
[transifex]: https://www.transifex.com/projects/p/owncloud/
View File
+3 -3
View File
@@ -1,5 +1,5 @@
Files in Nextcloud are licensed under the Affero General Public License version 3,
the text of which can be found in COPYING, or any later version of the AGPL,
Files in ownCloud are licensed under the Affero General Public License version 3,
the text of which can be found in COPYING-AGPL, or any later version of the AGPL,
unless otherwise noted.
Licensing of components:
@@ -12,4 +12,4 @@ Licensing of components:
All unmodified files from these and other sources retain their original copyright
and license notices: see the relevant individual files.
Attribution information for Nextcloud is contained in the AUTHORS file.
Attribution information for ownCloud is contained in the AUTHORS file.
+25 -67
View File
@@ -1,80 +1,38 @@
# Nextcloud Server
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
[![irc](https://img.shields.io/badge/IRC-%23nextcloud%20on%20freenode-orange.svg)](https://webchat.freenode.net/?channels=nextcloud)
[![irc](https://img.shields.io/badge/IRC-%23nextcloud--dev%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-dev)
# ownCloud
**A safe home for all your data.**
[ownCloud](http://ownCloud.org) gives you freedom and control over your own data.
A personal cloud which runs on your own server.
![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png)
### Build Status on [Jenkins CI](https://ci.owncloud.org/)
Git master: [![Build Status](https://ci.owncloud.org/job/server-master-linux/badge/icon)](https://ci.owncloud.org/job/server-master-linux/)
## Why is this so awesome?
Quality:
- Scrutinizer: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
- CodeClimate: [![Code Climate](https://codeclimate.com/github/owncloud/core/badges/gpa.svg)](https://codeclimate.com/github/owncloud/core)
* :file_folder: **Access your Data** You can store your files, contacts, calendars and more on a server of your choosing.
* :package: **Sync your Data** You keep your files, contacts, calendars and more synchronized amongst your devices.
* :arrows_counterclockwise: **Share your Data** …by giving others access to the stuff you want them to see or to collaborate with.
* :rocket: **Expandable with dozens of Apps** ...like [Calendar](https://github.com/nextcloud/calendar), [Contacts](https://github.com/nextcloud/contacts), [Mail](https://github.com/nextcloud/mail) and all those you can discover in our [App Store](https://apps.nextcloud.com)
* :lock: **Security** with our encryption mechanisms, [HackerOne bounty program](https://hackerone.com/nextcloud) and two-factor authentication.
Dependencies:
*You want to learn more about how you can use Nextcloud to access, share and protect your files, calendars, contacts, communication & more at home and at your Enterprise?* [**Learn about all our Features**](https://nextcloud.com/features).
[![Dependency Status](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16)
## Get your Nextcloud
[![Dependency Status](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0)
- [**Install** a server by yourself on your own hardware or by using one of our ready to use **Appliances**](https://nextcloud.com/install/#instructions-server)
- [Buy one of the awesome **devices** coming with a preinstalled Nextcloud](https://nextcloud.com/devices/)
- [Find a service **provider** who is hosting Nextcloud for you or your company](https://nextcloud.com/providers/)
*Enterprise? Public Sector or Education user? You may want to have a look into the [**Enterprise Support Subscription**](https://nextcloud.com/enterprise/) provided by the Nextcloud GmbH*
## Get in touch
* :clipboard: [Forum](https://help.nextcloud.com)
* :busts_in_silhouette: [Facebook](https://facebook.com/nextclouders)
* :hatching_chick: [Twitter](https://twitter.com/Nextclouders)
* :elephant: [Mastodon](https://mastodon.xyz/@nextcloud)
[…learn more about how to get support for Nextcloud here!](https://nextcloud.com/support)
## Join the team :family:
### How to contribute
1. [Set up your local development environment](https://docs.nextcloud.com/server/14/developer_manual/general/devenv.html) :rocket:
2. [Pick a good first issue](https://github.com/nextcloud/server/labels/good%20first%20issue) :notebook:
3. Create a branch, a [Pull Request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) and `@mention` the people from the issue :computer:
4. Wait for it to get merged and :tada:
### Installation instructions
https://doc.owncloud.org/server/8.2/developer_manual/app/index.html
### Contribution Guidelines
https://owncloud.org/contribute/
All contributions to this repository from June, 16 2016 on are considered to be
licensed under the AGPLv3 or any later version.
### Get in touch
* [Forum](https://forum.owncloud.org)
* [Mailing list](https://mailman.owncloud.org/mailman/listinfo)
* [IRC channel](https://webchat.freenode.net/?channels=owncloud)
* [Twitter](https://twitter.com/ownClouders)
Nextcloud doesn't require a CLA (Contributor License Agreement).
The copyright belongs to all the individual contributors. Therefore we recommend
that every contributor adds following line to the header of a file, if they
changed it substantially:
### Important notice on translations
Please submit translations via Transifex:
https://www.transifex.com/projects/p/owncloud/
```
@copyright Copyright (c) <year>, <your name> (<your email address>)
```
[![Transifex](https://www.transifex.com/projects/p/owncloud/resource/core/chart/image_png)](https://www.transifex.com/projects/p/owncloud/)
Please read the [Code of Conduct](https://nextcloud.com/community/code-of-conduct/). This document offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
Please review the [guidelines for contributing](https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md) to this repository.
More information how to contribute: [https://nextcloud.com/contribute/](https://nextcloud.com/contribute/)
### Running master checkouts
Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.
Several apps that are included by default in regular releases such as [firstrunwizard](https://github.com/nextcloud/firstrunwizard) or [gallery](https://github.com/nextcloud/gallery) are missing in `master` and have to be installed manually.
That aside Git checkouts can be handled the same as release archives.
Note they should never be used on production systems.
## Tools we use
[![BrowserStack](https://user-images.githubusercontent.com/45821/41675934-61fa3442-74c4-11e8-8c8e-90768c56ba08.png)](https://www.browserstack.com/)
For more detailed information about translations:
http://doc.owncloud.org/server/8.2/developer_manual/core/translation.html
-12
View File
@@ -1,12 +0,0 @@
{
"presets": [
[
"env",
{
"targets": {
"browsers": ["last 2 versions", "not ie <= 11"]
}
}
]
]
}
-9
View File
@@ -1,9 +0,0 @@
root = true
[*]
charset = utf-8
indent_style = tab
indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
-16
View File
@@ -1,16 +0,0 @@
module.exports = {
env: {
browser: true,
es6: true
},
extends: 'eslint:recommended',
parserOptions: {
sourceType: 'module'
},
rules: {
indent: ['error', 'tab'],
'linebreak-style': ['error', 'unix'],
quotes: ['error', 'single'],
semi: ['error', 'always']
}
};
-12
View File
@@ -1,12 +0,0 @@
.DS_Store
node_modules/
dist/
npm-debug.log
yarn-error.log
# Editor directories and files
.idea
*.suo
*.ntvs*
*.njsproj
*.sln
-3
View File
@@ -1,3 +0,0 @@
{
"esversion": 6
}
-26
View File
@@ -1,26 +0,0 @@
all: dev-setup build-js-production
dev-setup: clean clean-dev npm-init
npm-init:
npm install
npm-update:
npm update
build-js:
npm run dev
build-js-production:
npm run build
watch-js:
npm run watch
clean:
rm -f js/accessibility.js
rm -f js/accessibility.js.map
clean-dev:
rm -rf node_modules
-22
View File
@@ -1,22 +0,0 @@
# Accessibility ♿
> This app provide multiple features to ease the use of nextcloud.
## Build Setup
``` bash
# install dependencies
make dev-setup
# build for development
make build-js
# build for development and watch edits
make watch-js
# build for production with minification
make build-js-production
# clean output files
make clean
```
-30
View File
@@ -1,30 +0,0 @@
<?php
declare (strict_types = 1);
/**
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
$app = new \OCA\Accessibility\AppInfo\Application();
// Separate from the constructor since the route are not initialized before that
// 1. create the app
// 2. generate css route and inject
$app->injectCss();
-23
View File
@@ -1,23 +0,0 @@
<?xml version="1.0"?>
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>accessibility</id>
<name>Accessibility</name>
<summary>Accessibility options for nextcloud</summary>
<description><![CDATA[Provides multiple accessibilities options to ease your use of nextcloud]]></description>
<version>1.0.1</version>
<licence>agpl</licence>
<author>John Molakvoæ</author>
<namespace>Accessibility</namespace>
<category>accessibility</category>
<default_enable/>
<dependencies>
<nextcloud min-version="14" max-version="14"/>
</dependencies>
<default_enable/>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<settings>
<personal>OCA\Accessibility\Settings\Personal</personal>
<personal-section>OCA\Accessibility\Settings\PersonalSection</personal-section>
</settings>
</info>
-40
View File
@@ -1,40 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
return [
'routes' => [
['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
],
'ocs' => [
[
'name' => 'Config#getConfig',
'url' => '/api/v1/config',
'verb' => 'GET',
],
[
'name' => 'Config#setConfig',
'url' => '/api/v1/config/{key}',
'verb' => 'POST',
],
]
];
-22
View File
@@ -1,22 +0,0 @@
@font-face {
font-family: 'OpenDyslexic';
font-style: normal;
font-weight: 300;
src: url('../fonts/OpenDyslexic-Regular.woff') format('woff');
}
@font-face {
font-family: 'OpenDyslexic';
font-style: normal;
font-weight: normal;
src: url('../fonts/OpenDyslexic-Regular.woff') format('woff');
}
@font-face {
font-family: 'OpenDyslexic';
font-style: normal;
font-weight: 600;
src: url('../fonts/OpenDyslexic-Bold.woff') format('woff');
}
$font-face: OpenDyslexic, 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
-59
View File
@@ -1,59 +0,0 @@
.preview-list {
display: flex;
flex-wrap: wrap;
}
.preview {
display: flex;
flex-direction: column;
min-width: 250px;
max-width: 400px;
flex: 1 1 300px;
border: 1px solid var(--color-border);
padding: 10px;
border-radius: var(--border-radius);
transition: all 200ms ease-in-out;
filter: drop-shadow(0 1px 2px var(--color-box-shadow));
background-color: var(--color-main-background);
opacity: 0.9;
margin: 10px;
position: relative;
&,
* {
cursor: pointer;
user-select: none;
}
&:hover,
&:focus,
&.selected {
filter: drop-shadow(0 1px 4px var(--color-box-shadow));
opacity: 1;
}
.preview-image {
height: 200px;
background-position: top left;
background-size: cover;
background-repeat: no-repeat;
}
h3 {
display: flex;
justify-content: space-between;
line-height: 1em;
align-items: center;
}
p {
text-align: justify;
}
.icon-checkmark-color {
transition: all 100ms ease-in-out;
border-radius: 1em;
padding: 4px 5px 4px 20px;
background-position: 4px center;
opacity: 0;
visibility: hidden;
}
&.selected .icon-checkmark-color {
opacity: 1;
visibility: visible;
box-shadow: 0 0 0 1px var(--color-success);
}
}
-52
View File
@@ -1,52 +0,0 @@
// SCSS variables
$color-main-text: #d8d8d8;
$color-main-background: #181818;
$color-background-dark: lighten($color-main-background, 4%);
$color-background-darker: lighten($color-main-background, 8%);
$color-text-maxcontrast: darken($color-main-text, 30%);
$color-text-light: darken($color-main-text, 10%);
$color-text-lighter: darken($color-main-text, 20%);
$color-loading-light: #777;
$color-loading-dark: #ccc;
$color-box-shadow: rgba(darken($color-main-background, 70%), 0.5);
$color-border: lighten($color-main-background, 7%);
$color-border-dark: lighten($color-main-background, 14%);
#app-navigation > ul > li > a:first-child,
#app-navigation > ul > li > ul > li > a:first-child,
#expanddiv a {
img {
filter: invert(100%);
}
}
.bubble,
.app-navigation-entry-menu,
.popovermenu {
li {
> button,
> a,
> .menuitem {
> img {
filter: invert(100%);
}
}
}
}
.bubble,
.app-navigation-entry-menu,
.popovermenu,
#header .menu {
border: 1px solid var(--color-border);
}
// since svg icons are inverted, revert to white for the header
.header-right > * {
[class^='icon-'], [class*=' icon-'] {
filter: invert(100%);
}
}
@@ -1,57 +0,0 @@
// Fonts
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: normal;
src: local('Open Sans'), local('OpenSans'),
url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
}
/* overriding default light */
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 300;
src: local('Open Sans'), local('OpenSans'),
url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 500 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'),
url('../../../core/fonts/OpenSans-Bold.woff') format('woff');
}
// SCSS variables
$color-main-text: #000;
$color-main-background: #fff;
$color-background-dark: darken($color-main-background, 30%);
$color-background-darker: darken($color-main-background, 30%);
$color-text-maxcontrast: $color-main-text;
$color-text-light: $color-main-text;
$color-text-lighter: $color-main-text;
$color-loading-light: #ddd;
$color-loading-dark: #000;
$color-box-shadow: $color-main-text;
$color-border: darken($color-main-background, 50%);
$color-border-dark: darken($color-main-background, 50%);
$font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
// Font weight reset
body {
font-weight: 400;
}
[class^='icon-'], [class*=' icon-'],
.action {
opacity: 1 !important;
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-76
View File
@@ -1,76 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg2"
width="16"
height="16"
viewBox="0 0 16 16"
sodipodi:docname="app-dark.svg"
inkscape:version="0.92.2 5c3e80d, 2017-08-06">
<metadata
id="metadata8">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1880"
inkscape:window-height="993"
id="namedview4"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="36.460193"
inkscape:cx="8.4752826"
inkscape:cy="18.273624"
inkscape:window-x="20"
inkscape:window-y="67"
inkscape:window-maximized="0"
inkscape:current-layer="g848"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<g
id="g848"
transform="matrix(1.1307959,0,0,1.0801738,-1.0463882,-0.84269722)"
style="stroke-width:0.90481776;fill:#000000">
<circle
r="1.9587879"
cy="2.8315151"
cx="7.990303"
id="path844"
style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.90481776;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill" />
<path
sodipodi:nodetypes="scsssscsccccczzcccccssssccsscs"
inkscape:connector-curvature="0"
id="path843"
d="m 2.3519709,4.2557871 c -0.3126291,0 -0.4819578,0.1287194 -0.5322266,0.4028321 -0.053173,0.2899914 0.1062609,0.5159057 0.4370117,0.6274414 1.420521,0.4790277 2.4256503,0.6675279 3.8410483,0.9800416 0.327839,0.072385 0.6900295,0.2893751 0.6520998,1.0948483 C 6.6985575,8.451345 6.6372144,9.7041167 6.2631031,11.323353 6.0397526,12.290062 5.6782112,13.622766 5.4305838,14.3922 5.3416728,14.668443 5.281658,14.922355 5.281658,15.031849 c 0,0.08257 0.053443,0.249642 0.097656,0.307617 0.023823,0.03125 0.075039,0.07397 0.1147462,0.09522 0.062879,0.03361 0.096262,0.03787 0.2612304,0.03663 0.3361373,-0.0026 0.4608113,-0.08245 0.6665037,-0.429687 0.4838657,-0.939315 0.7378785,-2.132191 0.9402993,-3.014266 0.092189,-0.517235 0.2624476,-1.66347 0.6710287,-1.66347 0.4085811,0 0.4979093,0.95008 0.6812062,1.687228 0.1832969,0.737148 0.6122738,2.295202 0.7738717,2.704862 0.2137476,0.54186 0.5742238,0.836985 0.8764648,0.717774 0.03316,-0.01301 0.116937,-0.04526 0.187989,-0.0708 0.147435,-0.053 0.186715,-0.07824 0.219726,-0.156249 0.0655,-0.154793 -0.01013,-0.454047 -0.349121,-1.41114 C 9.7721847,11.597192 9.2651806,9.3990255 9.3334308,7.2974743 9.3630343,6.3859259 9.6837054,6.305369 10.075725,6.2075087 c 1.17285,-0.2927798 2.00228,-0.379973 3.387085,-0.8579717 0.468513,-0.1617184 0.727539,-0.2608264 0.727539,-0.5590819 0,-0.2554049 -0.153084,-0.4346541 -0.437011,-0.5102538 -0.116851,-0.031101 -0.318383,-0.028905 -0.632326,0.00243 -1.085189,0.10834 -2.939683,0.5153868 -4.0234365,0.6710819 -0.529944,0.076133 -1.7229392,0.094015 -2.2729489,0 C 5.6763224,4.7574297 4.1363176,4.4147025 2.9061699,4.2997326 2.6560099,4.2763537 2.4068766,4.2557871 2.3519709,4.2557871 Z"
style="fill:#000000;stroke-width:0.9048177" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 4.0 KiB

-76
View File
@@ -1,76 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg2"
width="16"
height="16"
viewBox="0 0 16 16"
sodipodi:docname="app.svg"
inkscape:version="0.92.2 5c3e80d, 2017-08-06">
<metadata
id="metadata8">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1880"
inkscape:window-height="993"
id="namedview4"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="36.460193"
inkscape:cx="8.4752826"
inkscape:cy="18.273624"
inkscape:window-x="20"
inkscape:window-y="67"
inkscape:window-maximized="0"
inkscape:current-layer="g848"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<g
id="g848"
transform="matrix(1.1307959,0,0,1.0801738,-1.0463882,-0.84269722)"
style="stroke-width:0.90481776;fill:#000000">
<circle
r="1.9587879"
cy="2.8315151"
cx="7.990303"
id="path844"
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.90481776;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill" />
<path
sodipodi:nodetypes="scsssscsccccczzcccccssssccsscs"
inkscape:connector-curvature="0"
id="path843"
d="m 2.3519709,4.2557871 c -0.3126291,0 -0.4819578,0.1287194 -0.5322266,0.4028321 -0.053173,0.2899914 0.1062609,0.5159057 0.4370117,0.6274414 1.420521,0.4790277 2.4256503,0.6675279 3.8410483,0.9800416 0.327839,0.072385 0.6900295,0.2893751 0.6520998,1.0948483 C 6.6985575,8.451345 6.6372144,9.7041167 6.2631031,11.323353 6.0397526,12.290062 5.6782112,13.622766 5.4305838,14.3922 5.3416728,14.668443 5.281658,14.922355 5.281658,15.031849 c 0,0.08257 0.053443,0.249642 0.097656,0.307617 0.023823,0.03125 0.075039,0.07397 0.1147462,0.09522 0.062879,0.03361 0.096262,0.03787 0.2612304,0.03663 0.3361373,-0.0026 0.4608113,-0.08245 0.6665037,-0.429687 0.4838657,-0.939315 0.7378785,-2.132191 0.9402993,-3.014266 0.092189,-0.517235 0.2624476,-1.66347 0.6710287,-1.66347 0.4085811,0 0.4979093,0.95008 0.6812062,1.687228 0.1832969,0.737148 0.6122738,2.295202 0.7738717,2.704862 0.2137476,0.54186 0.5742238,0.836985 0.8764648,0.717774 0.03316,-0.01301 0.116937,-0.04526 0.187989,-0.0708 0.147435,-0.053 0.186715,-0.07824 0.219726,-0.156249 0.0655,-0.154793 -0.01013,-0.454047 -0.349121,-1.41114 C 9.7721847,11.597192 9.2651806,9.3990255 9.3334308,7.2974743 9.3630343,6.3859259 9.6837054,6.305369 10.075725,6.2075087 c 1.17285,-0.2927798 2.00228,-0.379973 3.387085,-0.8579717 0.468513,-0.1617184 0.727539,-0.2608264 0.727539,-0.5590819 0,-0.2554049 -0.153084,-0.4346541 -0.437011,-0.5102538 -0.116851,-0.031101 -0.318383,-0.028905 -0.632326,0.00243 -1.085189,0.10834 -2.939683,0.5153868 -4.0234365,0.6710819 -0.529944,0.076133 -1.7229392,0.094015 -2.2729489,0 C 5.6763224,4.7574297 4.1363176,4.4147025 2.9061699,4.2997326 2.6560099,4.2763537 2.4068766,4.2557871 2.3519709,4.2557871 Z"
style="fill:#ffffff;stroke-width:0.9048177" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,83 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Accessibility;
use OCP\IL10N;
use OCP\IURLGenerator;
class AccessibilityProvider {
/** @var string */
protected $appName;
/** @var IURLGenerator */
private $urlGenerator;
/** @var IL10N */
private $l;
/**
* Account constructor.
*
* @param string $appName
* @param IURLGenerator $urlGenerator
* @param IL10N $l
*/
public function __construct(string $appName,
IURLGenerator $urlGenerator,
IL10N $l) {
$this->appName = $appName;
$this->urlGenerator = $urlGenerator;
$this->l = $l;
}
public function getThemes() {
return array(
[
'id' => 'themehighcontrast',
'img' => $this->urlGenerator->imagePath($this->appName, 'theme-highcontrast.jpg'),
'title' => $this->l->t('High contrast theme'),
'text' => $this->l->t('A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased.')
], [
'id' => 'themedark',
'img' => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
'title' => $this->l->t('Dark theme (beta)'),
'text' => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
]
);
}
public function getFonts() {
return array(
[
'id' => 'fontdyslexic',
'img' => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
'title' => $this->l->t('Dyslexia font'),
'text' => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia. The typeface was created by Abelardo Gonzalez, who released it through an open-source license.')
]
);
}
}
@@ -1,65 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Accessibility\AppInfo;
use OCP\AppFramework\App;
use OCP\IConfig;
use OCP\IUserSession;
use OCP\IURLGenerator;
class Application extends App {
/** @var string */
protected $appName = 'accessibility';
/** @var IConfig */
private $config;
/** @var IUserSession */
private $userSession;
/** @var IURLGenerator */
private $urlGenerator;
public function __construct() {
parent::__construct($this->appName);
$this->config = \OC::$server->getConfig();
$this->userSession = \OC::$server->getUserSession();
$this->urlGenerator = \OC::$server->getURLGenerator();
}
public function injectCss() {
// Inject the fake css on all pages if enabled and user is logged
$loggedUser = $this->userSession->getUser();
if (!is_null($loggedUser)) {
$userValues = $this->config->getUserKeys($loggedUser->getUID(), $this->appName);
// we want to check if any theme or font is enabled.
if (count($userValues) > 0) {
$hash = $this->config->getUserValue($loggedUser->getUID(), $this->appName, 'icons-css', md5(implode('-', $userValues)));
$linkToCSS = $this->urlGenerator->linkToRoute($this->appName . '.accessibility.getCss', ['md5' => $hash]);
\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
}
}
}
}
@@ -1,259 +0,0 @@
<?php
declare (strict_types = 1);
/**
* @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Accessibility\Controller;
use Leafo\ScssPhp\Compiler;
use Leafo\ScssPhp\Exception\ParserException;
use Leafo\ScssPhp\Formatter\Crunched;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\App\IAppManager;
use OCP\IConfig;
use OCP\ILogger;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserManager;
use OCP\IUserSession;
use OC\Template\IconsCacher;
class AccessibilityController extends Controller {
/** @var string */
protected $appName;
/** @var string */
protected $serverRoot;
/** @var IConfig */
private $config;
/** @var IUserManager */
private $userManager;
/** @var ILogger */
private $logger;
/** @var IURLGenerator */
private $urlGenerator;
/** @var ITimeFactory */
protected $timeFactory;
/** @var IUserSession */
private $userSession;
/** @var IAppManager */
private $appManager;
/** @var IconsCacher */
protected $iconsCacher;
/** @var \OC_Defaults */
private $defaults;
/** @var null|string */
private $injectedVariables;
/**
* Account constructor.
*
* @param string $appName
* @param IRequest $request
* @param IConfig $config
* @param IUserManager $userManager
* @param ILogger $logger
* @param IURLGenerator $urlGenerator
* @param ITimeFactory $timeFactory
* @param IUserSession $userSession
* @param IAppManager $appManager
* @param \OC_Defaults $defaults
*/
public function __construct(string $appName,
IRequest $request,
IConfig $config,
IUserManager $userManager,
ILogger $logger,
IURLGenerator $urlGenerator,
ITimeFactory $timeFactory,
IUserSession $userSession,
IAppManager $appManager,
IconsCacher $iconsCacher,
\OC_Defaults $defaults) {
parent::__construct($appName, $request);
$this->appName = $appName;
$this->config = $config;
$this->userManager = $userManager;
$this->logger = $logger;
$this->urlGenerator = $urlGenerator;
$this->timeFactory = $timeFactory;
$this->userSession = $userSession;
$this->appManager = $appManager;
$this->iconsCacher = $iconsCacher;
$this->defaults = $defaults;
$this->serverRoot = \OC::$SERVERROOT;
$this->appRoot = $this->appManager->getAppPath($this->appName);
}
/**
* @NoAdminRequired
* @NoCSRFRequired
*
* @return DataDisplayResponse
*/
public function getCss(): DataDisplayResponse {
$css = '';
$imports = '';
$userValues = $this->getUserValues();
foreach ($userValues as $key => $scssFile) {
if ($scssFile !== false) {
$imports .= '@import "' . $scssFile . '";';
}
}
if ($imports !== '') {
$scss = new Compiler();
$scss->setImportPaths([
$this->appRoot . '/css/',
$this->serverRoot . '/core/css/'
]);
// Continue after throw
$scss->setIgnoreErrors(true);
$scss->setFormatter(Crunched::class);
// Import theme, variables and compile css4 variables
try {
$css .= $scss->compile(
$imports .
$this->getInjectedVariables() .
'@import "variables.scss";' .
'@import "css-variables.scss";'
);
} catch (ParserException $e) {
$this->logger->error($e->getMessage(), ['app' => 'core']);
}
}
// We don't want to override vars with url since path is different
$css = $this->filterOutRule('/--[a-z-:]+url\([^;]+\)/mi', $css);
// Rebase all urls
$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
$css = $this->rebaseUrls($css, $appWebRoot . '/css');
if (in_array('themedark', $userValues) && $this->iconsCacher->getCachedCSS() && $this->iconsCacher->getCachedCSS()->getSize() > 0) {
$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedCSS()->getContent());
$css = $css . $iconsCss;
}
$response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
// Set cache control
$ttl = 31536000;
$response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
$expires = new \DateTime();
$expires->setTimestamp($this->timeFactory->getTime());
$expires->add(new \DateInterval('PT' . $ttl . 'S'));
$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$response->addHeader('Pragma', 'cache');
// store current cache hash
$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
return $response;
}
/**
* Return an array with the user theme & font settings
*
* @return array
*/
private function getUserValues(): array{
$userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
$userFont = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
return [$userTheme, $userFont];
}
/**
* Remove all matches from the $rule regex
*
* @param string $rule regex to match
* @param string $css string to parse
* @return string
*/
private function filterOutRule(string $rule, string $css): string {
return preg_replace($rule, '', $css);
}
/**
* Add the correct uri prefix to make uri valid again
*
* @param string $css
* @param string $webDir
* @return string
*/
private function rebaseUrls(string $css, string $webDir): string {
$re = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
$subst = 'url(\'' . $webDir . '/$1\')';
return preg_replace($re, $subst, $css);
}
/**
* Remove all matches from the $rule regex
*
* @param string $css string to parse
* @return string
*/
private function invertSvgIconsColor(string $css) {
return str_replace(['/000', '/fff', '/***'], ['/***', '/000', '/fff'], $css);
}
/**
* @return string SCSS code for variables from OC_Defaults
*/
private function getInjectedVariables(): string {
if ($this->injectedVariables !== null) {
return $this->injectedVariables;
}
$variables = '';
foreach ($this->defaults->getScssVariables() as $key => $value) {
$variables .= '$' . $key . ': ' . $value . ';';
}
// check for valid variables / otherwise fall back to defaults
try {
$scss = new Compiler();
$scss->compile($variables);
$this->injectedVariables = $variables;
} catch (ParserException $e) {
$this->logger->error($e, ['app' => 'core']);
}
return $variables;
}
}
@@ -1,133 +0,0 @@
<?php
declare (strict_types = 1);
/**
* @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Accessibility\Controller;
use OCA\Accessibility\AccessibilityProvider;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
use OCP\AppFramework\OCS\OCSBadRequestException;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IUserSession;
class ConfigController extends OCSController {
/** @var string */
protected $appName;
/** @var string */
protected $userId;
/** @var string */
protected $serverRoot;
/** @var IConfig */
private $config;
/** @var IUserSession */
private $userSession;
/** @var AccessibilityProvider */
private $accessibilityProvider;
/**
* Config constructor.
*
* @param string $appName
* @param IRequest $request
* @param IConfig $config
* @param IUserSession $userSession
* @param AccessibilityProvider $accessibilityProvider
*/
public function __construct(string $appName,
IRequest $request,
IConfig $config,
IUserSession $userSession,
AccessibilityProvider $accessibilityProvider) {
parent::__construct($appName, $request);
$this->appName = $appName;
$this->config = $config;
$this->userSession = $userSession;
$this->accessibilityProvider = $accessibilityProvider;
$this->userId = $userSession->getUser()->getUID();
}
/**
* @NoAdminRequired
*
* Get user accessibility config
*
* @param string $key theme or font
* @return DataResponse
*/
public function getConfig(): DataResponse {
return new DataResponse([
'theme' => $this->config->getUserValue($this->userId, $this->appName, 'theme', false),
'font' => $this->config->getUserValue($this->userId, $this->appName, 'font', false)
]);
}
/**
* @NoAdminRequired
*
* Set theme or font config
*
* @param string $key theme or font
* @return DataResponse
* @throws Exception
*/
public function setConfig(string $key, $value): DataResponse {
if ($key === 'theme' || $key === 'font') {
if ($value === false) {
$this->config->deleteUserValue($this->userId, $this->appName, $key);
$userValues = $this->config->getUserKeys($this->userId, $this->appName);
// remove hash if no settings selected
if (count($userValues) === 1 && $userValues[0] === 'icons-css') {
$this->config->deleteUserValue($this->userId, $this->appName, 'icons-css');
}
return new DataResponse();
}
$themes = $this->accessibilityProvider->getThemes();
$fonts = $this->accessibilityProvider->getFonts();
$availableOptions = array_map(function($option) {
return $option['id'];
}, array_merge($themes, $fonts));
if (in_array($value, $availableOptions)) {
$this->config->setUserValue($this->userId, $this->appName, $key, $value);
return new DataResponse();
}
throw new OCSBadRequestException('Invalid value: ' . $value);
}
throw new OCSBadRequestException('Invalid key: ' . $key);
}
}
@@ -1,113 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Accessibility\Settings;
use OCA\Accessibility\AccessibilityProvider;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\Settings\ISettings;
class Personal implements ISettings {
/** @var string */
protected $appName;
/** @var IConfig */
private $config;
/** @var IUserSession */
private $userSession;
/** @var IL10N */
private $l;
/** @var IURLGenerator */
private $urlGenerator;
/** @var AccessibilityProvider */
private $accessibilityProvider;
/**
* Settings constructor.
*
* @param string $appName
* @param IConfig $config
* @param IUserSession $userSession
* @param IL10N $l
* @param IURLGenerator $urlGenerator
* @param AccessibilityProvider $accessibilityProvider
*/
public function __construct(string $appName,
IConfig $config,
IUserSession $userSession,
IL10N $l,
IURLGenerator $urlGenerator,
AccessibilityProvider $accessibilityProvider) {
$this->appName = $appName;
$this->config = $config;
$this->userSession = $userSession;
$this->l = $l;
$this->urlGenerator = $urlGenerator;
$this->accessibilityProvider = $accessibilityProvider;
}
/**
* @return TemplateResponse returns the instance with all parameters set, ready to be rendered
* @since 9.1
*/
public function getForm() {
$serverData = [
'themes' => $this->accessibilityProvider->getThemes(),
'fonts' => $this->accessibilityProvider->getFonts(),
'theme' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
'font' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
];
return new TemplateResponse($this->appName, 'settings-personal', ['serverData' => $serverData]);
}
/**
* @return string the section ID, e.g. 'sharing'
* @since 9.1
*/
public function getSection() {
return $this->appName;
}
/**
* @return int whether the form should be rather on the top or bottom of
* the admin section. The forms are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
*
* E.g.: 70
* @since 9.1
*/
public function getPriority() {
return 40;
}
}
@@ -1,100 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Accessibility\Settings;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Settings\IIconSection;
class PersonalSection implements IIconSection {
/** @var string */
protected $appName;
/** @var IURLGenerator */
private $urlGenerator;
/** @var IL10N */
private $l;
/**
* Personal Section constructor.
*
* @param string $appName
* @param IURLGenerator $urlGenerator
* @param IL10N $l
*/
public function __construct(string $appName,
IURLGenerator $urlGenerator,
IL10N $l) {
$this->appName = $appName;
$this->urlGenerator = $urlGenerator;
$this->l = $l;
}
/**
* returns the relative path to an 16*16 icon describing the section.
* e.g. '/core/img/places/files.svg'
*
* @returns string
* @since 13.0.0
*/
public function getIcon() {
return $this->urlGenerator->imagePath($this->appName, 'app-dark.svg');
}
/**
* returns the ID of the section. It is supposed to be a lower case string,
* e.g. 'ldap'
*
* @returns string
* @since 9.1
*/
public function getID() {
return $this->appName;
}
/**
* returns the translated name as it should be displayed, e.g. 'LDAP / AD
* integration'. Use the L10N service to translate it.
*
* @return string
* @since 9.1
*/
public function getName() {
return $this->l->t('Accessibility');
}
/**
* @return int whether the form should be rather on the top or bottom of
* the settings navigation. The sections are arranged in ascending order of
* the priority values. It is required to return a value between 0 and 99.
*
* E.g.: 70
* @since 9.1
*/
public function getPriority() {
return 15;
}
}
File diff suppressed because it is too large Load Diff
-33
View File
@@ -1,33 +0,0 @@
{
"name": "accessibility",
"description": "Provides multiple accessibilities options to ease your use of nextcloud",
"version": "1.0.2",
"author": "John Molakvoæ <skjnldsv@protonmail.com>",
"license": "agpl",
"private": true,
"scripts": {
"dev": "webpack --config webpack.dev.js",
"watch": "webpack --progress --watch --config webpack.dev.js",
"build": "webpack --progress --hide-modules --config webpack.prod.js"
},
"dependencies": {
"axios": "^0.18.1",
"vue": "^2.5.16"
},
"browserslist": [
"last 2 versions",
"not ie <= 11"
],
"devDependencies": {
"babel-core": "^6.26.3",
"babel-loader": "^7.1.5",
"babel-preset-env": "^1.7.0",
"css-loader": "^1.0.0",
"file-loader": "^1.1.11",
"vue-loader": "^15.2.6",
"vue-template-compiler": "^2.5.16",
"webpack": "^4.16.1",
"webpack-cli": "^3.1.0",
"webpack-merge": "^4.1.3"
}
}
-116
View File
@@ -1,116 +0,0 @@
<template>
<div id="accessibility">
<div id="themes" class="section">
<h2>{{t('accessibility', 'Themes')}}</h2>
<div class="themes-list preview-list">
<preview v-for="preview in themes" :preview="preview"
:key="preview.id" :selected="selected.theme"
v-on:select="selectTheme"></preview>
</div>
</div>
<div id="fonts" class="section">
<h2>{{t('accessibility', 'Fonts')}}</h2>
<div class="fonts-list preview-list">
<preview v-for="preview in fonts" :preview="preview"
:key="preview.id" :selected="selected.font"
v-on:select="selectFont"></preview>
</div>
</div>
</div>
</template>
<script>
import preview from './components/itemPreview';
import axios from 'axios';
export default {
name: 'Accessibility',
components: { preview },
beforeMount() {
// importing server data into the app
const serverDataElmt = document.getElementById('serverData');
if (serverDataElmt !== null) {
this.serverData = JSON.parse(
document.getElementById('serverData').dataset.server
);
}
},
data() {
return {
serverData: []
};
},
computed: {
themes() {
return this.serverData.themes;
},
fonts() {
return this.serverData.fonts;
},
selected() {
return {
theme: this.serverData.theme,
font: this.serverData.font
};
},
tokenHeaders() {
return { headers: { requesttoken: OC.requestToken } };
}
},
methods: {
selectTheme(id) {
this.selectItem('theme', id);
},
selectFont(id) {
this.selectItem('font', id);
},
/**
* Commit a change and force reload css
* Fetching the file again will trigger the server update
*
* @param {string} type type of the change (font or theme)
* @param {string} id the data of the change
*/
selectItem(type, id) {
axios.post(
OC.linkToOCS('apps/accessibility/api/v1/config', 2) + type,
{ value: id },
this.tokenHeaders
)
.then(response => {
this.serverData[type] = id;
// Remove old link
let link = document.querySelector('link[rel=stylesheet][href*=accessibility][href*=user-]');
if (!link) {
// insert new css
let link = document.createElement('link');
link.rel = 'stylesheet';
link.href = OC.generateUrl('/apps/accessibility/css/user-style.css') + '?v=' + new Date().getTime();
document.head.appendChild(link);
} else {
// compare arrays
if (
JSON.stringify(Object.values(this.selected)) ===
JSON.stringify([false, false])
) {
// if nothing is selected, blindly remove the css
link.remove();
} else {
// force update
link.href =
link.href.split('?')[0] +
'?v=' +
new Date().getTime();
}
}
})
.catch(err => {
console.log(err, err.response);
OC.Notification.showTemporary(t('accessibility', err.response.data.ocs.meta.message + '. Unable to apply the setting.'));
});
}
}
};
</script>
@@ -1,27 +0,0 @@
<template>
<a :class="{preview: true, selected: preview.id === selected}"
href="#" @click="selectItem">
<div class="preview-image" :style="{backgroundImage: 'url(' + preview.img + ')'}"></div>
<h3>
<span>{{preview.title}}</span>
<div class="icon-checkmark-color">{{t('accessibility', 'enabled')}}</div>
</h3>
<p>{{preview.text}}</p>
</a>
</template>
<script>
export default {
name: 'itemPreview',
props: ['preview', 'selected'],
methods: {
selectItem() {
this.$emit(
'select',
// if we clicked the already selected one: disable it
this.preview.id === this.selected ? false : this.preview.id
);
}
}
};
</script>
-12
View File
@@ -1,12 +0,0 @@
import Vue from 'vue';
import App from './App.vue';
/* global t */
// bind to window
Vue.prototype.OC = OC;
Vue.prototype.t = t;
new Vue({
el: '#accessibility',
render: h => h(App)
});
@@ -1,29 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
script('accessibility', 'accessibility');
style('accessibility', 'style');
?>
<span id="serverData" data-server="<?php p(json_encode($_['serverData']));?>"></span>
<span id="accessibility"></span>
-42
View File
@@ -1,42 +0,0 @@
const path = require('path');
const { VueLoaderPlugin } = require('vue-loader');
module.exports = {
entry: path.join(__dirname, 'src', 'main.js'),
output: {
path: path.resolve(__dirname, './js'),
publicPath: '/js/',
filename: 'accessibility.js'
},
module: {
rules: [
{
test: /\.css$/,
use: ['vue-style-loader', 'css-loader']
},
{
test: /\.vue$/,
loader: 'vue-loader'
},
{
test: /\.js$/,
loader: 'babel-loader',
exclude: /node_modules/
},
{
test: /\.(png|jpg|gif|svg)$/,
loader: 'file-loader',
options: {
name: '[name].[ext]?[hash]'
}
}
]
},
plugins: [new VueLoaderPlugin()],
resolve: {
alias: {
vue$: 'vue/dist/vue.esm.js'
},
extensions: ['*', '.js', '.vue', '.json']
}
};
-12
View File
@@ -1,12 +0,0 @@
const merge = require('webpack-merge');
const common = require('./webpack.common.js');
module.exports = merge(common, {
mode: 'development',
devServer: {
historyApiFallback: true,
noInfo: true,
overlay: true
},
devtool: '#eval-source-map'
});
-7
View File
@@ -1,7 +0,0 @@
const merge = require('webpack-merge');
const common = require('./webpack.common.js');
module.exports = merge(common, {
mode: 'production',
devtool: '#source-map'
});
-28
View File
@@ -1,28 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
$app = new \OCA\AdminAudit\AppInfo\Application();
$app->register();
-23
View File
@@ -1,23 +0,0 @@
<?xml version="1.0"?>
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>admin_audit</id>
<name>Auditing / Logging</name>
<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
<version>1.4.0</version>
<licence>agpl</licence>
<author>Nextcloud</author>
<namespace>AdminAudit</namespace>
<types>
<logging/>
</types>
<category>monitoring</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="14" max-version="14" />
</dependencies>
<background-jobs>
<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>
</background-jobs>
</info>
-7
View File
@@ -1,7 +0,0 @@
<?php
// autoload.php @generated by Composer
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitAdminAudit::getLoader();
-13
View File
@@ -1,13 +0,0 @@
{
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
"classmap-authoritative": true,
"autoloader-suffix": "AdminAudit"
},
"autoload" : {
"psr-4": {
"OCA\\AdminAudit\\": "../lib/"
}
}
}
@@ -1,445 +0,0 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Autoload;
/**
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
* // register classes with namespaces
* $loader->add('Symfony\Component', __DIR__.'/component');
* $loader->add('Symfony', __DIR__.'/framework');
*
* // activate the autoloader
* $loader->register();
*
* // to enable searching the include path (eg. for PEAR packages)
* $loader->setUseIncludePath(true);
*
* In this example, if you try to use a class in the Symfony\Component
* namespace or one of its children (Symfony\Component\Console for instance),
* the autoloader will first look for the class under the component/
* directory, and it will then fallback to the framework/ directory if not
* found before giving up.
*
* This class is loosely based on the Symfony UniversalClassLoader.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
// PSR-4
private $prefixLengthsPsr4 = array();
private $prefixDirsPsr4 = array();
private $fallbackDirsPsr4 = array();
// PSR-0
private $prefixesPsr0 = array();
private $fallbackDirsPsr0 = array();
private $useIncludePath = false;
private $classMap = array();
private $classMapAuthoritative = false;
private $missingClasses = array();
private $apcuPrefix;
public function getPrefixes()
{
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
}
return array();
}
public function getPrefixesPsr4()
{
return $this->prefixDirsPsr4;
}
public function getFallbackDirs()
{
return $this->fallbackDirsPsr0;
}
public function getFallbackDirsPsr4()
{
return $this->fallbackDirsPsr4;
}
public function getClassMap()
{
return $this->classMap;
}
/**
* @param array $classMap Class to filename map
*/
public function addClassMap(array $classMap)
{
if ($this->classMap) {
$this->classMap = array_merge($this->classMap, $classMap);
} else {
$this->classMap = $classMap;
}
}
/**
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 root directories
* @param bool $prepend Whether to prepend the directories
*/
public function add($prefix, $paths, $prepend = false)
{
if (!$prefix) {
if ($prepend) {
$this->fallbackDirsPsr0 = array_merge(
(array) $paths,
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
(array) $paths
);
}
return;
}
$first = $prefix[0];
if (!isset($this->prefixesPsr0[$first][$prefix])) {
$this->prefixesPsr0[$first][$prefix] = (array) $paths;
return;
}
if ($prepend) {
$this->prefixesPsr0[$first][$prefix] = array_merge(
(array) $paths,
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
(array) $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
(array) $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
// Register directories for a new namespace.
$length = strlen($prefix);
if ('\\' !== $prefix[$length - 1]) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
(array) $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 base directories
*/
public function set($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr0 = (array) $paths;
} else {
$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
}
}
/**
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*/
public function setPsr4($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr4 = (array) $paths;
} else {
$length = strlen($prefix);
if ('\\' !== $prefix[$length - 1]) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
}
}
/**
* Turns on searching the include path for class files.
*
* @param bool $useIncludePath
*/
public function setUseIncludePath($useIncludePath)
{
$this->useIncludePath = $useIncludePath;
}
/**
* Can be used to check if the autoloader uses the include path to check
* for classes.
*
* @return bool
*/
public function getUseIncludePath()
{
return $this->useIncludePath;
}
/**
* Turns off searching the prefix and fallback directories for classes
* that have not been registered with the class map.
*
* @param bool $classMapAuthoritative
*/
public function setClassMapAuthoritative($classMapAuthoritative)
{
$this->classMapAuthoritative = $classMapAuthoritative;
}
/**
* Should class lookup fail if not found in the current class map?
*
* @return bool
*/
public function isClassMapAuthoritative()
{
return $this->classMapAuthoritative;
}
/**
* APCu prefix to use to cache found/not-found classes, if the extension is enabled.
*
* @param string|null $apcuPrefix
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
}
/**
* The APCu prefix in use, or null if APCu caching is not enabled.
*
* @return string|null
*/
public function getApcuPrefix()
{
return $this->apcuPrefix;
}
/**
* Registers this instance as an autoloader.
*
* @param bool $prepend Whether to prepend the autoloader or not
*/
public function register($prepend = false)
{
spl_autoload_register(array($this, 'loadClass'), true, $prepend);
}
/**
* Unregisters this instance as an autoloader.
*/
public function unregister()
{
spl_autoload_unregister(array($this, 'loadClass'));
}
/**
* Loads the given class or interface.
*
* @param string $class The name of the class
* @return bool|null True if loaded, null otherwise
*/
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
includeFile($file);
return true;
}
}
/**
* Finds the path to the file where the class is defined.
*
* @param string $class The name of the class
*
* @return string|false The path if found, false otherwise
*/
public function findFile($class)
{
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false;
}
if (null !== $this->apcuPrefix) {
$file = apcu_fetch($this->apcuPrefix.$class, $hit);
if ($hit) {
return $file;
}
}
$file = $this->findFileWithExtension($class, '.php');
// Search for Hack files if we are running on HHVM
if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh');
}
if (null !== $this->apcuPrefix) {
apcu_add($this->apcuPrefix.$class, $file);
}
if (false === $file) {
// Remember that this class does not exist.
$this->missingClasses[$class] = true;
}
return $file;
}
private function findFileWithExtension($class, $ext)
{
// PSR-4 lookup
$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
$first = $class[0];
if (isset($this->prefixLengthsPsr4[$first])) {
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
if (file_exists($file = $dir . $pathEnd)) {
return $file;
}
}
}
}
}
// PSR-4 fallback dirs
foreach ($this->fallbackDirsPsr4 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
return $file;
}
}
// PSR-0 lookup
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
} else {
// PEAR-like class name
$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
}
if (isset($this->prefixesPsr0[$first])) {
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
}
}
}
// PSR-0 fallback dirs
foreach ($this->fallbackDirsPsr0 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
// PSR-0 include paths.
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
return false;
}
}
/**
* Scope isolated include.
*
* Prevents access to $this/self from included files.
*/
function includeFile($file)
{
include $file;
}
@@ -1,21 +0,0 @@
Copyright (c) Nils Adermann, Jordi Boggiano
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
@@ -1,22 +0,0 @@
<?php
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir;
return array(
'OCA\\AdminAudit\\Actions\\Action' => $baseDir . '/../lib/Actions/Action.php',
'OCA\\AdminAudit\\Actions\\AppManagement' => $baseDir . '/../lib/Actions/AppManagement.php',
'OCA\\AdminAudit\\Actions\\Auth' => $baseDir . '/../lib/Actions/Auth.php',
'OCA\\AdminAudit\\Actions\\Console' => $baseDir . '/../lib/Actions/Console.php',
'OCA\\AdminAudit\\Actions\\Files' => $baseDir . '/../lib/Actions/Files.php',
'OCA\\AdminAudit\\Actions\\GroupManagement' => $baseDir . '/../lib/Actions/GroupManagement.php',
'OCA\\AdminAudit\\Actions\\Security' => $baseDir . '/../lib/Actions/Security.php',
'OCA\\AdminAudit\\Actions\\Sharing' => $baseDir . '/../lib/Actions/Sharing.php',
'OCA\\AdminAudit\\Actions\\Trashbin' => $baseDir . '/../lib/Actions/Trashbin.php',
'OCA\\AdminAudit\\Actions\\UserManagement' => $baseDir . '/../lib/Actions/UserManagement.php',
'OCA\\AdminAudit\\Actions\\Versions' => $baseDir . '/../lib/Actions/Versions.php',
'OCA\\AdminAudit\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => $baseDir . '/../lib/BackgroundJobs/Rotate.php',
);
@@ -1,9 +0,0 @@
<?php
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir;
return array(
);
@@ -1,10 +0,0 @@
<?php
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir;
return array(
'OCA\\AdminAudit\\' => array($baseDir . '/../lib'),
);
@@ -1,43 +0,0 @@
<?php
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitAdminAudit
{
private static $loader;
public static function loadClassLoader($class)
{
if ('Composer\Autoload\ClassLoader' === $class) {
require __DIR__ . '/ClassLoader.php';
}
}
public static function getLoader()
{
if (null !== self::$loader) {
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
}
}
$loader->setClassMapAuthoritative(true);
$loader->register(true);
return $loader;
}
}
@@ -1,48 +0,0 @@
<?php
// autoload_static.php @generated by Composer
namespace Composer\Autoload;
class ComposerStaticInitAdminAudit
{
public static $prefixLengthsPsr4 = array (
'O' =>
array (
'OCA\\AdminAudit\\' => 15,
),
);
public static $prefixDirsPsr4 = array (
'OCA\\AdminAudit\\' =>
array (
0 => __DIR__ . '/..' . '/../lib',
),
);
public static $classMap = array (
'OCA\\AdminAudit\\Actions\\Action' => __DIR__ . '/..' . '/../lib/Actions/Action.php',
'OCA\\AdminAudit\\Actions\\AppManagement' => __DIR__ . '/..' . '/../lib/Actions/AppManagement.php',
'OCA\\AdminAudit\\Actions\\Auth' => __DIR__ . '/..' . '/../lib/Actions/Auth.php',
'OCA\\AdminAudit\\Actions\\Console' => __DIR__ . '/..' . '/../lib/Actions/Console.php',
'OCA\\AdminAudit\\Actions\\Files' => __DIR__ . '/..' . '/../lib/Actions/Files.php',
'OCA\\AdminAudit\\Actions\\GroupManagement' => __DIR__ . '/..' . '/../lib/Actions/GroupManagement.php',
'OCA\\AdminAudit\\Actions\\Security' => __DIR__ . '/..' . '/../lib/Actions/Security.php',
'OCA\\AdminAudit\\Actions\\Sharing' => __DIR__ . '/..' . '/../lib/Actions/Sharing.php',
'OCA\\AdminAudit\\Actions\\Trashbin' => __DIR__ . '/..' . '/../lib/Actions/Trashbin.php',
'OCA\\AdminAudit\\Actions\\UserManagement' => __DIR__ . '/..' . '/../lib/Actions/UserManagement.php',
'OCA\\AdminAudit\\Actions\\Versions' => __DIR__ . '/..' . '/../lib/Actions/Versions.php',
'OCA\\AdminAudit\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => __DIR__ . '/..' . '/../lib/BackgroundJobs/Rotate.php',
);
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitAdminAudit::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitAdminAudit::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitAdminAudit::$classMap;
}, null, ClassLoader::class);
}
}
-91
View File
@@ -1,91 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
use OCP\ILogger;
class Action {
/** @var ILogger */
private $logger;
/**
* @param ILogger $logger
*/
public function __construct(ILogger $logger) {
$this->logger = $logger;
}
/**
* Log a single action with a log level of info
*
* @param string $text
* @param array $params
* @param array $elements
* @param bool $obfuscateParameters
*/
public function log(string $text,
array $params,
array $elements,
bool $obfuscateParameters = false) {
foreach($elements as $element) {
if(!isset($params[$element])) {
if ($obfuscateParameters) {
$this->logger->critical(
'$params["'.$element.'"] was missing.',
['app' => 'admin_audit']
);
} else {
$this->logger->critical(
sprintf(
'$params["'.$element.'"] was missing. Transferred value: %s',
print_r($params, true)
),
['app' => 'admin_audit']
);
}
return;
}
}
$replaceArray = [];
foreach($elements as $element) {
if($params[$element] instanceof \DateTime) {
$params[$element] = $params[$element]->format('Y-m-d H:i:s');
}
$replaceArray[] = $params[$element];
}
$this->logger->info(
vsprintf(
$text,
$replaceArray
),
[
'app' => 'admin_audit'
]
);
}
}
@@ -1,59 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
class AppManagement extends Action {
/**
* @param string $appName
*/
public function enableApp(string $appName) {
$this->log('App "%s" enabled',
['app' => $appName],
['app']
);
}
/**
* @param string $appName
* @param string[] $groups
*/
public function enableAppForGroups(string $appName, array $groups) {
$this->log('App "%s" enabled for groups: %s',
['app' => $appName, 'groups' => implode(', ', $groups)],
['app', 'groups']
);
}
/**
* @param string $appName
*/
public function disableApp(string $appName) {
$this->log('App "%s" disabled',
['app' => $appName],
['app']
);
}
}
-63
View File
@@ -1,63 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
/**
* Class Auth logs all auth related actions
*
* @package OCA\AdminAudit\Actions
*/
class Auth extends Action {
public function loginAttempt(array $params) {
$this->log(
'Login attempt: "%s"',
$params,
[
'uid',
],
true
);
}
public function loginSuccessful(array $params) {
$this->log(
'Login successful: "%s"',
$params,
[
'uid',
],
true
);
}
public function logout(array $params) {
$this->log(
'Logout occurred',
[],
[]
);
}
}
-46
View File
@@ -1,46 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
class Console extends Action {
/**
* @param $arguments
*/
public function runCommand(array $arguments) {
if ($arguments[1] === '_completion') {
// Don't log autocompletion
return;
}
// Remove `./occ`
array_shift($arguments);
$this->log('Console command executed: %s',
['arguments' => implode(' ', $arguments)],
['arguments']
);
}
}
-167
View File
@@ -1,167 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
/**
* Class Files logs the actions to files
*
* @package OCA\AdminAudit\Actions
*/
class Files extends Action {
/**
* Logs file read actions
*
* @param array $params
*/
public function read(array $params) {
$this->log(
'File accessed: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs rename actions of files
*
* @param array $params
*/
public function rename(array $params) {
$this->log(
'File renamed: "%s" to "%s"',
$params,
[
'oldpath',
'newpath',
]
);
}
/**
* Logs creation of files
*
* @param array $params
*/
public function create(array $params) {
if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
return;
}
$this->log(
'File created: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs copying of files
*
* @param array $params
*/
public function copy(array $params) {
$this->log(
'File copied: "%s" to "%s"',
$params,
[
'oldpath',
'newpath',
]
);
}
/**
* Logs writing of files
*
* @param array $params
*/
public function write(array $params) {
if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
return;
}
$this->log(
'File written to: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs update of files
*
* @param array $params
*/
public function update(array $params) {
$this->log(
'File updated: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs deletions of files
*
* @param array $params
*/
public function delete(array $params) {
$this->log(
'File deleted: "%s"',
$params,
[
'path',
]
);
}
/**
* Logs preview access to a file
*
* @param array $params
*/
public function preview(array $params) {
$this->log(
'Preview accessed: "%s" (width: "%s", height: "%s" crop: "%s", mode: "%s")',
$params,
[
'path',
'width',
'height',
'crop',
'mode'
]
);
}
}
@@ -1,108 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Roger Szabo <roger.szabo@web.de>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
use OCP\IGroup;
use OCP\IUser;
/**
* Class GroupManagement logs all group manager related events
*
* @package OCA\AdminAudit\Actions
*/
class GroupManagement extends Action {
/**
* log add user to group event
*
* @param IGroup $group
* @param IUser $user
*/
public function addUser(IGroup $group, IUser $user) {
$this->log('User "%s" added to group "%s"',
[
'group' => $group->getGID(),
'user' => $user->getUID()
],
[
'user', 'group'
]
);
}
/**
* log remove user from group event
*
* @param IGroup $group
* @param IUser $user
*/
public function removeUser(IGroup $group, IUser $user) {
$this->log('User "%s" removed from group "%s"',
[
'group' => $group->getGID(),
'user' => $user->getUID()
],
[
'user', 'group'
]
);
}
/**
* log create group to group event
*
* @param IGroup $group
*/
public function createGroup(IGroup $group) {
$this->log('Group created: "%s"',
[
'group' => $group->getGID()
],
[
'group'
]
);
}
/**
* log delete group to group event
*
* @param IGroup $group
*/
public function deleteGroup(IGroup $group) {
$this->log('Group deleted: "%s"',
[
'group' => $group->getGID()
],
[
'group'
]
);
}
}
-75
View File
@@ -1,75 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2018 Roeland Jago Douma <roeland@famdouma.nl>
*
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
use OCP\IUser;
/**
* Class Sharing logs the sharing actions
*
* @package OCA\AdminAudit\Actions
*/
class Security extends Action {
/**
* Log twofactor auth enabled
*
* @param IUser $user
* @param array $params
*/
public function twofactorFailed(IUser $user, array $params) {
$params['uid'] = $user->getUID();
$params['displayName'] = $user->getDisplayName();
$this->log(
'Failed two factor attempt by user %s (%s) with provider %s',
$params,
[
'displayName',
'uid',
'provider',
]
);
}
/**
* Logs unsharing of data
*
* @param IUser $user
* @param array $params
*/
public function twofactorSuccess(IUser $user, array $params) {
$params['uid'] = $user->getUID();
$params['displayName'] = $user->getDisplayName();
$this->log(
'Successful two factor attempt by user %s (%s) with provider %s',
$params,
[
'displayName',
'uid',
'provider',
]
);
}
}
-221
View File
@@ -1,221 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
use OCP\Share;
/**
* Class Sharing logs the sharing actions
*
* @package OCA\AdminAudit\Actions
*/
class Sharing extends Action {
/**
* Logs sharing of data
*
* @param array $params
*/
public function shared(array $params) {
if($params['shareType'] === Share::SHARE_TYPE_LINK) {
$this->log(
'The %s "%s" with ID "%s" has been shared via link with permissions "%s" (Share ID: %s)',
$params,
[
'itemType',
'itemTarget',
'itemSource',
'permissions',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_USER) {
$this->log(
'The %s "%s" with ID "%s" has been shared to the user "%s" with permissions "%s" (Share ID: %s)',
$params,
[
'itemType',
'itemTarget',
'itemSource',
'shareWith',
'permissions',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_GROUP) {
$this->log(
'The %s "%s" with ID "%s" has been shared to the group "%s" with permissions "%s" (Share ID: %s)',
$params,
[
'itemType',
'itemTarget',
'itemSource',
'shareWith',
'permissions',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_ROOM) {
$this->log(
'The %s "%s" with ID "%s" has been shared to the room "%s" with permissions "%s" (Share ID: %s)',
$params,
[
'itemType',
'itemTarget',
'itemSource',
'shareWith',
'permissions',
'id',
]
);
}
}
/**
* Logs unsharing of data
*
* @param array $params
*/
public function unshare(array $params) {
if($params['shareType'] === Share::SHARE_TYPE_LINK) {
$this->log(
'The %s "%s" with ID "%s" has been unshared (Share ID: %s)',
$params,
[
'itemType',
'fileTarget',
'itemSource',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_USER) {
$this->log(
'The %s "%s" with ID "%s" has been unshared from the user "%s" (Share ID: %s)',
$params,
[
'itemType',
'fileTarget',
'itemSource',
'shareWith',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_GROUP) {
$this->log(
'The %s "%s" with ID "%s" has been unshared from the group "%s" (Share ID: %s)',
$params,
[
'itemType',
'fileTarget',
'itemSource',
'shareWith',
'id',
]
);
} elseif($params['shareType'] === Share::SHARE_TYPE_ROOM) {
$this->log(
'The %s "%s" with ID "%s" has been unshared from the room "%s" (Share ID: %s)',
$params,
[
'itemType',
'fileTarget',
'itemSource',
'shareWith',
'id',
]
);
}
}
/**
* Logs the updating of permission changes for shares
*
* @param array $params
*/
public function updatePermissions(array $params) {
$this->log(
'The permissions of the shared %s "%s" with ID "%s" have been changed to "%s"',
$params,
[
'itemType',
'path',
'itemSource',
'permissions',
]
);
}
/**
* Logs the password changes for a share
*
* @param array $params
*/
public function updatePassword(array $params) {
$this->log(
'The password of the publicly shared %s "%s" with ID "%s" has been changed',
$params,
[
'itemType',
'token',
'itemSource',
]
);
}
/**
* Logs the expiration date changes for a share
*
* @param array $params
*/
public function updateExpirationDate(array $params) {
$this->log(
'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
$params,
[
'itemType',
'itemSource',
'date',
]
);
}
/**
* Logs access of shared files
*
* @param array $params
*/
public function shareAccessed(array $params) {
$this->log(
'The shared %s with the token "%s" by "%s" has been accessed.',
$params,
[
'itemType',
'token',
'uidOwner',
]
);
}
}
-43
View File
@@ -1,43 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
class Trashbin extends Action {
public function delete(array $params) {
$this->log('File "%s" deleted from trash bin.',
['path' => $params['path']], ['path']
);
}
public function restore(array $params) {
$this->log('File "%s" restored from trash bin.',
['path' => $params['filePath']], ['path']
);
}
}
@@ -1,140 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
use OCP\IUser;
/**
* Class UserManagement logs all user management related actions.
*
* @package OCA\AdminAudit\Actions
*/
class UserManagement extends Action {
/**
* Log creation of users
*
* @param array $params
*/
public function create(array $params) {
$this->log(
'User created: "%s"',
$params,
[
'uid',
]
);
}
/**
* Log assignments of users (typically user backends)
*
* @param string $uid
*/
public function assign(string $uid) {
$this->log(
'UserID assigned: "%s"',
[ 'uid' => $uid ],
[ 'uid' ]
);
}
/**
* Log deletion of users
*
* @param array $params
*/
public function delete(array $params) {
$this->log(
'User deleted: "%s"',
$params,
[
'uid',
]
);
}
/**
* Log unassignments of users (typically user backends, no data removed)
*
* @param string $uid
*/
public function unassign(string $uid) {
$this->log(
'UserID unassigned: "%s"',
[ 'uid' => $uid ],
[ 'uid' ]
);
}
/**
* Log enabling of users
*
* @param array $params
*/
public function change(array $params) {
switch($params['feature']) {
case 'enabled':
$this->log(
$params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
['user' => $params['user']->getUID()],
[
'user',
]
);
break;
case 'eMailAddress':
$this->log(
'Email address changed for user %s',
['user' => $params['user']->getUID()],
[
'user',
]
);
break;
}
}
/**
* Logs changing of the user scope
*
* @param IUser $user
*/
public function setPassword(IUser $user) {
if($user->getBackendClassName() === 'Database') {
$this->log(
'Password of user "%s" has been changed',
[
'user' => $user->getUID(),
],
[
'user',
]
);
}
}
}
-48
View File
@@ -1,48 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
class Versions extends Action {
public function rollback(array $params) {
$this->log('Version "%s" of "%s" was restored.',
[
'version' => $params['revision'],
'path' => $params['path']
],
['version', 'path']
);
}
public function delete(array $params) {
$this->log('Version "%s" was deleted.',
['path' => $params['path']],
['path']
);
}
}
@@ -1,257 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\AppInfo;
use OC\Files\Filesystem;
use OC\Files\Node\File;
use OC\Group\Manager;
use OC\User\Session;
use OCA\AdminAudit\Actions\AppManagement;
use OCA\AdminAudit\Actions\Auth;
use OCA\AdminAudit\Actions\Console;
use OCA\AdminAudit\Actions\Files;
use OCA\AdminAudit\Actions\GroupManagement;
use OCA\AdminAudit\Actions\Security;
use OCA\AdminAudit\Actions\Sharing;
use OCA\AdminAudit\Actions\Trashbin;
use OCA\AdminAudit\Actions\UserManagement;
use OCA\AdminAudit\Actions\Versions;
use OCP\App\ManagerEvent;
use OCP\AppFramework\App;
use OCP\Authentication\TwoFactorAuth\IProvider;
use OCP\Console\ConsoleEvent;
use OCP\IGroupManager;
use OCP\ILogger;
use OCP\IPreview;
use OCP\IUserSession;
use OCP\Util;
use Symfony\Component\EventDispatcher\GenericEvent;
use OCP\Share;
class Application extends App {
/** @var ILogger */
protected $logger;
public function __construct() {
parent::__construct('admin_audit');
$this->initLogger();
}
public function initLogger() {
$c = $this->getContainer()->getServer();
$config = $c->getConfig();
$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
if($logFile === null) {
$this->logger = $c->getLogger();
return;
}
$this->logger = $c->getLogFactory()->getCustomLogger($logFile);
}
public function register() {
$this->registerHooks();
}
/**
* Register hooks in order to log them
*/
protected function registerHooks() {
$this->userManagementHooks();
$this->groupHooks();
$this->authHooks();
$this->consoleHooks();
$this->appHooks();
$this->sharingHooks();
$this->fileHooks();
$this->trashbinHooks();
$this->versionsHooks();
$this->securityHooks();
}
protected function userManagementHooks() {
$userActions = new UserManagement($this->logger);
Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
/** @var IUserSession|Session $userSession */
$userSession = $this->getContainer()->getServer()->getUserSession();
$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
$userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
}
protected function groupHooks() {
$groupActions = new GroupManagement($this->logger);
/** @var IGroupManager|Manager $groupManager */
$groupManager = $this->getContainer()->getServer()->getGroupManager();
$groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
$groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
$groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
$groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
}
protected function sharingHooks() {
$shareActions = new Sharing($this->logger);
Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
}
protected function authHooks() {
$authActions = new Auth($this->logger);
Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
Util::connectHook('OC_User', 'logout', $authActions, 'logout');
}
protected function appHooks() {
$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function(ManagerEvent $event) {
$appActions = new AppManagement($this->logger);
$appActions->enableApp($event->getAppID());
});
$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function(ManagerEvent $event) {
$appActions = new AppManagement($this->logger);
$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
});
$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function(ManagerEvent $event) {
$appActions = new AppManagement($this->logger);
$appActions->disableApp($event->getAppID());
});
}
protected function consoleHooks() {
$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function(ConsoleEvent $event) {
$appActions = new Console($this->logger);
$appActions->runCommand($event->getArguments());
});
}
protected function fileHooks() {
$fileActions = new Files($this->logger);
$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
$eventDispatcher->addListener(
IPreview::EVENT,
function(GenericEvent $event) use ($fileActions) {
/** @var File $file */
$file = $event->getSubject();
$fileActions->preview([
'path' => substr($file->getInternalPath(), 5),
'width' => $event->getArguments()['width'],
'height' => $event->getArguments()['height'],
'crop' => $event->getArguments()['crop'],
'mode' => $event->getArguments()['mode']
]);
}
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_rename,
$fileActions,
'rename'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_create,
$fileActions,
'create'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_copy,
$fileActions,
'copy'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
$fileActions,
'write'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_update,
$fileActions,
'update'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_read,
$fileActions,
'read'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_delete,
$fileActions,
'delete'
);
}
protected function versionsHooks() {
$versionsActions = new Versions($this->logger);
Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
}
protected function trashbinHooks() {
$trashActions = new Trashbin($this->logger);
Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
}
protected function securityHooks() {
$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function(GenericEvent $event) {
$security = new Security($this->logger);
$security->twofactorSuccess($event->getSubject(), $event->getArguments());
});
$eventDispatcher->addListener(IProvider::EVENT_FAILED, function(GenericEvent $event) {
$security = new Security($this->logger);
$security->twofactorFailed($event->getSubject(), $event->getArguments());
});
}
}
@@ -1,52 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 Arthur Schiwon <blizzz@arthur-schiwon.de>
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\BackgroundJobs;
use OC\BackgroundJob\TimedJob;
use OCP\Log\RotationTrait;
class Rotate extends TimedJob {
use RotationTrait;
public function __construct() {
$this->setInterval(60*60*3);
}
protected function run($argument) {
$config = \OC::$server->getConfig();
$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
$this->filePath = $config->getAppValue('admin_audit', 'logfile', $default);
if($this->filePath === '') {
// default log file, nothing to do
return;
}
$this->maxSize = $config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
if($this->shouldRotateBySize()) {
$this->rotate();
}
}
}
@@ -1,75 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2018 Roeland Jago Douma <roeland@famdouma.nl>
*
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Tests\Actions;
use OCA\AdminAudit\Actions\Security;
use OCP\ILogger;
use OCP\IUser;
use Test\TestCase;
class SecurityTest extends TestCase {
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
private $logger;
/** @var Security */
private $security;
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject */
private $user;
public function setUp() {
parent::setUp();
$this->logger = $this->createMock(ILogger::class);
$this->security = new Security($this->logger);
$this->user = $this->createMock(IUser::class);
$this->user->method('getUID')->willReturn('myuid');
$this->user->method('getDisplayName')->willReturn('mydisplayname');
}
public function testTwofactorFailed() {
$this->logger->expects($this->once())
->method('info')
->with(
$this->equalTo('Failed two factor attempt by user mydisplayname (myuid) with provider myprovider'),
['app' => 'admin_audit']
);
$this->security->twofactorFailed($this->user, ['provider' => 'myprovider']);
}
public function testTwofactorSuccess() {
$this->logger->expects($this->once())
->method('info')
->with(
$this->equalTo('Successful two factor attempt by user mydisplayname (myuid) with provider myprovider'),
['app' => 'admin_audit']
);
$this->security->twofactorSuccess($this->user, ['provider' => 'myprovider']);
}
}
-661
View File
@@ -1,661 +0,0 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU Affero General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
-2
View File
@@ -1,2 +0,0 @@
# cloud_federation_api
The cloud federation API allows to share information like files, contacts, calendars, incoming calls, etc accross Nextcloud instances
-22
View File
@@ -1,22 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
$app = new \OCA\CloudFederationAPI\AppInfo\Application();
@@ -1,20 +0,0 @@
<?xml version="1.0"?>
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>cloud_federation_api</id>
<name>Cloud Federation API</name>
<summary>Enable clouds to communicate with each other and exchange data</summary>
<description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
<version>0.0.1</version>
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<namespace>CloudFederationAPI</namespace>
<types>
<filesystem/>
</types>
<category>files</category>
<bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
<dependencies>
<nextcloud min-version="14" max-version="14"/>
</dependencies>
</info>
@@ -1,37 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\CloudFederationAPI\AppInfo;
use OCA\CloudFederationAPI\Capabilities;
use OCP\AppFramework\App;
class Application extends App {
public function __construct() {
parent::__construct('cloud_federation_api');
$container = $this->getContainer();
$container->registerCapability(Capabilities::class);
}
}
@@ -1,64 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\CloudFederationAPI;
use OCP\Capabilities\ICapability;
use OCP\IURLGenerator;
class Capabilities implements ICapability {
/** @var IURLGenerator */
private $urlGenerator;
public function __construct(IURLGenerator $urlGenerator) {
$this->urlGenerator = $urlGenerator;
}
/**
* Function an app uses to return the capabilities
*
* @return array Array containing the apps capabilities
* @since 8.2.0
*/
public function getCapabilities() {
$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
$capabilities = ['ocm' =>
[
'enabled' => true,
'apiVersion' => '1.0-proposal1',
'endPoint' => substr($url, 0, strrpos($url, '/')),
'shareTypes' => [
[
'name' => 'file',
'protocols' => [
'webdav' => '/public.php/webdav/',
]
],
]
]
];
return $capabilities;
}
}
-60
View File
@@ -1,60 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\CloudFederationAPI;
use OCP\Federation\ICloudFederationProviderManager;
use OCP\GlobalScale\IConfig as IGsConfig;
use OCP\IConfig;
/**
* Class config
*
* handles all the config parameters
*
* @package OCA\CloudFederationAPI
*/
class Config {
/** @var ICloudFederationProviderManager */
private $cloudFederationProviderManager;
public function __construct(ICloudFederationProviderManager $cloudFederationProviderManager) {
$this->cloudFederationProviderManager = $cloudFederationProviderManager;
}
/**
* get a list of supported share types
*
* @param string $resourceType
* @return array
*/
public function getSupportedShareTypes($resourceType) {
try {
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
return $provider->getSupportedShareTypes();
} catch (\Exception $e) {
return [];
}
}
}
@@ -1,300 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\CloudFederationAPI\Controller;
use OCA\CloudFederationAPI\Config;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\Federation\Exceptions\ActionNotSupportedException;
use OCP\Federation\Exceptions\AuthenticationFailedException;
use OCP\Federation\Exceptions\BadRequestException;
use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
use OCP\Federation\ICloudFederationFactory;
use OCP\Federation\ICloudFederationProviderManager;
use OCP\Federation\Exceptions\ProviderDoesNotExistsException;
use OCP\Federation\ICloudIdManager;
use OCP\IGroupManager;
use OCP\ILogger;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserManager;
use OCP\Share\Exceptions\ShareNotFound;
/**
* Class RequestHandlerController
*
* handle API between different Cloud instances
*
* @package OCA\CloudFederationAPI\Controller
*/
class RequestHandlerController extends Controller {
/** @var ILogger */
private $logger;
/** @var IUserManager */
private $userManager;
/** @var IGroupManager */
private $groupManager;
/** @var IURLGenerator */
private $urlGenerator;
/** @var ICloudFederationProviderManager */
private $cloudFederationProviderManager;
/** @var Config */
private $config;
/** @var ICloudFederationFactory */
private $factory;
/** @var ICloudIdManager */
private $cloudIdManager;
public function __construct($appName,
IRequest $request,
ILogger $logger,
IUserManager $userManager,
IGroupManager $groupManager,
IURLGenerator $urlGenerator,
ICloudFederationProviderManager $cloudFederationProviderManager,
Config $config,
ICloudFederationFactory $factory,
ICloudIdManager $cloudIdManager
) {
parent::__construct($appName, $request);
$this->logger = $logger;
$this->userManager = $userManager;
$this->groupManager = $groupManager;
$this->urlGenerator = $urlGenerator;
$this->cloudFederationProviderManager = $cloudFederationProviderManager;
$this->config = $config;
$this->factory = $factory;
$this->cloudIdManager = $cloudIdManager;
}
/**
* add share
*
* @NoCSRFRequired
* @PublicPage
* @BruteForceProtection(action=receiveFederatedShare)
*
* @param string $shareWith
* @param string $name resource name (e.g. document.odt)
* @param string $description share description (optional)
* @param string $providerId resource UID on the provider side
* @param string $owner provider specific UID of the user who owns the resource
* @param string $ownerDisplayName display name of the user who shared the item
* @param string $sharedBy provider specific UID of the user who shared the resource
* @param string $sharedByDisplayName display name of the user who shared the resource
* @param array $protocol (e,.g. ['name' => 'webdav', 'options' => ['username' => 'john', 'permissions' => 31]])
* @param string $shareType ('group' or 'user' share)
* @param $resourceType ('file', 'calendar',...)
* @return Http\DataResponse|JSONResponse
*
* Example: curl -H "Content-Type: application/json" -X POST -d '{"shareWith":"admin1@serve1","name":"welcome server2.txt","description":"desc","providerId":"2","owner":"admin2@http://localhost/server2","ownerDisplayName":"admin2 display","shareType":"user","resourceType":"file","protocol":{"name":"webdav","options":{"sharedSecret":"secret","permissions":"webdav-property"}}}' http://localhost/server/index.php/ocm/shares
*/
public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
// check if all required parameters are set
if ($shareWith === null ||
$name === null ||
$providerId === null ||
$owner === null ||
$resourceType === null ||
$shareType === null ||
!is_array($protocol) ||
!isset($protocol['name']) ||
!isset ($protocol['options']) ||
!is_array($protocol['options']) ||
!isset($protocol['options']['sharedSecret'])
) {
return new JSONResponse(
['message' => 'Missing arguments'],
Http::STATUS_BAD_REQUEST
);
}
$supportedShareTypes = $this->config->getSupportedShareTypes($resourceType);
if (!in_array($shareType, $supportedShareTypes)) {
return new JSONResponse(
['message' => 'Share type "' . $shareType . '" not implemented'],
Http::STATUS_NOT_IMPLEMENTED
);
}
$cloudId = $this->cloudIdManager->resolveCloudId($shareWith);
$shareWith = $cloudId->getUser();
if ($shareType === 'user') {
$shareWith = $this->mapUid($shareWith);
if (!$this->userManager->userExists($shareWith)) {
return new JSONResponse(
['message' => 'User "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
Http::STATUS_BAD_REQUEST
);
}
}
if ($shareType === 'group') {
if(!$this->groupManager->groupExists($shareWith)) {
return new JSONResponse(
['message' => 'Group "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
Http::STATUS_BAD_REQUEST
);
}
}
// if no explicit display name is given, we use the uid as display name
$ownerDisplayName = $ownerDisplayName === null ? $owner : $ownerDisplayName;
$sharedByDisplayName = $sharedByDisplayName === null ? $sharedBy : $sharedByDisplayName;
// sharedBy* parameter is optional, if nothing is set we assume that it is the same user as the owner
if ($sharedBy === null) {
$sharedBy = $owner;
$sharedByDisplayName = $ownerDisplayName;
}
try {
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
$share = $this->factory->getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, '', $shareType, $resourceType);
$share->setProtocol($protocol);
$provider->shareReceived($share);
} catch (ProviderDoesNotExistsException $e) {
return new JSONResponse(
['message' => $e->getMessage()],
Http::STATUS_NOT_IMPLEMENTED
);
} catch (ProviderCouldNotAddShareException $e) {
return new JSONResponse(
['message' => $e->getMessage()],
$e->getCode()
);
} catch (\Exception $e) {
return new JSONResponse(
['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
Http::STATUS_BAD_REQUEST
);
}
$user = $this->userManager->get($shareWith);
$recipientDisplayName = '';
if($user) {
$recipientDisplayName = $user->getDisplayName();
}
return new JSONResponse(
['recipientDisplayName' => $recipientDisplayName],
Http::STATUS_CREATED);
}
/**
* receive notification about existing share
*
* @NoCSRFRequired
* @PublicPage
* @BruteForceProtection(action=receiveFederatedShareNotification)
*
* @param string $notificationType (notification type, e.g. SHARE_ACCEPTED)
* @param string $resourceType (calendar, file, contact,...)
* @param string $providerId id of the share
* @param array $notification the actual payload of the notification
* @return JSONResponse
*/
public function receiveNotification($notificationType, $resourceType, $providerId, array $notification) {
// check if all required parameters are set
if ($notificationType === null ||
$resourceType === null ||
$providerId === null ||
!is_array($notification)
) {
return new JSONResponse(
['message' => 'Missing arguments'],
Http::STATUS_BAD_REQUEST
);
}
try {
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
$result = $provider->notificationReceived($notificationType, $providerId, $notification);
} catch (ProviderDoesNotExistsException $e) {
return new JSONResponse(
['message' => $e->getMessage()],
Http::STATUS_BAD_REQUEST
);
} catch (ShareNotFound $e) {
return new JSONResponse(
['message' => $e->getMessage()],
Http::STATUS_BAD_REQUEST
);
} catch (ActionNotSupportedException $e) {
return new JSONResponse(
['message' => $e->getMessage()],
Http::STATUS_NOT_IMPLEMENTED
);
} catch (BadRequestException $e) {
return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST);
} catch (AuthenticationFailedException $e) {
return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN);
}
catch (\Exception $e) {
return new JSONResponse(
['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
Http::STATUS_BAD_REQUEST
);
}
return new JSONResponse($result,Http::STATUS_CREATED);
}
/**
* map login name to internal LDAP UID if a LDAP backend is in use
*
* @param string $uid
* @return string mixed
*/
private function mapUid($uid) {
// FIXME this should be a method in the user management instead
$this->logger->debug('shareWith before, ' . $uid, ['app' => $this->appName]);
\OCP\Util::emitHook(
'\OCA\Files_Sharing\API\Server2Server',
'preLoginNameUsedAsUserName',
array('uid' => &$uid)
);
$this->logger->debug('shareWith after, ' . $uid, ['app' => $this->appName]);
return $uid;
}
}
-3
View File
@@ -1,3 +0,0 @@
{
"directory": "js/vendor"
}
-2
View File
@@ -1,2 +0,0 @@
# compiled vue templates
js/templates.js
-25
View File
@@ -1,25 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2018, Joas Schilling <coding@schilljs.com>
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
$application = new \OCA\Comments\AppInfo\Application();
$application->register();
-42
View File
@@ -1,42 +0,0 @@
<?xml version="1.0"?>
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>comments</id>
<name>Comments</name>
<summary>Files app plugin to add comments to files</summary>
<description>Files app plugin to add comments to files</description>
<version>1.4.0</version>
<licence>agpl</licence>
<author>Arthur Schiwon</author>
<author>Vincent Petry</author>
<default_enable/>
<types>
<logging/>
</types>
<category>office</category>
<category>social</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="14" max-version="14" />
</dependencies>
<activity>
<settings>
<setting>OCA\Comments\Activity\Setting</setting>
</settings>
<filters>
<filter>OCA\Comments\Activity\Filter</filter>
</filters>
<providers>
<provider>OCA\Comments\Activity\Provider</provider>
</providers>
</activity>
<collaboration>
<plugins>
<plugin type="autocomplete-sort">OCA\Comments\Collaboration\CommentersSorter</plugin>
</plugins>
</collaboration>
</info>
-28
View File
@@ -1,28 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
return [
'routes' => [
['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
]
];

Some files were not shown because too many files have changed in this diff Show More