Lukas Reschke
df67a04385
Move security headers to base.php
...
Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...)
The migration to base.php ensures that the headers are served to all requests passing base.php
2014-04-13 11:51:03 +02:00
Lukas Reschke
77ecfdd1a4
Only encode dangerous dangerous characters
...
There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded.
This may fix issues like https://github.com/owncloud/calendar/pull/394
2014-04-11 19:42:15 +02:00
Bernhard Posselt
2fc6fb36ad
Merge pull request #8139 from owncloud/fix-middleware-registration
...
register middleware as string to not force request to be instantiated to...
2014-04-10 20:24:30 +02:00
Thomas Müller
e401df26bc
Merge pull request #8107 from owncloud/dav-negativetimestampfix
...
Fixed Sabre Node implementation to correctly return timestamps as int
2014-04-10 17:37:53 +02:00
Thomas Müller
26a89e369e
Merge pull request #8137 from owncloud/routeing-requirements
...
add requirements to routing
2014-04-10 16:23:01 +02:00
Thomas Müller
ecd74d3630
Merge pull request #8138 from owncloud/allow-app-in-routes.php
...
To isolate the variable scope used inside the $file it is required in it...
2014-04-10 16:09:23 +02:00
Tom Needham
654d5af394
Merge pull request #8027 from owncloud/routes-ocs
...
Load all routes when matching an ocs route
2014-04-10 12:22:34 +01:00
Vincent Petry
6cc578d1a7
Merge pull request #8018 from owncloud/ocs_result_success_is_100
...
OC_OCS_Result Class, Only accept 100 code as success
2014-04-10 13:03:10 +02:00
Vincent Petry
8d05848391
Merge pull request #7825 from owncloud/hash-stream
...
Use streams when generating hashes of remote files
2014-04-10 10:42:04 +02:00
Vincent Petry
9a8457aca0
Merge pull request #8053 from owncloud/preview-hook-root
...
Pass the correct root to the preview on post_write
2014-04-10 10:31:40 +02:00
Bernhard Posselt
f06ef8aa4b
register middleware as string to not force request to be instantiated too early and thus not having url parameters
2014-04-09 23:59:57 +02:00
Thomas Müller
98a5f121fd
To isolate the variable scope used inside the $file it is required in it's own method
2014-04-09 22:45:34 +02:00
Bernhard Posselt
70c88027db
add requirements to routing
2014-04-09 21:57:32 +02:00
Vincent Petry
4f11786a3d
Fixed Sabre Node implementation to correctly return timestamps as int
...
Negative timestamps were returned as string and were confusing other
Sabre API like Sabre_DAV_Property_GetLastModified.
This fix makes sure the timestamp is returned as int when defined.
2014-04-09 15:46:51 +02:00
Joas Schilling
352063cf0a
Fix Undefined index: storage in share.php
...
There parameter was removed when the code was cleaned up:
{"app":"PHP","message":"Undefined index: storage at
E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160",
"level":0,"time":"2014-04-09T12:56:23+00:00"}
2014-04-09 15:14:44 +02:00
Volkan Gezer
a4f42676ea
Make hardcoded exception messages translatable
2014-04-08 20:07:25 +02:00
Thomas Müller
c1fd300048
using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
2014-04-07 21:05:48 +02:00
Thomas Müller
0fe32eee13
Merge pull request #8083 from owncloud/fix-link-to-sync
...
Remove wrong whitespace from URL and use HTTPS
2014-04-07 14:38:47 +02:00
Lukas Reschke
6babf90175
Switch to HTTPS
2014-04-06 22:06:38 +02:00
Lukas Reschke
5679f5c37e
Remove wrong whitespace from URL and use HTTPS
...
The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/ " target="_blank">`)
Additionally I switched the link to HTTPS.
2014-04-06 22:04:14 +02:00
Lukas Reschke
1b55c312e5
Removed two unused functions
...
These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.
2014-04-04 22:27:05 +02:00
icewind1991
4028301dea
Merge pull request #8055 from owncloud/getfileinfo-exists
...
dont scan not existing files in View->getFileInfo
2014-04-04 18:07:29 +02:00
Vincent Petry
0597c5226a
Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey
...
Do not expire chunks while checking for their existence
2014-04-04 17:18:54 +02:00
Robin Appelman
b61ec7352b
dont scan not existing files in View->getFileInfo
2014-04-04 15:10:07 +02:00
Robin Appelman
e76c246718
Pass the correct root to the preview on post_write
2014-04-04 15:02:08 +02:00
Vincent Petry
8a10c44eb3
Merge pull request #8015 from owncloud/storageinfo-reuse
...
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
Vincent Petry
ab56f69416
Do not expire chunks while checking for their existence
...
The expiration should be done by the gc() function on login, not while
isComplete() is calling hasKey() for every chunk.
2014-04-03 21:12:35 +02:00
Thomas Müller
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
Robin Appelman
db95f49b7e
Load all routes when matching an ocs route
2014-04-03 13:01:20 +02:00
tomneedham
6b017201b8
Only accept success as 100 like the OCS spec does
2014-04-02 15:50:51 +00:00
Robin Appelman
da5541ac02
Allow reusing FileInfo for getStorageInfo
2014-04-02 17:10:57 +02:00
Morris Jobke
7bdc085022
Merge pull request #8006 from wakeup/master
...
Fix admin-dir_permissions redirection when cannot write warning is shown.
2014-04-02 13:21:53 +02:00
Vincent Petry
c0746f6b49
Merge pull request #7968 from owncloud/core-overwritewebrootwithroot
...
Allow using "/" in "overwritewebroot"
2014-04-02 12:56:36 +02:00
Volkan Gezer
b6ad7c3cdd
Fix admin-dir_permissions redirection when cannot write warning
...
is shown.
2014-04-02 12:41:46 +02:00
Vincent Petry
4cc70ec39d
Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
...
Correctly read the full stream in file_get_contents
2014-04-02 10:55:50 +02:00
Robin Appelman
1c7a71ca77
use binary safe read
2014-04-02 04:38:54 +02:00
Robin Appelman
54a15a8001
Use streams when generating hashes of remote files
2014-04-02 04:38:54 +02:00
Thomas Müller
82d1ea240e
Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
...
idn_to_ascii is only used if available
2014-04-01 22:51:23 +02:00
Vincent Petry
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
Vincent Petry
6e6a131b32
Merge pull request #7696 from owncloud/chunk-remainingspacefix
...
Fixed chunking and insufficient storage check
2014-04-01 16:09:19 +02:00
Morris Jobke
a94ac41512
Merge pull request #7966 from owncloud/url_generation_hack
...
Check if web root has already been appended
2014-04-01 10:59:53 +02:00
Vincent Petry
0067a4eac2
Added missing fclose in file_get_contents and file_put_contents
2014-04-01 10:08:16 +02:00
Vincent Petry
d6ce45fe61
Correctly read the full stream in file_get_contents
...
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.
This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.
Added unit test with a bigger test file to cover this case.
2014-04-01 10:07:16 +02:00
Bart Visscher
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Vincent Petry
cf361b6b4a
Allow using "/" in "overwritewebroot"
...
Whenever the reverse proxy is using "/" as the webroot, it is now
possible to set that value in "overwritewebroot"
2014-03-31 15:36:48 +02:00
Bjoern Schiessle
3a731a01b1
select statement always need to contain file_source respectively item_source
2014-03-31 15:03:35 +02:00
Robin Appelman
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
Thomas Tanghus
6292aa57af
Check if web root has already been appended
2014-03-31 14:24:38 +02:00
Vincent Petry
65e3f63400
Merge pull request #7939 from owncloud/wring_redirect_on_login
...
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
2014-03-31 10:50:05 +02:00
Thomas Tanghus
7278f2f567
Sub-dir was prepended twice
2014-03-29 20:40:49 +01:00