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

783 commits

Author SHA1 Message Date
Robin Appelman
50cc6a85e5 Add explicit sorting 2014-02-11 14:26:40 +01:00
Robin Appelman
a6399f9cef Add the background job list to the public server container 2014-02-11 14:00:24 +01:00
Robin Appelman
a7c50514ac Merge branch 'master' into convert-oc_appconfig 2014-02-11 13:26:54 +01:00
Arthur Schiwon
af781bdea7 fix DI 2014-02-11 10:50:03 +01:00
Arthur Schiwon
32afdcbefe Inject logger 2014-02-11 10:49:59 +01:00
Arthur Schiwon
20bfbb0fd9 wrong tld 2014-02-11 10:49:54 +01:00
Arthur Schiwon
82716ced48 sort following entries in alphabetical order 2014-02-11 10:49:41 +01:00
Arthur Schiwon
41e8d44cf7 move sorter into a class 2014-02-11 10:49:34 +01:00
Bart Visscher
082abdc620 Merge branch 'master' into migration_unit_tests 2014-02-10 21:32:17 +01:00
Vincent Petry
bea80ffe20 Merge pull request #6881 from owncloud/remove-user-storage-entry 
Also remove the user's home storage from the storage table when deleting a user
 2014-02-10 15:04:05 +01:00
Tom Needham
84607db284 Merge pull request #6988 from owncloud/oc_api_fix_warinigs 
[ocs API] getData() always needs to return an array
 2014-02-10 13:43:16 +00:00
Robin Appelman
e6df86f4cb Merge branch 'master' into quota-space-root 2014-02-10 14:03:06 +01:00
Robin Appelman
753af3a3ff Merge branch 'master' into storagestatistics-reuse 2014-02-10 14:01:32 +01:00
Robin Appelman
5ffc43cba0 Merge branch 'master' into remove-user-storage-entry 2014-02-10 13:53:01 +01:00
Thomas Müller
45d07906b8 Merge pull request #7131 from owncloud/issue/6269 
Change MySQL to MariaDB/MySQL in the frontend
 2014-02-10 11:09:03 +01:00
Thomas Müller
8c7fb64b8b Merge pull request #7066 from owncloud/check_svg_installed 
properly check if pdf and svg modules are installed
 2014-02-10 10:28:32 +01:00
Thomas Müller
8de9758fee Merge pull request #7071 from jcfischer/master 
close statement in MimeType detection is executed [#7069]
 2014-02-10 10:27:21 +01:00
Andreas Fischer
bbfd97ce03 Merge pull request #6247 from owncloud/memcached-multiple-servers 
Add support for multiple memcached servers.

* owncloud/memcached-multiple-servers:
  Readd support for memcached_server config variable.
  Add support for multiple memcached servers.
 2014-02-08 14:21:19 +01:00
Joas Schilling
b330d07b51 Fix more documentation failes 
Issue #7111
 2014-02-08 11:47:55 +01:00
Robin Appelman
8ad3fc89be Merge branch 'master' into quota-space-root 2014-02-07 23:29:26 +01:00
Thomas Tanghus
2ff0d3a255 Test if $url is already prefixed by '/' 2014-02-07 17:39:19 +01:00
Joas Schilling
dbec143f09 Change MySQL to MySQL/MariaDB in the frontend 
Fix issue #6269
 2014-02-07 17:03:43 +01:00
Bjoern Schiessle
dc53c83e7b getData() always needs to return an array 2014-02-07 16:38:15 +01:00
Robin Appelman
cd3ef0bb9d Add caching to appconfig 2014-02-07 14:03:39 +01:00
Thomas Müller
f0afbffaef Merge pull request #6997 from owncloud/fix_l10n_warnings 
change order of issubdirectory() calls to avoid error messages for non-apps
 2014-02-07 13:47:33 +01:00
Robin Appelman
b537d90e58 use the 'new' server container for appconfig 2014-02-07 13:45:59 +01:00
Vincent Petry
788c8540aa Added isLocal() method to storage, used for xsendfile 
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
 2014-02-06 20:53:15 +01:00
Vincent Petry
be47e156a5 Merge pull request #6952 from MartialGeek/add_freebox_support 
New user agent added for the Freebox.
 2014-02-06 18:12:32 +01:00
Vincent Petry
5ab12a8b85 Merge pull request #6445 from owncloud/fix_5956 
fix issue with logging non utf8 chars
 2014-02-06 17:47:13 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Robin Appelman
1e79369338 merge master into storagestatistics-reuse 2014-02-05 13:36:55 +01:00
Jan-Christoph Borchardt
0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg 
Change misleading message when file size exceeds upload limit
 2014-02-04 08:04:19 -08:00
Jens-Christian Fischer
11f46e121c close statement in MimeType detection is executed [#7069] 
close statement was never executed due to it being after a return
statement.
 2014-02-04 17:03:52 +01:00
Vincent Petry
bd6734291c Merge pull request #6081 from owncloud/partfilewebdavfix 
Allow getting info or renaming part files through WebDAV
 2014-02-04 07:48:37 -08:00
Robin Appelman
f830ad0e47 Don't create new thumbnails on the write hook 2014-02-04 16:28:41 +01:00
Morris Jobke
3c80071807 Merge pull request #4795 from owncloud/setup 
Move core setup code to controller class
 2014-02-04 06:04:21 -08:00
icewind1991
a27529709b Merge pull request #6647 from owncloud/memcache-public 
Add Memcache to the public api
 2014-02-04 05:38:53 -08:00
Georg Ehrke
d55ef442cd properly check if pdf and svg modules are installed 2014-02-04 12:59:14 +01:00
Bjoern Schiessle
36838b2837 add test for password remove method 2014-02-04 11:18:04 +01:00
Björn Schießle
c0aeaf9ec0 Merge pull request #7013 from owncloud/dont_write_passwords_to_log 
wrap stat() call in a try/catch block
 2014-02-03 07:58:44 -08:00
Robin Appelman
0ae4022fb4 Also clean up the filecache table when deleting a storage entry 2014-02-03 16:36:21 +01:00
Robin Appelman
8d6a3a00b4 Revert "Use Cache->clear to cleanup the filecache for removed users" 
This reverts commit 5a5b6f187e.
 2014-02-03 16:29:04 +01:00
Bjoern Schiessle
cf5277b558 also load error handler if debugging is enabled 2014-02-03 12:08:28 +01:00
Bjoern Schiessle
44b637470c remove passwords in URLs from all log messages 2014-02-03 12:07:56 +01:00
Bart Visscher
f1c60c7f8b Remove unused functions from OC_Helper 
init_var and init_radio  where only used in the installation template
 2014-01-31 17:33:15 +01:00
Bart Visscher
bca725dc32 Merge branch 'master' into setup 
Conflicts:
	core/setup.php
 2014-01-31 16:43:12 +01:00
Robin Appelman
0d9fe770f3 Mark an app as loaded before we start loading it 2014-01-31 15:12:21 +01:00
Pellaeon Lin
099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg 
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
 2014-01-30 22:50:20 +08:00
Tigran Mkrtchyan
8cc9727520 mount: make location of mount.json configurable 
do not share users data with config files

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 2014-01-29 17:14:23 +01:00
Robin Appelman
4e2b52a376 merge master into fileinfo 2014-01-29 16:33:27 +01:00
Jan-Christoph Borchardt
f5f918b8bf Merge pull request #6903 from owncloud/fix-ms-office-icons 
Add/fix Microsoft Office file icons.
 2014-01-29 07:31:25 -08:00
Bjoern Schiessle
229f13adc0 change order of issubdirectory() calls to avoid error messages for non-apps 2014-01-29 14:40:59 +01:00
Martial Saunois
0f1c587e6b The regexp of the Freebox user agent is now more strict. 
A new unit test has been added in consequence.
 2014-01-29 10:58:34 +01:00
Thomas Müller
ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions 
Added exception logger plugin for sabre connector
 2014-01-27 07:48:40 -08:00
Robin Appelman
20c2aaab00 Actually rename the variable 2014-01-27 16:26:54 +01:00
Robin Appelman
c8207312c7 Fix phpdoc 2014-01-27 16:00:10 +01:00
Robin Appelman
3c1ab66eda Reuse the calculated free_space in buildFileStorageStatistics 2014-01-27 15:56:57 +01:00
Robin Appelman
a521949baf Allow passing a root folder to get the used space from in the quota wrapper 2014-01-27 15:41:56 +01:00
Vincent Petry
11ef12a106 Added exception logger plugin for sabre connector 
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.

This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.

This will make it much easier to debug syncing issues.
 2014-01-27 11:40:17 +01:00
Martial Saunois
c2ed8d5aa1 New user agent added for the Freebox. 
The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.
 2014-01-26 18:46:09 +01:00
Thomas Tanghus
5f610a1cbc Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840 2014-01-24 16:40:32 +01:00
Robin Appelman
1ab7ca0a19 Fix some phpdoc errors and rename interface 2014-01-24 16:01:19 +01:00
Robin Appelman
fc5f20112e Add isReadable, isUpdateable, isDeletable, isShareable 2014-01-24 15:54:40 +01:00
Otto Sabart
2f8ebd03b0 Add check for apc.enabled option 
Sometimes it's not possible to disable APC entirely and some of
apc_functions are disabled. Only thing which is possible is
to disable apc.enable option.
 2014-01-24 15:52:28 +01:00
Vincent Petry
5ad28f4d1f Allow getting info or renaming part files through WebDAV 
When mounting an ownCloud (backend OC) inside another ownCloud (frontend
OC), the frontend OC will use WebDAV to upload file, which will create
part files. These part files need to be accessible for the frontend OC
to rename them to the actual file name.

This fix leaves the file cache untouched but gives direct access to part
file info when requested.

This means that part file can be accessed only when their path and name
are known. These won't appear in file listtings.

Fixes #6068
 2014-01-23 18:42:56 +01:00
Andreas Fischer
96f194c0f6 Add icons for mdb and accdb files. 2014-01-23 03:06:14 +01:00
Andreas Fischer
47ea7704ca Fix icons for xml,ppt,dot,dotx files. 2014-01-23 02:46:05 +01:00
Andreas Fischer
689516ebd7 Remove duplicate mimetypes while keeping previous behaviour. 2014-01-23 02:23:20 +01:00
Andreas Fischer
6241655df4 Bring mimetype list into alphabetical order. 2014-01-23 02:15:42 +01:00
Robin Appelman
02aa44d055 Merge branch 'master' into memcache-public 2014-01-22 13:19:49 +01:00
Robin Appelman
5a5b6f187e Use Cache->clear to cleanup the filecache for removed users 2014-01-22 13:00:45 +01:00
Nicolai Ehemann
99ad4e8000 switched zip file creation to ZipStreamer to create zip files directly in memory 2014-01-22 12:49:52 +01:00
Nicolai Ehemann
791772abea refactored/cleaned up lib/files.php 
cleaned up get() logic
fixed get() to only send headers if requested (xsendfile could get in the way)
do no longer readfile() when already using mod_xsendfile or similar
 2014-01-22 11:53:03 +01:00
Robin Appelman
374e3475c9 Also remove the user's home storage from the storage table when deleting a user 2014-01-21 23:58:48 +01:00
Jörn Friedrich Dreyer
0dd54a1250 Merge pull request #6844 from owncloud/fix-css-loading-master 
Revert "use getAppWebPath() in here as well"
 2014-01-21 08:31:22 -08:00
Thomas Müller
262f221d11 Merge branch 'master' into fix-setupfs-only-for-existing-users-master 2014-01-21 15:35:32 +01:00
Jörn Friedrich Dreyer
267e1f3c40 use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' 2014-01-21 12:41:10 +01:00
Thomas Müller
23a4d0d44e OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error 2014-01-21 11:32:30 +01:00
Thomas Müller
0f794b6889 Merge pull request #6820 from owncloud/phpunit-test-config 
Load a separate config (if present) when running unit tests
 2014-01-20 12:14:09 -08:00
Robin Appelman
3d6d8d1bb6 Reuse the data retrieved from the cache in checkUpdate 2014-01-20 15:21:21 +01:00
Vincent Petry
62dd58aa19 Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix 
Fixed quota wrapper to not wrap failed fopen streams
 2014-01-20 05:29:27 -08:00
Thomas Müller
221e656e91 Revert "use getAppWebPath() in here as well" 
This reverts commit 6254f0a403.
 2014-01-20 10:10:34 +01:00
Thomas Müller
39be83ca8b Merge pull request #6676 from aseques/check_internet_proxy 
Fix internet detection to use OC_Util::getUrlContent
 2014-01-19 12:08:55 -08:00
Vincent Petry
1af7dab535 Fixed quota wrapper to not wrap failed fopen streams 
When calling fopen() on some storage types, these return false instead
of throwing an exception.

This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.

Also added 'rb' as another case that doesn't need to be wrapped.

Fixes #6832
 2014-01-19 18:51:36 +01:00
Morris Jobke
3a2e03a7f0 Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps 
Fix activation of unknown apps
 2014-01-18 08:13:57 -08:00
Nicolai Ehemann
66aa9b4e27 lib/files.php: make use of === instead of == 2014-01-18 15:16:17 +01:00
Bjoern Schiessle
bf0471a92e show link to app documentation 2014-01-17 14:56:25 +01:00
Robin Appelman
5cb08bb9cb Merge branch 'master' into fileinfo 
Conflicts:
	tests/lib/files/cache/cache.php
 2014-01-17 14:47:29 +01:00
Robin Appelman
6b4c3df087 Load a separate config (if present) when running unit tests 2014-01-17 14:40:48 +01:00
Robin Appelman
504645cf00 Add bindParam to statement wrapper 2014-01-16 14:07:16 +01:00
Thomas Müller
7f68497b39 error handling in case a requested app doesn't exists 2014-01-15 17:11:29 +01:00
Robin Appelman
729210daa0 Merge branch 'master' into memcache-public 
Conflicts:
	apps/user_ldap/lib/connection.php
 2014-01-15 13:02:15 +01:00
Thomas Müller
d4519125db Merge pull request #6744 from owncloud/fix_ocs_response_messages 
keep response message
 2014-01-15 03:17:24 -08:00
Vincent Petry
34559ef114 Merge pull request #6768 from owncloud/scanner-use-storage-mtime 
Use storage_mtime when determining if we can reuse cached data while scanning
 2014-01-15 01:31:33 -08:00
Robin Appelman
c01949ec0e Merge branch 'master' into fileinfo 2014-01-14 16:31:08 +01:00
Vincent Petry
c3a0b0d7f3 Merge pull request #6704 from owncloud/encryptedfoldersizecalc 
Fix calculated folder size to use unencrypted size
 2014-01-14 07:20:16 -08:00
Robin Appelman
203d5d01ca Use storage_mtime when determining if we can reuse cached data while scanning 2014-01-14 13:54:07 +01:00
Robin Appelman
e706cf6c06 add Support for passing a FileInfo instance to View->putFileInfo 2014-01-13 15:57:49 +01:00
Robin Appelman
82762bb462 remove ArrayAccess, JsonSerializable from the public part of FileInfo 2014-01-13 15:13:45 +01:00
Robin Appelman
617acbd6f9 Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search 2014-01-13 14:28:49 +01:00
Bjoern Schiessle
6845860470 keep response message 2014-01-13 12:27:05 +01:00
st3so
a2cae551f3 fixing typo in redirection query string 2014-01-12 15:49:32 +01:00
Georg Ehrke
6f21da12e8 encode imagePath and fix documentation of loadFromFile 2014-01-11 12:07:28 +01:00
Joan
2abea96462 Disabled internet checking as mentioned when in proxy mode 2014-01-10 09:33:35 +01:00
Andreas Fischer
acd81f6c69 Readd support for memcached_server config variable. 2014-01-10 00:57:40 +01:00
Andreas Fischer
320353c237 Add support for multiple memcached servers. 2014-01-10 00:57:34 +01:00
Vincent Petry
4faba49f0a Fix calculated folder size to use unencrypted size 
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
 2014-01-09 17:47:50 +01:00
Vincent Petry
b24c21b00f Merge pull request #6687 from owncloud/sharing-fixpartfilehandling 
Removed special handling of part files in shared storage rename
 2014-01-09 06:16:43 -08:00
Robin Appelman
5d456c7cc2 Merge branch 'master' into memcache-public 2014-01-09 13:54:58 +01:00
Thomas Müller
22bd69f75c set login name within apache auth backend 2014-01-09 10:28:24 +01:00
Thomas Müller
9b7c3a5c66 fixing PHPDoc and use cameCase names 2014-01-09 10:27:47 +01:00
blizzz
d8b8abb429 Merge pull request #6681 from owncloud/userreport 
add command line option to get user number statistics
 2014-01-08 10:41:39 -08:00
Arthur Schiwon
4585b4ea3f Infowarning about 32bit 2014-01-08 19:41:10 +01:00
Vincent Petry
8eaa39f4e2 Removed special handling of part files in shared storage rename 
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
 2014-01-08 18:43:20 +01:00
Thomas Müller
e35bca1c26 Fix ownCloud for php5.3.x 2014-01-08 16:07:01 +01:00
Robin Appelman
5a2a0426a6 Also update the OCP\IServerContainer 2014-01-08 15:51:40 +01:00
Robin Appelman
be7837402d get the memorycache factory from OCP\Server instead of a cache instance 
this allows apps to specify a prefix to use
 2014-01-08 15:18:12 +01:00
Arthur Schiwon
d7cb5ab080 add tests for user counting 2014-01-08 13:26:48 +01:00
Arthur Schiwon
cb6a3e2617 if backends have the same class name, sum their users up instead of overwriting 2014-01-08 13:24:28 +01:00
Vincent Petry
f642ad3961 Prevent deleting storage root 
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.

Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
 2014-01-08 13:17:36 +01:00
Thomas Müller
4c93b00990 Merge branch 'master' into disable-mod_pagespeed 2014-01-08 10:19:16 +01:00
Vincent Petry
1614ad42b3 Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfilesfix 
Now also preventing to override "files" dir size with -1
 2014-01-08 00:55:11 -08:00
Thomas Müller
5eef107344 turn off mod_pagespeed 2014-01-08 07:56:08 +01:00
Jörn Friedrich Dreyer
f356894aa3 Merge pull request #6594 from owncloud/kill-index.php-from-url 
Kill index.php from url
 2014-01-07 22:28:58 -08:00
Arthur Schiwon
1e1ced7772 Introduce user count action to user management 2014-01-07 23:05:37 +01:00
Vincent Petry
5be4af9f51 Now also preventing to override "files" dir size with -1 
Fixes #6526
 2014-01-07 22:34:01 +01:00
Thomas Müller
b6474506eb Merge pull request #6660 from owncloud/fixing-disabled-function-checks 
Fixing disabled function checks
 2014-01-07 11:10:45 -08:00
Thomas Müller
2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition 
Files androidcontentdisposition
 2014-01-07 11:06:20 -08:00
Thomas Müller
09d7882571 trimming all array elements 2014-01-07 19:47:01 +01:00
Thomas Müller
3abe4c3e88 Merge pull request #6663 from owncloud/fix_empty_mimetypes 
remove duplicate exe mimetype, add correct msi mimetype
 2014-01-07 07:31:12 -08:00
Jörn Friedrich Dreyer
9404a8f40c remove duplicate exe mimetype, add correct msi mimetype 2014-01-07 15:51:08 +01:00
Thomas Müller
9d869ab596 we shall explode on ',' only 2014-01-07 14:53:02 +01:00
Thomas Müller
07a84aa5eb reuse existing helper function OC_Helper::is_function_enabled 2014-01-07 14:52:18 +01:00
Thomas Müller
970eed2867 Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-master 
Adding a random postfix to the part file.
 2014-01-07 03:25:26 -08:00
Thomas Müller
ed469a7d2c in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string 2014-01-07 11:53:33 +01:00
tomneedham
5c3c379f35 Merge branch 'fix-5388-master' into migration_unit_tests 2014-01-07 00:40:36 +00:00
Robin Appelman
4d65a80892 Remove the static dependency on OC_Util from Memcache 2014-01-06 13:11:38 +01:00
Robin Appelman
cd147bb37a Use APCIterator for Memcache\APC::clear() 2014-01-06 12:58:43 +01:00
Robin Appelman
1df1b55b66 expose memory cache in public api 2014-01-06 12:55:56 +01:00
Morris Jobke
ce3df44699 Merge pull request #6031 from s0taka/master 
No decimal points for Kilobyte and Byte #5371.
 2014-01-05 11:52:10 -08:00
tomneedham
1824ae1222 Merge branch 'master' into fix-5388-master 2014-01-04 13:46:08 +00:00
icewind1991
f016a3ead3 Merge pull request #6610 from owncloud/apcu-clear 
Fix APCIterator syntax in \OC\Memcache\APCu::clear
 2014-01-03 05:30:49 -08:00
Thomas Müller
1ce45713bd Merge pull request #6605 from owncloud/free_space_disabled 
Return SPACE_UNKNOWN if disk_free_space is disabled
 2014-01-02 08:19:52 -08:00
Robin Appelman
83f968ace2 Fix APCIterator syntax in \OC\Memcache\APCU::clear 
see http://www.php.net/manual/en/apciterator.construct.php
 2014-01-02 16:12:56 +01:00
icewind1991
14e0b1b6d1 Merge pull request #6513 from owncloud/user-no-change-displayname 
Re-add the config options to remove the ability for users to change their displayname
 2014-01-02 05:04:27 -08:00
Robin Appelman
25370fcb82 Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage 2014-01-02 13:19:10 +01:00
Thomas Müller
25a9311e94 Merge pull request #6601 from AdamWill/pimple-include 
don't specify path to 3rdparty directory when registering Pimple autoloader
 2014-01-01 15:25:58 -08:00
Adam Williamson
9b4a827e0b don't specify path to 3rdparty directory when registering Pimple autoloader 
The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.
 2014-01-01 09:52:19 -08:00
lolozere
d5382ac05d Add support mimetype 
Add support mimetype for extension .sh, .bash and .sh-lib
 2014-01-01 14:09:02 +01:00
Niklas Sombert
4c179850ab Revert "Added support for extra backends (see pull request #5043)" 
This reverts commit 2d75914f2a, reversing
changes made to 760fa9ea30.
 2014-01-01 13:43:23 +01:00
Niklas Sombert
2d75914f2a Added support for extra backends (see pull request #5043) 
Somebody had forgotten "OC_User::setupBackends();"...
 2014-01-01 11:53:27 +01:00
Thomas Müller
6254f0a403 use getAppWebPath() in here as well 2013-12-31 15:12:17 +01:00
Thomas Müller
ae5671d281 new config parameter 'front_controller_active' which will instruct the url generator to generate urls without index.php 2013-12-31 14:36:02 +01:00
Thomas Müller
97031ba45c Merge pull request #6520 from owncloud/tests-testcleanuplistener 
Added test cleanup listener to detect untidy tests
 2013-12-24 14:27:39 -08:00
Thomas Müller
efdeba7416 Merge pull request #6449 from owncloud/core-appsorderfix 
Fixed apps loading order
 2013-12-24 14:26:11 -08:00
Andreas Fischer
63a2bea7ec Remove OC_DB_StatementWrapper::numRows(). 
Using this method will result in an unneccesary extra SQL query (which also may
return an incorrect result because the underlying table changed in the
meantime).

In general:

If you are performing an UPDATE, DELETE or equivalent query,
OC_DB_StatementWrapper::execute() will already give you the number of
"affected rows" via \Doctrine\DBAL\Driver\Statement::rowCount(). This will
not work for SELECT queries, however.

If you want to know whether a table contains any rows matching your condition,
use "SELECT id FROM ... WHERE ... LIMIT 1".

If you want to know whether a table contains any rows matching your condition
and you also need the data, use "SELECT ... FROM ... WHERE ...", then use
one of the fetch() methods.

If you want to count the number of rows matching your condition, use use
"SELECT COUNT(...) AS number_of_rows FROM ... WHERE ...", then use one of the
fetch() methods.
 2013-12-21 19:36:14 +01:00
nhirokinet
c2e2c59ca7 Update user.php to fix duplicate session-duplicate 2013-12-22 01:31:04 +09:00
Vincent Petry
c6377e9125 Fixed apps loading order 
On SQLite the app order can be arbitrary and cause strange bugs.
On MySQL, the app order seems to be always alphabetical.

This fix enforces alphabetical order to make sure that all environments
behave the same and to reduce bugs related to app loading order.

Fixes #6442
 2013-12-20 17:16:57 +01:00
Thomas Müller
1c0b8ed214 Adding a random postfix to the part file. 2013-12-20 13:48:46 +01:00
Bart Visscher
ac85dea267 Fix migration import of user files 2013-12-20 12:22:49 +01:00
Bart Visscher
34fcf1e9d0 Wrap the import/export db in a wrapper to make it compatible with the old style 2013-12-20 12:09:19 +01:00
Frank Karlitschek
dc45141f4a Merge pull request #6262 from nickvergessen/issue/4375 
correctly mark app management active
 2013-12-20 02:27:52 -08:00
Vincent Petry
1c340444a4 Added test cleanup listener to detect untidy tests 
After each test suite, detects whether there are stray datafiles, hooks
or proxies, then show a warning and clear them.
 2013-12-19 20:18:09 +01:00
NARUKAWA Hiroki
068688063e Security Update: session fixation 
Previous version is vulnerable to session fixation attack in some situations, guessing non-apache-module-php5 environment. Regeneration of session id should be done here.
 2013-12-20 03:38:51 +09:00
Vincent Petry
09bd5bd517 Added isUserAgent() method to request 
- added isUserAgent() method to OC_Request which makes it possible to
  test it
- OC_Response::setContentDisposition now uses OC_Request::isUserAgent()
 2013-12-19 18:40:22 +01:00
Andreas Fischer
526e873073 Merge pull request #6219 from leo-b/fix_router_deprecation 
Symfonys addCollection() with multiple arguments is deprecated

* leo-b/fix_router_deprecation:
  Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
 2013-12-19 17:38:37 +01:00
Robin Appelman
321d961353 Merge branch 'master' into user-no-change-displayname 2013-12-19 15:57:04 +01:00
Thomas Müller
ae3df84e20 Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-json 
only walk an array
 2013-12-19 03:25:58 -08:00
icewind1991
3ea01e2152 Merge pull request #6492 from owncloud/appconfig-cache 
Fetch all appconfig values for an app at once and cache the results
 2013-12-19 03:25:20 -08:00
Thomas Müller
9b18a4fd87 Merge pull request #4378 from owncloud/fixing-3417-master 
Don't use xcache in case admin auth is enabled
 2013-12-19 03:24:37 -08:00
Frank Karlitschek
748d90592a Merge pull request #6502 from owncloud/core-extramimetypes 
Added missing mime types
 2013-12-18 23:41:36 -08:00
Thomas Müller
62fdc2b0dc Merge pull request #6476 from ogasser/dbal_precision_scale 
DB: Support DECIMAL(precision,scale) syntax in XML
 2013-12-18 15:15:26 -08:00
Vincent Petry
b109d411d8 Added missing mime types 
This is mostly to fix acceptance tests that have a .cc file.

Also fixed typo in python mime type.
 2013-12-18 22:40:58 +01:00
Andreas Fischer
38f4ecaeac Merge remote-tracking branch 'owncloud/master' into fixing-3417-master 
* owncloud/master: (30 commits)
  Added entry with ext storage info
  [tx-robot] updated from transifex
  [tx-robot] updated from transifex
  clarifying license
  remove unused method tail()
  reliable detect encrypted files
  [tx-robot] updated from transifex
  remove duplicated code
  add missing quotes + field declarations
  Do not use xcache variable cache if cache size is 0.
  always show home breadcrumb in files view
  Use DEBUG instead of ERROR when favourites not found. Fix #6419
  update file cache for target file
  only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
  Fixed JS plural function to be per app
  call set password hook because it doesn't get triggered during test execution and fix paths
  Do not use L10n when logging exceptions
  Also add default to the \OCP\IConfig interface
  add default parameter for AllConfig->get*Value()
  always show 'Deleted Files' breadcrumb
  ...

Conflicts:
	lib/private/memcache/xcache.php
 2013-12-18 15:44:46 +01:00
Robin Appelman
2e195dbdae dont re-read the config values for an app when a non existing key is fetched 2013-12-18 15:28:32 +01:00
Thomas Müller
6c707323f2 only walk an array 2013-12-18 15:25:28 +01:00
Robin Appelman
5a646477a5 Fetch all appconfig values for an app at once and cache the results 2013-12-18 15:10:12 +01:00
Thomas Müller
277ae28171 Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes 
Fixed download file from URL error messages
 2013-12-18 06:03:50 -08:00
Thomas Müller
a90342b781 Merge pull request #6461 from owncloud/check-xcache-varsize 
Do not use xcache variable cache if cache size is 0.
 2013-12-18 05:36:40 -08:00
Thomas Müller
9c5a620c4f Merge pull request #6256 from owncloud/session-preserver-thirdparty 
preserve 3rd party values in  in the Session destructor
 2013-12-18 05:20:06 -08:00
Robin Appelman
e7a5c90cab Replace static usage of OC_Config and OC_Preferences with the injected \OC\ConfigAll 2013-12-18 13:03:19 +01:00
Robin Appelman
a6c1b3ece3 fix the config option to remove the ability for users to set their displayname 2013-12-18 13:03:19 +01:00
Oliver Gasser
3b0d0e2b1f DB: Support DECIMAL(precision,scale) syntax in XML 
Add support for specifying the precision and scale of a decimal data
type to the XML description language.

See owncloud/core#6475
 2013-12-17 22:46:45 +01:00
Frank Karlitschek
1d0af242b9 Merge pull request #6436 from owncloud/allconfig-defaults 
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
 2013-12-17 05:09:58 -08:00
Thomas Müller
275d666d26 Merge pull request #6438 from owncloud/core-logexceptionfix 
Do not use L10n when logging exceptions
 2013-12-17 00:53:03 -08:00
Andreas Fischer
dfeb04a574 Do not use xcache variable cache if cache size is 0. 
This is possible because it is possible to only use xcache as an opcode cache
but not a variable cache.
 2013-12-17 02:40:16 +01:00
Bart Visscher
8f0c56c1b2 Merge branch 'master' into fix-5388-master 2013-12-16 22:38:22 +01:00
Thomas Tanghus
a3fbad43c1 Use DEBUG instead of ERROR when favourites not found. Fix #6419 2013-12-16 17:07:22 +01:00
Georg Ehrke
059c3c8708 fix issue with logging non utf8 chars 2013-12-16 15:38:55 +01:00
Vincent Petry
2a1d6d3106 Do not use L10n when logging exceptions 
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.

This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
 2013-12-16 15:11:13 +01:00
icewind1991
fed63dff06 Merge pull request #6315 from owncloud/ingroup-cache 
cache the result from inGroup
 2013-12-16 06:01:00 -08:00
Robin Appelman
e2efad6ae7 Also add default to the \OCP\IConfig interface 2013-12-16 14:33:03 +01:00
Robin Appelman
59f02066b6 add default parameter for AllConfig->get*Value() 2013-12-16 14:30:01 +01:00
Andreas Fischer
c205d8d1c9 Merge remote-tracking branch 'owncloud/master' into fixing-3417-master 
* owncloud/master: (1989 commits)
  [tx-robot] updated from transifex
  dont try to register background jobs if we haven't upgraded yet
  adjust test
  coding style
  coding style
  On webdav sesssions, loginname was compared to username which does not need to match necessarily
  rely only on php DateTime to parse the db datetime string
  LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
  Fix webroot for update page
  Update 3rdparty ref
  update 3rdparty
  toggle select all checkbox
  remove unneeded ; in comment
  LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
  Add test for having utf8 filenames in the cache
  fix fallback overwriting result of getHome
  [tx-robot] updated from transifex
  fix smbclient directory listing parser
  cache the home folder of a User
  Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
  ...

Conflicts:
	lib/util.php
 2013-12-14 18:32:48 +01:00
Arthur Schiwon
91d6a6dd7c On webdav sesssions, loginname was compared to username which does not need to match necessarily 2013-12-13 16:58:03 +01:00
Thomas Müller
7b30ffbf23 Merge pull request #6318 from owncloud/gethome-cache 
cache the home folder of a User
 2013-12-13 01:30:43 -08:00
Robin Appelman
8a86837eac remove unneeded ; in comment 2013-12-12 13:59:00 +01:00
Robin Appelman
f23b7a262f fix fallback overwriting result of getHome 2013-12-12 12:57:25 +01:00
Vincent Petry
335b2f40a6 Fixed download file from URL error messages 
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
  OC_L10N_String values
 2013-12-12 10:38:12 +01:00
Robin Appelman
3d29992378 user Group->users as assosiative array 2013-12-11 16:25:41 +01:00