Commit Graph

783 Commits

Author SHA1 Message Date
Bjoern Schiessle 9d32475260 finally fix the paths for the OCS Share API 2014-03-13 15:16:59 +01:00
Bjoern Schiessle 36885dc64c fix path creation for re-shares, issue #7662 2014-03-11 12:58:46 +01:00
Robin Appelman 4a2b16d76d update copyright header 2014-03-10 14:40:05 +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 8ab7d18a6a Move the router classes to a namespace and expose it with a public interface 2014-03-10 14:04:58 +01:00
Thomas Tanghus a1aacc18df Add @return PHPDocs 2014-03-10 09:31:30 +01:00
Thomas Tanghus 8f6ea900f2 Chainable Response in AppFramework 2014-03-09 23:01:16 +01:00
Robin Appelman 65f52fee4f Fix FileInfo->getType errors 2014-03-07 14:52:44 +01:00
Bart Visscher 8951328a87 More PHPDoc updates 2014-02-28 21:03:43 +01:00
Bart Visscher e2286c6598 Type is with a small letter 2014-02-28 14:37:20 +01:00
Bart Visscher 35a8dfb2fa More PHPDoc fixes, using scrutinizer patches as hints 2014-02-28 13:53:41 +01:00
Bart Visscher 89e0763d3d Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N 2014-02-28 13:37:41 +01:00
Bjoern Schiessle e3f676e009 fix path in sharing results if it is a file in the Shared folder 2014-02-25 17:27:23 +01:00
Lukas Reschke 719f1111b6 Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
Scrutinizer Auto-Fixer adaee6a5a1 Scrutinizer Auto-Fixes
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
2014-02-19 09:31:54 +01:00
Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Vincent Petry 797e0a614c Added extra checks for invalid file chars in newfile.php and newfolder.php
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
  check for invalid characters
2014-02-18 17:54:32 +01:00
Lukas Reschke 3b1083f46e Merge pull request #7176 from owncloud/style
Some style fixes
2014-02-18 17:30:26 +01:00
Thomas Müller 750ffa8231 Merge pull request #7156 from owncloud/backgroundjob-public
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
icewind1991 2a7509ee50 Merge pull request #6748 from owncloud/fileinfo
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
Thomas Müller 4b84e3a7e8 Merge pull request #4624 from owncloud/convert-oc_appconfig
Convert OC_Appconfig to object interface
2014-02-13 15:51:40 +01:00
Bart Visscher 2c6411b897 $default of OC_Config::[gs]etValue can have more then string as type 2014-02-12 17:38:32 +01:00
icewind1991 7af456730e Merge pull request #6964 from owncloud/storagestatistics-reuse
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
Robin Appelman 62288971ca Additional phpdoc 2014-02-12 13:32:16 +01:00
Robin Appelman 3aafa837b8 Remove internal methods from the public interface 2014-02-12 13:25:50 +01:00
Robin Appelman 60bd9d512d Merge branch 'master' into backgroundjob-public 2014-02-12 13:21:47 +01:00
Vincent Petry c442a03d3a Merge pull request #7075 from owncloud/quota-storagexsendfile
Added isLocal() method to storage, used for xsendfile
2014-02-11 14:49:39 +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
Robin Appelman 753af3a3ff Merge branch 'master' into storagestatistics-reuse 2014-02-10 14:01:32 +01:00
Joas Schilling b330d07b51 Fix more documentation failes
Issue #7111
2014-02-08 11:47:55 +01:00
Robin Appelman b537d90e58 use the 'new' server container for appconfig 2014-02-07 13:45:59 +01:00
Bjoern Schiessle a8943ad022 replace 'size' with 'unencrypted_size' if encryption is enabled 2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer 81031984a6 remove duplicate param lines for OCP\User::getUsers() 2014-02-07 12:12:16 +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
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
icewind1991 a27529709b Merge pull request #6647 from owncloud/memcache-public
Add Memcache to the public api
2014-02-04 05:38:53 -08: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
Robin Appelman 4e2b52a376 merge master into fileinfo 2014-01-29 16:33:27 +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 3c1ab66eda Reuse the calculated free_space in buildFileStorageStatistics 2014-01-27 15:56:57 +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
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
Jens-Christian Fischer 0f6c607171 added function documentation 2014-01-24 14:22:42 +01:00
Jens-Christian Fischer 506393090b Add 'mail_from_address' configuration
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.

This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
2014-01-24 14:04:37 +01:00
Robin Appelman 02aa44d055 Merge branch 'master' into memcache-public 2014-01-22 13:19:49 +01:00
Thomas Müller 9bab05fd45 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 19:36:20 +01:00
Thomas Müller a3ea5aa2ac fixing comment + adding unit test for checkPasswordProtectedShare 2014-01-21 12:07:08 +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 6746ad0a73 in case no share is found for the given token we can return right away 2014-01-21 10:55:10 +01:00
Thomas Müller 9fd4cb1b66 adding password protection check to getShareByToken() 2014-01-21 10:42:47 +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
Björn Schießle 32e941a2bc Merge pull request #6644 from ben-denham/unshare-all-fix
\OCP\Share::unshareAll() fix
2014-01-16 03:13:26 -08:00
Robin Appelman 82762bb462 remove ArrayAccess, JsonSerializable from the public part of FileInfo 2014-01-13 15:13:45 +01:00
Robin Appelman 39d2c18793 Extends phpdoc for \OCP\File\FileInfo 2014-01-13 14:42:14 +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
Robin Appelman 5d456c7cc2 Merge branch 'master' into memcache-public 2014-01-09 13:54:58 +01:00
Robin Appelman d50c7391d8 Use $server->getMemCacheFactory() in ldap connection 2014-01-09 13:54:50 +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
Thomas Müller 2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
Robin Appelman 4d65a80892 Remove the static dependency on OC_Util from Memcache 2014-01-06 13:11:38 +01:00
ben-denham baccc8f584 Unshare all will now delete all shares for the item, instead of only for a single owner. 2014-01-06 11:14:43 +13:00
Thomas Müller aa17a896ac fix return statement 2013-12-19 00:33:29 +01:00
Thomas Müller 5eae75eeca kill MDB2 in PHPDoc 2013-12-19 00:32:46 +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
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
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
Robin Appelman e2efad6ae7 Also add default to the \OCP\IConfig interface 2013-12-16 14:33:03 +01:00
Robin Appelman 4c45c6f418 dont try to register background jobs if we haven't upgraded yet 2013-12-13 17:15:18 +01:00
Jörn Friedrich Dreyer 6408125edc rely only on php DateTime to parse the db datetime string 2013-12-13 16:38:05 +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
Vincent Petry 409b510889 Moved content disposition code+workarounds to OCP\Response
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.

Refactored download code to use the new API.

Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
Pellaeon Lin fc607e6bce Separate PHP upload limit and free space 2013-12-08 22:59:46 +08:00
Bjoern Schiessle 3f7aac1a79 add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired. 2013-12-05 17:29:15 +01:00
Thomas Müller 832be7c908 Merge pull request #6052 from owncloud/datetime-doctrine
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
Frank Karlitschek a03ba06dcd Merge pull request #6077 from owncloud/fix-api-documentation
API doc for contacts manager, server container and share
2013-11-29 03:24:19 -08:00
Morris Jobke a81909097c Merge pull request #6027 from owncloud/public-api-restful-routing-oc6
fix appframework routing
2013-11-27 01:55:52 -08:00
Morris Jobke b910524acb add comment from @DeepDiver 2013-11-27 10:32:48 +01:00
Morris Jobke 7c88736292 API doc for contacts manager, server container and share 2013-11-27 00:35:36 +01:00
Andreas Fischer 3bbaba1eca Use the Doctrine to convert date string to DateTime object. 2013-11-26 12:21:31 +01:00
Andreas Fischer a330b2ef9b Use DateTime object instead of fixed format date string.
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
2013-11-26 12:00:31 +01:00
Andreas Fischer 9fb1da2811 Use bindValue() instead of passing parameters in execute(). 2013-11-26 11:50:14 +01:00
Owen Winkler 844b4785f1 Merge pull request #6034 from owncloud/fix-api-documentation
Fix api documentation
2013-11-25 11:17:16 -08:00
Thomas Müller 1fdd2ac7ee adding documentation for registerRoutes() 2013-11-25 17:15:08 +01:00
Morris Jobke b3e7e54c8d fix some capital letters 2013-11-25 16:42:28 +01:00
Morris Jobke 4e0fa85307 page level doc blocks and class descriptions 2013-11-25 16:39:01 +01:00
Morris Jobke bc8cc9142e AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixes 2013-11-25 16:28:24 +01:00
Morris Jobke 248eed16a6 fix defaults.php doc 2013-11-25 14:26:26 +01:00
Morris Jobke b7ddc78626 fix db.php doc 2013-11-25 14:06:25 +01:00
Thomas Müller 993fea2f05 fix appframework routing 2013-11-25 11:36:33 +01:00
blizzz 2f73db12bb Merge pull request #5040 from owncloud/public_api_avatar_master
Add public API for \OC\Avatar
2013-11-22 03:42:28 -08:00
Thomas Müller 92c8672c0f fixing PHPDoc comments and syntax 2013-11-22 12:34:37 +01:00
Arthur Schiwon f94a6eb166 Add missing Avatar Interface 2013-11-22 00:43:23 +01:00
Arthur Schiwon 00071401d7 Round out Avatar Public API 2013-11-21 23:40:25 +01:00
Robin Appelman abc428916c Fix fatal error when trying to open a non existing public link 2013-11-12 15:38:00 +01:00
kondou 507325dd50 Add public API for \OC\Avatar 2013-11-07 12:48:40 +01:00
Morris Jobke ef592981ea unify license headers for public API files 2013-11-03 13:51:39 +01:00
Morris Jobke d2a48d58ce fix "No page-level DocBlock" 2013-11-03 13:38:25 +01:00
Andreas Fischer 7c1f0da0fe Always select item_source. 2013-11-03 12:34:40 +01:00
Andreas Fischer fa56aec4b8 Deduplicate expiration date check into a method. 2013-11-03 12:34:38 +01:00
Andreas Fischer 779b87d46a Use unshareItem() when unsharing expired shares. 2013-11-03 12:33:34 +01:00
Andreas Fischer ebf1694795 Use unshareItem() in unshareAll(). 2013-11-03 12:33:34 +01:00
Andreas Fischer 1d1f5b288e Extract unshare() code into unshareItem(). 2013-11-03 12:33:34 +01:00
Andreas Fischer 329299e34c OCP\Share::unshareAll(): Deduplicate hook parameters. 2013-11-03 12:33:31 +01:00
Morris Jobke 0dbe90cc9a fix documentation stuff 2013-10-31 19:00:53 +01:00
Thomas Müller 1317b7c03d pass the name of the item source from the browser to the server - no need to get the data via complicated db queries 2013-10-23 18:39:37 +02:00
Thomas Müller 1909288fcb Merge branch 'master' into fix-sharing-code 2013-10-23 17:16:16 +02:00
Thomas Müller 8c69a5388e Merge pull request #5478 from owncloud/core-logexceptionstacktrace
Expand exception stack trace in log in debug mode
2013-10-23 07:19:14 -07:00
Vincent Petry c4dee281e6 Added $app parameter to logException 2013-10-23 13:58:42 +02:00
Vincent Petry 42c58220de Moved logException to OCP\Util class 2013-10-23 10:48:27 +02:00
Thomas Tanghus ad017285e1 Fix namespace for OCP\Appframework\Http
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
2013-10-23 05:57:34 +02:00
Thomas Müller 408e0022dd Merge pull request #5249 from owncloud/activities-api
[OC6] Activities api
2013-10-21 13:21:17 -07:00
Morris Jobke 1f1fcc6129 Remove "link" shares right after disabling the "allow_link_share" setting 2013-10-18 11:37:13 +02:00
Michael Gapczynski 4cf328e3b9 Don't return links for shared files if disabled 2013-10-18 10:34:30 +02:00
Morris Jobke f9bbfad3e5 Fix sharing error message - id -> file name
fixe #2827
2013-10-17 16:45:11 +02:00
Morris Jobke 30f4d91d01 Public API documentation fixes
refs #4883

 * http/response.php
 * config.php
 * response.php
 * files.php
 * idbconnection.php
 * app.php
 * user.php
 * template.php
 * share.php
 * db.php
 * icache.php & il10n.php
2013-10-17 00:49:15 +02:00
Thomas Müller 221a650815 Merge branch 'master' into activities-api
Conflicts:
	lib/private/server.php
2013-10-16 21:15:25 +02:00
Thomas Müller fdeef5e874 Merge branch 'master' into fixing-appframework-master
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
Thomas Müller c3f7d22adc Merge pull request #5067 from owncloud/urlParams_fix
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
Thomas Müller 852a50aa89 remove test code 2013-10-16 15:38:56 +02:00
Thomas Müller 8c2b0b1394 Merge branch 'master' into activities-api 2013-10-16 15:36:35 +02:00
Thomas Müller dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Thomas Tanghus d75d80ba13 OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller 2013-10-11 10:07:57 +02:00
Thomas Müller 8e97752bf7 adding OC6 public API for activities 2013-10-09 18:06:21 +02:00
Thomas Müller 926b3c9b7b Merge branch 'master' into activities-api 2013-10-09 17:53:57 +02:00
Bjoern Schiessle 7fe493fdb8 make sure that we only find file/folder shares 2013-10-09 17:25:58 +02:00
Thomas Müller 053b55721d Merge branch 'master' into fixing-appframework-master 2013-10-08 12:13:24 +02:00
Thomas Müller b48dffa9a3 Merge pull request #5072 from owncloud/apache-auth-master
OC6 Apache Authentication
2013-10-07 06:29:56 -07:00
Thomas Müller 730c80ff9c adding additional exceptions for special cases where creating a file might not be allowed 2013-10-07 15:11:47 +02:00
Thomas Müller c3286402a8 removing log(), getTemplate(), getLocalFilePath(), getUrlContent(), getFileInfo() 2013-10-07 11:41:28 +02:00
Thomas Müller 39be4dca67 removing all link/url related calls from API class 2013-10-07 11:38:23 +02:00
Thomas Müller 3ea2dfa5f9 remove getTrans() from API class 2013-10-07 11:36:38 +02:00
Thomas Müller aefea2a408 remove unused classes 2013-10-07 11:25:06 +02:00
Thomas Müller e071bfc144 fixing SecurityMiddleware to use OC6 API 2013-10-07 00:33:54 +02:00
Thomas Müller 1f14ba6aed move controller to OCP 2013-10-06 23:16:40 +02:00
Bernhard Posselt 381b76ebd0 Merge pull request #5144 from owncloud/public_middleware
Make abstract Middleware class public
2013-10-06 14:12:35 -07:00
Thomas Tanghus 47b2007228 Remove misleading IMiddleware interface 2013-10-05 19:13:12 +02:00
Thomas Tanghus c85621a897 Make abstract Middleware class public
It doesn't make sense for subclasses to have to implement
all methods.
2013-10-05 16:59:06 +02:00
Bart Visscher 21cbef0d2c passesCSRFCheck added to OCP\IRequest 2013-10-04 18:13:04 +02:00
Bart Visscher 61a9098b7d Add Helper and URLGenerator interfaces to server container 2013-10-04 18:11:02 +02:00
Bart Visscher 9f777fba98 Add L10N interface to server container 2013-10-04 18:11:02 +02:00
Bart Visscher bae121b16d Merge pull request #5068 from owncloud/improved_request
Improved request
2013-10-04 09:05:20 -07:00
Vincent Petry 48a4c67d48 Merge pull request #5087 from owncloud/templatefunction-relativedate
Added dateOnly argument to relative_modified_date
2013-10-04 05:53:13 -07:00
Vincent Petry f3594904c2 Removed $fromTime argument from public template API 2013-10-04 14:45:12 +02:00
Vincent Petry 006799616d Fixed missing default values
Added default value for $fromTime to prevent missing argument errors and
keep backward compatible.
2013-10-03 14:21:41 +02:00