wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17956 commits 157 branches 562 tags 714 MiB
Commit graph

1232 commits

Author SHA1 Message Date
Thomas Müller
02726acbc8 adding checks and log messages regarding the assets folder 2014-04-15 16:26:12 +02:00
Robin Appelman
7f77b08098 Sort parameters and cast to int 2014-04-15 15:48:02 +02:00
Andreas Fischer
bd37010f35 Merge remote-tracking branch 'owncloud/master' into db-convert-tool 
* owncloud/master: (61 commits)
  [tx-robot] updated from transifex
  Make email display name change translatable again
  Ignore jquery.multiselect.js - it's 3rdparty
  javascript code cleanup + fixing syntax errors
  Revert "close-button for share_dropdown"
  close-button for share_dropdown
  [tx-robot] updated from transifex
  The latest developer manual link
  The latest developer manual link
  p() and print_unescaped() also take arrays as parameter
  Check whether the user has permissions to add personal storage backends
  [tx-robot] updated from transifex
  Fix a wrong WebDAV Warning with self-signed-certs
  fix translation link
  upda mailinglist address
  fix contribute link
  default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
  Correctly process request parameters other than GET or POST, dont use globals in the class but inject it
  [tx-robot] updated from transifex
  use references for middleware to fix problems on 5.3
  ...
 2014-04-15 15:44:44 +02:00
Thomas Müller
e125dc60cd introduce new function to force a language 2014-04-15 15:12:25 +02:00
Björn Schießle
2dbb2db7e0 Merge pull request #7780 from owncloud/share-file-exists 
Verify that a file exists before we share it
 2014-04-15 11:23:17 +02:00
Victor Dubiniuk
91d40f5033 remove unneeded LOWER. Fixes #8202 2014-04-14 22:19:21 +03:00
Lukas Reschke
340089f270 Merge pull request #8059 from owncloud/countUsersInGroup 
add optional countUsersInGroup method to group backends
 2014-04-14 20:45:12 +02:00
Lukas Reschke
9046f7b2f8 Merge pull request #8178 from owncloud/fix-request-parameters 
Correctly process request parameters other than GET or POST, dont use gl...
 2014-04-14 20:42:26 +02:00
Lukas Reschke
2bda3f9ae0 Use direct link instead of JS 
Due to our CSP policy this link won’t work as it it considered as
inline Javascript.

This commit replaces the link with a static link to the files app.

Reimplementation of #8067 - fixes #7742
 2014-04-14 20:16:52 +02:00
Andreas Fischer
9cc41a2460 Move PostgreSQL sequence resynchronisation out into PgSqlTools class. 2014-04-14 18:37:47 +02:00
Thomas Tanghus
2fb68c120b Added explanation to mimetypes.list.php to avoid future confusion. 2014-04-14 18:21:19 +02:00
Thomas Tanghus
51e47319ef White-list known secure mime types. Refs. #8184 2014-04-14 17:17:50 +02:00
Thomas Müller
fe364656a4 Merge pull request #8181 from owncloud/fix_wrong_webdav_warning 
Fix a wrong WebDAV Warning with self-signed-certs
 2014-04-14 16:53:06 +02:00
Thomas Müller
8df19c4379 Merge pull request #8019 from owncloud/thumbnail_fixes 
Thumbnail fixes
 2014-04-14 16:23:03 +02:00
Thomas Müller
71de321869 Merge pull request #8156 from owncloud/fix-middleware-container 
fix the middleware registration process in the container
 2014-04-14 14:53:58 +02:00
Robin McCorkell
eeee9eacea Prevent error from cache update on deleted files 2014-04-13 16:17:13 +01:00
Lukas Reschke
eecc400698 p() and print_unescaped() also take arrays as parameter 
This fixes some scrutinizer issues.
 2014-04-13 16:18:05 +02:00
Lukas Reschke
b04d95b116 Remove uneeded usages of nosniff 2014-04-13 12:48:16 +02:00
Lukas Reschke
a2a850dd91 Fix indentation 2014-04-13 11:52:31 +02:00
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
kondou
d98ae4f9b2 Fix a wrong WebDAV Warning with self-signed-certs 
Occuring in the admin interface
 2014-04-13 05:24:29 +02:00
Bernhard Posselt
62cce982bb default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute 2014-04-12 16:17:49 +02:00
Bernhard Posselt
e7fa2790f3 Correctly process request parameters other than GET or POST, dont use globals in the class but inject it 2014-04-12 15:02:19 +02:00
Bernhard Posselt
526100dc90 be nice and use a relative import so people can use the class without firing up owncloud 2014-04-12 01:33:21 +02:00
Bernhard Posselt
4af72a076d use references for middleware to fix problems on 5.3 2014-04-11 20:50:49 +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
763da4258e fix the middleware registration process in the container 2014-04-10 20:51:03 +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
Thomas Müller
d2961dcf11 Merge branch 'master' into lukepolo-master 
Conflicts:
	apps/files/js/filelist.js
 2014-04-09 22:00:25 +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
Andreas Fischer
78ee4c1327 Merge remote-tracking branch 'owncloud/master' into db-convert-tool 
* owncloud/master: (137 commits)
  add comment to clearify when a skip in the foreach happens
  remove obsolete code
  Always define sendmail_is_available
  [tx-robot] updated from transifex
  Make hardcoded exception messages translatable
  Disable sharing in trashbin app
  class Test_Config is already declared
  [tx-robot] updated from transifex
  using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
  fixing undefined exception classes
  unit test testSetAppValueIfSetToNull() added
  unit tests for dynamic backend registration
  ignore underscore.js in scrutinizer.yml
  adding ownCloud globals to jshintrc: OC, t, n
  Use git checkout on directory as some files may not be in git resulting in, e.g.:
  adding underscore.js
  reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
  translations for oc-dialogs reside in code
  Fix copy conflict dialog translation
  [tx-robot] updated from transifex
  ...
 2014-04-09 15:20:18 +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
Joas Schilling
d418e176ce Do not query when the list is empty 2014-04-09 15:02:06 +02:00
Joas Schilling
015b9b1dac Add option to getUsersSharingFile() to get the paths for the shared users 2014-04-09 15:02:05 +02:00
Volkan Gezer
a4f42676ea Make hardcoded exception messages translatable 2014-04-08 20:07:25 +02:00
Arthur Schiwon
5f8d9b3a4e ask implementsAction instead of checking method_exists for easier testing 2014-04-08 12:31:11 +02:00
Arthur Schiwon
698297feb3 add optional countUsersInGroup method to group backends 2014-04-08 12:04:38 +02:00
Thomas Müller
7dd0074655 fixing mkdir code to respect external file systems as well 2014-04-07 23:17:35 +02:00
Thomas Müller
3587c88fe9 Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master 
Conflicts:
	apps/files/js/file-upload.js
 2014-04-07 22:28:16 +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
Robin Appelman
51fbf0bcbc add delimiter between host and baseurl 2014-04-07 13:27:18 +02:00
Robin Appelman
84285011ce Merge branch 'master' into routing-cache-webroot 2014-04-07 13:24:51 +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
Thomas Müller
ccf1287fbf adding unit test for cache mechanism 2014-04-04 16:21:50 +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
Thomas Müller
f029312e5b fixing typos/spellings 2014-04-04 11:37:47 +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
josh4trunks
9b4643f386 Send URI instead of filepath to NGINX for X-Accel 2014-04-03 20:46:54 -07: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
Jörn Friedrich Dreyer
c7324f7e44 fix float comparison for negative results 2014-04-03 12:00:53 +02:00
Fabian Henze
7cdb16979a Fix setting the max-upload-size for really large values. 
php can only parse filesize units up to gigabytes, not terabytes or petabytes.
 2014-04-03 01:17:28 +02:00
Jörn Friedrich Dreyer
b9a8bd7e1f extract more methods 2014-04-02 18:32:32 +02:00
Jörn Friedrich Dreyer
436a78db44 extract method isCachedBigger 2014-04-02 18:00:21 +02:00
tomneedham
6b017201b8 Only accept success as 100 like the OCS spec does 2014-04-02 15:50:51 +00:00
Jörn Friedrich Dreyer
bca6cc6f74 remove unnecessary code 2014-04-02 17:34:48 +02:00
Jörn Friedrich Dreyer
b8248f4a0a compare floats with epsilon 2014-04-02 17:32:27 +02:00
Robin Appelman
da5541ac02 Allow reusing FileInfo for getStorageInfo 2014-04-02 17:10:57 +02:00
Robin Appelman
850a0e7388 Verify that a file exists before we share it 2014-04-02 13:47:11 +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
Thomas Müller
7086c386fd Merge branch 'master' into append-error-document 
Conflicts:
	lib/private/setup.php
	lib/private/updater.php
 2014-04-02 08:48:37 +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
Robin Appelman
9c8596e95b Keep cached urls with different hostnames or baseurls seperate 2014-04-01 15:43:27 +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
Andreas Fischer
f9853b253c Deduplicate connection handling code into \OC\DB\ConnectionFactory 2014-03-31 20:09:07 +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
Thomas Tanghus
3a7829f784 Sub-dir was prepended twice 2014-03-29 20:39:55 +01:00
Morris Jobke
73c81ae709 Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master 
adding @method annotation to declare methods which can be called on the ...
 2014-03-28 21:20:09 +01:00
Thomas Tanghus
c14107550d Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 2014-03-28 18:05:48 +01:00
Robin Appelman
f331d5f9d4 Give storages the option to implement the getById behaviour for View->getPath 2014-03-28 15:15:56 +01:00
Morris Jobke
e4069e1553 Emit event after setting a new expiration for a share 
all credits to @frisco82
https://github.com/owncloud/core/pull/5335
 2014-03-28 15:00:13 +01:00
Thomas Müller
70db348475 Merge pull request #7824 from owncloud/hash-parameter-order 
Fix parameter order for Storage\Local::hash
 2014-03-28 13:06:07 +01:00
Thomas Müller
f1b085df01 adding @method annotation to declare methods which can be called on the wrapped statement object 2014-03-28 12:57:27 +01:00
Vincent Petry
d0012e729a Merge pull request #7879 from owncloud/sharing_cleanup_public_api 
sharing api cleanup, first step
 2014-03-28 12:23:11 +01:00
Vincent Petry
5068c57845 Merge pull request #7613 from owncloud/fix_urlGenerator2 
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
 2014-03-28 12:12:49 +01:00
Thomas Müller
2d592ddc8f Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled. 
Squashed commit of the following:

commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943
Merge: 1e9c5be 1e7d7bd
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Mar 28 11:49:04 2014 +0100

    Merge branch 'master' of https://github.com/kev300/core into kev300-master

commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872
Author: kev300 <admin@gadeco.de>
Date:   Tue Dec 17 14:11:42 2013 +0100

    Update util.php

commit 3f0723f054a27a506be7f26932ccb54fff6f2be9
Author: kev300 <admin@gadeco.de>
Date:   Tue Dec 17 14:09:15 2013 +0100

    Update util.php

commit 512176abdcfbe5b2b060b91033abc9608912d1f8
Author: kev300 <admin@gadeco.de>
Date:   Tue Dec 17 14:02:04 2013 +0100

    Update util.php

commit 6cbefd080188d287024e0b047b88dd4525d6c2c1
Author: kev300 <admin@gadeco.de>
Date:   Mon Dec 16 16:44:46 2013 +0100

    Update util.php

    Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
 2014-03-28 12:09:29 +01:00
Vincent Petry
040f430f0c Merge pull request #7829 from owncloud/cachefolderlocation 
Cache folder is now configurable
 2014-03-28 12:08:38 +01:00
Thomas Müller
5fa8f7cf12 Merge pull request #7107 from owncloud/load-apps-proper-master 
Load apps proper master
 2014-03-28 10:33:55 +01:00
Vincent Petry
c9ccacb9ea Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix 
Use the correct resolve method to resolve file storage (x-sendfile)
 2014-03-27 09:31:17 +01:00
Vincent Petry
b48510c978 Use the correct resolve method to resolve file storage 
When detecting whether the file to be downloaded is on external storage,
the correct path needs to be used.

It turns out that \OC\Files\View is needed to resolve the path correctly
relative to the user's home.
 2014-03-26 18:14:35 +01:00
Thomas Müller
10e62bfd68 Merge pull request #7893 from owncloud/no-routed-link-for-css-files 
css files are not to be routed through index.php anymore
 2014-03-26 16:48:54 +01:00
Thomas Müller
93b984ecf8 css files are not to be routed through index.php anymore 2014-03-26 15:36:55 +01:00
Robin Appelman
371a924c92 merge master into webdav-injection 2014-03-26 14:26:07 +01:00
Robin Appelman
9b2bb7c6ab fix undefined index warning in router 2014-03-26 13:02:11 +01:00
Thomas Müller
83b4bcfdbf idn_to_ascii is only used if available 2014-03-26 11:17:23 +01:00
Vincent Petry
e76be308eb Remove unused setUserVars utility method 
That method was moved to the external storage recently so
isn't needed here any more.
 2014-03-26 09:39:09 +01:00
Thomas Müller
743ca4581d Merge pull request #7748 from owncloud/postgresversionwarning 
Added PostgreSQL version warning on upgrade
 2014-03-25 23:17:18 +01:00
Thomas Müller
6bfeb342db fixing code style 2014-03-25 23:17:00 +01:00
Thomas Müller
1816f43722 Merge pull request #7864 from owncloud/routing-performance 
Routing performance
 2014-03-25 23:00:36 +01:00
Thomas Müller
ed97d872af Merge pull request #7325 from owncloud/recursive-mkdir-local 
Recursive mkdir fixes #7047
 2014-03-25 22:45:14 +01:00
Thomas Müller
1ae10b9da3 Merge pull request #7420 from owncloud/cachehooks-first 
Manually triger the filecache update hooks before any other hook
 2014-03-25 22:41:09 +01:00
Thomas Müller
bbc2e37259 Merge pull request #7477 from owncloud/foldersize-reuse 
Allow re-using already known fileinfo when calculating folder sizes
 2014-03-25 22:33:24 +01:00
Bjoern Schiessle
31681a3a27 finally fix the paths for the OCS Share API 2014-03-25 17:52:45 +01:00
Bjoern Schiessle
3653a51af2 fix path creation for re-shares, issue #7662 2014-03-25 17:48:50 +01:00
Bjoern Schiessle
2d8607fae9 don't assign variables in if condition 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
5db3b049fd add todo 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
bc0292c16d always return an array 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
154277ab11 seperate formatResults() 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
ecde48fce8 don't assign variables in if conditions 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
078fafdc5a use variable 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
3a459db358 seperate transformDBResults 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
6607f7cb5e seperate creation of select statement 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
6afd496d9b remove prepFileTarget() seems that it is no longer in use 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
b602662578 add a "helper" and a "hooks" class. Move constants needed by multiple classes 
to a "constants" class
 2014-03-25 17:47:24 +01:00
Bjoern Schiessle
8b6d1d3bf2 added private share api 2014-03-25 17:47:24 +01:00
Robin Appelman
d75c3d5f9a Fix routes getting lost when loading app routes twice 2014-03-25 14:28:30 +01:00
Robin Appelman
e1d3d0e948 fix incorect array 2014-03-25 14:04:18 +01:00
Robin Appelman
c17f415356 Only load core routes for ocs and settings 2014-03-25 13:42:47 +01:00
Robin Appelman
9e89ad07c6 Only load core routes when matching a core route 2014-03-24 16:38:01 +01:00
Robin Appelman
0e1cb001b6 Cache generated urls for routes 2014-03-24 15:42:21 +01:00
Robin Appelman
f17674fef2 Only load routes from the apps we need 2014-03-24 15:41:46 +01:00
Thomas Müller
3eb5898f7b use \OC_Mail::validateAddress() to validate the email address - fixes #7862 2014-03-24 15:35:07 +01:00
Robin Appelman
0d0aac6fff Load the routes when matching or generating a route instead of when creating the router 2014-03-24 14:55:03 +01:00
Thomas Müller
fb7f3008d3 idn have to be converted before being used 2014-03-24 13:46:31 +01:00
Vincent Petry
10c9b8eb99 Cache folder is now configurable 
When using an external cache folder, it is automatically mounted in
FileSystem::initFileSystem so that any app can use it transparently
by creating a view on the "/$user/cache" directory.
 2014-03-24 12:57:11 +01:00
Vincent Petry
a25b86a30e Log exception when PostgreSQL version check failed 2014-03-24 11:54:44 +01:00
adrien
0da61a26ee remove cache all user 2014-03-21 15:50:25 +01:00
Morris Jobke
43313d120d Merge pull request #7820 from owncloud/core-macwarning 
Added warning for Mac OS on setup page
 2014-03-21 15:06:11 +01:00
Thomas Müller
6ff96b34ad Merge branch 'master' into load-apps-proper-master 
Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php
 2014-03-21 14:05:08 +01:00
Robin Appelman
7a8f1389fe fix temporary file based common hash 2014-03-21 13:23:14 +01:00
Vincent Petry
a52bc333a2 Merge pull request #7611 from owncloud/fix-updater 
Use $installedVersion instead of $currentVersion
 2014-03-21 12:16:51 +01:00
Lukas Reschke
2c561c9c50 Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords 
Obfuscate passwords in ext storage config
 2014-03-20 16:31:12 +01:00
Robin Appelman
fffe330bbc Fix parameter order for Storage\Local::hash 2014-03-20 15:32:12 +01:00
Vincent Petry
316a22b463 Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown 
Still return quota value when free space is unknown
 2014-03-20 15:29:14 +01:00
Vincent Petry
6de9033d86 Added warning for Mac OS on setup page 2014-03-20 12:57:55 +01:00
Vincent Petry
36c0f08ec0 Merge pull request #7732 from owncloud/datafolderexistence 
Added .ocdata file to check for data folder validity
 2014-03-20 11:31:28 +01:00
Thomas Müller
8a81df0f2c Merge pull request #7651 from owncloud/close-session-faster-master 
Close session faster
 2014-03-20 11:07:21 +01:00
Vincent Petry
66bc0f0848 Still return quota value when free space is unknown 
Fixed the quota storage wrapper to correctly return the quota value when
the free space is not known (which usually happens when the disk_free_space
function is disabled)
 2014-03-19 19:07:11 +01:00
Lukas Reschke
9abe6b7f87 Add mimetype for MKV videos 
This will make oC create previews for MKVs.

Test file: http://www.auby.no/files/video_tests/h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv

To test this just apply this change and upload the test file, if an preview is generated this change is most likely working as expecting.
 2014-03-19 17:45:20 +01:00
Vincent Petry
4cb53f77b2 Moved external storage mounting code to files_external app 
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
 2014-03-19 12:45:38 +01:00
Thomas Müller
c216c4777b Merge branch 'master' into close-session-faster-master 
Conflicts:
	apps/files/ajax/upgrade.php
 2014-03-19 11:44:21 +01:00
Thomas Müller
6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Thomas Müller
effea790c7 redefine reopen() in class \OC\Session\Internal to avoid accidental calls in productive code 2014-03-18 11:44:22 +01:00
Thomas Müller
153eadd753 Merge branch 'master' into close-session-faster-master 2014-03-17 21:57:48 +01:00
Thomas Müller
6bbbf8536f introduce reopen() method to be used for unit test execution only - right after a unit test has been executed the session will be reopened 2014-03-17 21:57:10 +01:00
Thomas Müller
756bbe8786 Merge pull request #7649 from owncloud/routing-public 
Move routing classes to an interface and expose it in the public api
 2014-03-17 21:07:05 +01:00
Vincent Petry
3cd09f2b09 Added PostgreSQL version warning on upgrade 2014-03-17 18:58:00 +01:00
icewind1991
6fbf3dd7c4 Merge pull request #7764 from owncloud/datadir-chmod 
use a non-recursive chmod on the datadir
 2014-03-17 15:52:44 +01:00
icewind1991
5c72b526a3 Merge pull request #7760 from owncloud/core-roundbytes 
Correctly round bytes when converted from human readable format
 2014-03-17 15:21:57 +01:00
Lukas Reschke
239069c838 Use $installedVersion instead of $currentVersion 2014-03-17 13:27:42 +01:00
icewind1991
4112d63a40 Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning 
Added warning for trusted_domains after CLI upgrade
 2014-03-17 13:21:54 +01:00
Vincent Petry
4033eba374 Fixed chunking and insufficient storage check 
- fixed free space detection based on the already uploaded chunks
- now deleting chunks as soon as it is read out before writing it into
  the part file, which reduces the space needed when assembling part
files
 2014-03-17 13:04:34 +01:00
Vincent Petry
bd98538a36 Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete_hook_2 
use preDelete instead of postDelete hook
 2014-03-17 12:59:35 +01:00
Robin Appelman
166dfbf58b use a non-recursive chmod on the datadir 2014-03-17 12:53:55 +01:00
Vincent Petry
145db370d1 Correctly round bytes when converted from human readable format 
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
 2014-03-17 12:15:12 +01:00
Thomas Müller
cd038604d3 unit tests for specific image type output added 2014-03-17 08:40:59 +01:00
Thomas Müller
79ba930ef9 fixing PHPDoc 2014-03-17 08:17:56 +01:00
Vincent Petry
b619ff6076 Return 503 when a config/data dir error exists 2014-03-14 21:05:15 +01:00
Georg Ehrke
3527adbbe1 OC_Image::_output() - throw exception instead of falling back to png 2014-03-14 18:19:16 +01:00
Georg Ehrke
9dee3772eb remove image/pjpeg from OC_Image::_output 2014-03-14 18:12:33 +01:00
Vincent Petry
3c46dcd7dd Added .ocdata file to check for data folder validity 
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.
 2014-03-14 15:36:35 +01:00
Georg Ehrke
c140010e81 don't change mimetype of whole image object 2014-03-14 11:17:20 +01:00
Vincent Petry
1a116828cf Added warning for trusted_domains after CLI upgrade 
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.
 2014-03-14 11:16:45 +01:00
Georg Ehrke
0c3c75efd5 always output a png 2014-03-14 11:14:09 +01:00
Georg Ehrke
6f96ab3e90 make it possible to influence output type of \OC_Image 2014-03-14 11:13:45 +01:00
Robin Appelman
eabeedb306 Merge branch 'master' into cachehooks-first 2014-03-13 15:22:00 +01:00
Georg Ehrke
f438337493 improve validation of getFileInfo in \OC\Preview 2014-03-13 12:32:13 +01:00
Georg Ehrke
8048868bd7 use preDelete instead of postDelete hook 2014-03-13 03:14:42 +01:00
Vincent Petry
b2ac8755ce Merge pull request #6632 from eduardosan/master 
Fix PostgreSQL port configuration on install
 2014-03-12 18:52:47 +01:00
Vincent Petry
ce790119ae Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions 
set content-type on ocs exceptions
 2014-03-12 10:19:40 +01:00
Thomas Müller
88f6dd7db1 fixing method names 2014-03-12 10:00:22 +01:00
Thomas Müller
743addd1e3 set content-type on ocs exceptions 2014-03-12 00:35:19 +01:00
Thomas Müller
7c78368e8b sanitize fallbackId 2014-03-12 00:18:51 +01:00
adrien
ea6f8ba352 fix remove cache when delete 2014-03-11 16:58:10 +01:00
Robin Appelman
d55c7223a9 Merge branch 'master' into foldersize-reuse 
Conflicts:
lib/private/files/cache/homecache.php
 2014-03-11 13:04:20 +01:00
Vincent Petry
c1cb9ee9b0 Merge pull request #7650 from owncloud/quota-totalspace 
Fixed total space display when data size exceeds quota
 2014-03-11 12:40:59 +01:00
adrien
f827761e71 remove static variable, add limit and offset 2014-03-11 11:56:46 +01:00
Thomas Müller
0de43f1fbe remove magic handling of recipient lists by exploding the string - this functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname 2014-03-10 21:56:37 +01:00
Thomas Müller
f1ecc758f5 send an individual email to each recipient 2014-03-10 21:54:23 +01:00
Vincent Petry
1cde17d60b Merge pull request #7602 from owncloud/flush-updater-cache 
Reset time of last update feed polling after successful update
 2014-03-10 19:54:00 +01:00
Vincent Petry
010eef95c0 Fixed total space display when data size exceeds quota 
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
 2014-03-10 17:59:14 +01:00
Vincent Petry
f4f61f03c9 Disable XML entities when parsing XML 2014-03-10 17:51:13 +01:00
adrien
415b1d03bc fix cache when remove an user 2014-03-10 17:27:51 +01:00
Thomas Müller
9fe5033f1e PHPDoc updated 2014-03-10 17:15:19 +01:00
Thomas Müller
41f814515e Merge branch 'master' into close-session-faster-master 2014-03-10 17:00:09 +01:00
Vincent Petry
4fdf7682c9 Merge pull request #7398 from owncloud/trash_dont_rely_on_db 
[trash] fall back if file is not in db
 2014-03-10 16:04:47 +01:00
Thomas Müller
a074adb2af fix close() implementation in \OC\Session\Internal 2014-03-10 15:36:20 +01:00
Bjoern Schiessle
4562909a20 get trash size from file cache 2014-03-10 15:13:28 +01:00
Thomas Müller
3c5185edab Merge pull request #7632 from owncloud/fix-7582-master 
we first shall check if the current session is valid - otherwise the ses...
 2014-03-10 15:10:19 +01:00
Thomas Müller
f0603a971d close the session for all DAV calls right after authentication - no need to write to the session afterwards 2014-03-10 14:40:36 +01:00
Thomas Müller
73a1ece753 adding an explicit close method to class session - write operations (set and remove) being called after close() will throw an exception 2014-03-10 14:21:12 +01:00
Robin Appelman
26793e1f94 switch OC::getRouter usages to OC::$server->getRouter 2014-03-10 14:06:47 +01:00
Robin Appelman
8ab7d18a6a Move the router classes to a namespace and expose it with a public interface 2014-03-10 14:04:58 +01:00
Vincent Petry
26513bc17b Merge pull request #7624 from owncloud/enc-encryptedusedspacefix 
[master] Fixed used space to be based on unencrypted size
 2014-03-10 09:38:24 +01:00
Thomas Tanghus
212699e389 Merge pull request #7628 from owncloud/fileinfo-type 
Fix FileInfo->getType errors
 2014-03-09 23:34:01 +01:00
nishiki
ba9d8f7c1a fix undifined uid 2014-03-09 12:47:19 +01:00
nishiki
75011c2e09 add query result (boolean) for update or delete 2014-03-09 12:22:47 +01:00
nishiki
d8843f6cd3 minor clean code 2014-03-09 12:01:35 +01:00
Thomas Müller
25f523680a fixing ident 2014-03-07 20:06:06 +01:00
Thomas Müller
0d90b90d94 we first shall check if the current session is valid - otherwise the session-id will be regenerated on login via basic auth 2014-03-07 20:00:34 +01:00
Robin Appelman
51165a1a04 Check if value exists before returning 2014-03-07 15:16:35 +01:00
Vincent Petry
48d63a6278 Return unencrypted_size of folder when queried 
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
 2014-03-07 14:59:09 +01:00
Robin Appelman
65f52fee4f Fix FileInfo->getType errors 2014-03-07 14:52:44 +01:00
Robin Appelman
db6fb198fe don't throw errors in getType 2014-03-07 14:27:23 +01:00
icewind1991
3eb58d9973 Merge pull request #7529 from owncloud/getlocalfile-cache 
Add caching for getLocalFile on remote storages
 2014-03-07 13:29:47 +01:00
Vincent Petry
7f24d42ca5 Propagate unencrypted_size up to the file cache root 2014-03-07 11:00:22 +01:00
Vincent Petry
ba3f5fe53a Merge pull request #7583 from owncloud/trusteddomainerrorpage 
[master] Show warning page when accessing server from an untrusted domain
 2014-03-07 10:37:16 +01:00
adrien
fbde24c89a fix undefined in loadUsers 2014-03-07 08:46:34 +01:00
Thomas Tanghus
ceb5b918d7 Add \OC:: to URLGenerator::getAbsoluteURL() 2014-03-06 23:56:11 +01:00
adrien
5cdfc56867 update the cache when add user 2014-03-06 22:34:43 +01:00
adrien
dde4f2f917 upgrade the cache user 2014-03-06 22:23:17 +01:00
adrien
08a46e3080 add cache for single users 2014-03-06 17:57:09 +01:00
Vincent Petry
536c33895f Merge pull request #7592 from owncloud/fixstoragefreespace 
Fixed upload issue when free space is not known (ex: FTP)
 2014-03-06 17:22:40 +01:00
Vincent Petry
1b8cf18c91 Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix 
Fix imagerotate and move loadFromBase64() one up
 2014-03-06 17:18:17 +01:00
Victor Dubiniuk
242cbb802a Reset time of last update feed polling 2014-03-06 18:19:58 +03:00
Vincent Petry
6e4ea09d52 Merge pull request #7494 from owncloud/fix-7307 
Replace OC.Router.generate() with OC.generateUrl()
 2014-03-06 14:49:12 +01:00
Robin Appelman
895fc0fa26 Fix check if fileinfo is valid 2014-03-06 14:23:27 +01:00
Vincent Petry
0dcac65aa1 Fixed upload issue when free space is not known 2014-03-06 13:53:55 +01:00
Robin Appelman
84cf40ed82 merge master into webdav-injection 2014-03-06 13:35:06 +01:00
Georg Ehrke
eb5265b106 fix merge conflicts 2014-03-06 11:55:45 +01:00
Vincent Petry
9136e6ad30 Fixed X-Forwarded-Host parsing 2014-03-06 11:51:25 +01:00
Vincent Petry
f8fe2753b1 Added localhost as trusted domain 2014-03-06 11:51:10 +01:00
Vincent Petry
421cff00bd Show warning page when accessing server from an untrusted domain 
Added early check for the requested domain host and show a warning
page if the domain is not trusted.
 2014-03-06 11:51:08 +01:00
Thomas Müller
32b29c9d73 Merge branch 'master' into fix-7307 
Conflicts:
	core/js/router.js
	settings/js/admin.js
 2014-03-06 00:15:08 +01:00
Lukas Reschke
e3156fa5ad Merge pull request #7354 from pschmitt/master 
Use 'command -v' to detect whether and where software is installed (instead of 'which')
 2014-03-05 19:25:09 +01:00
Björn Schießle
9111af0478 Merge pull request #7531 from owncloud/dont_create_shared_folder 
don't allow to create a file or folder named 'Shared' in the root folder
 2014-03-05 18:13:31 +01:00
Georg Ehrke
dbf83aada2 fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case 2014-03-05 15:57:45 +01:00
Georg Ehrke
32a5d51fa6 add fclose, fixes issue from bdb96b9af8 2014-03-05 15:37:26 +01:00