Commit Graph

588 Commits

Author SHA1 Message Date
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
Robin Appelman 366d75e947 cache the home folder of a User 2013-12-11 16:22:26 +01:00
Robin Appelman b126374780 cache the result from inGroup 2013-12-11 15:47:36 +01:00
Robin Appelman 5c7a08aab4 check if a $_SESSION entry exists before we try to remove it 2013-12-11 12:59:48 +01:00
Andreas Fischer cdd182ce35 Send "SET NAMES utf8" to MySQL for PHP below 5.3.6 2013-12-11 00:19:51 +01:00
Vincent Petry 82bf1f9c8c Added workaround for Android content disposition
Fixes #5807
2013-12-10 12:42:41 +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
Joas Schilling 009e25788f correctly mark app management active 2013-12-09 15:53:31 +01:00
Robin Appelman a36bf5c2b5 preserve 3rd party values in in the Session destructor 2013-12-09 12:38:27 +01:00
Pellaeon Lin fc607e6bce Separate PHP upload limit and free space 2013-12-08 22:59:46 +08:00
Morris Jobke 4c4c9096c4 fix plural translation - fixes #6226 2013-12-07 11:38:01 +01:00
blizzz 6a747106db Merge pull request #6150 from owncloud/backgroundjob-log-exception
Remove background jobs that are giving errors
2013-12-06 11:56:53 -08:00
Vincent Petry 123bc9921a Merge pull request #6201 from owncloud/backgroundscan-reuse-etag
reuse etags when doing a background scan
2013-12-06 10:13:14 -08:00
Bart Visscher 4c8bc61753 XSendfile and encryption don't work together
The file on disk is encrypted, and not readable on client systems
2013-12-06 17:59:59 +01:00
Bart Visscher 6aa9daf4e6 Users of getFolderContent are mostly interested in the unecrypted file size 2013-12-06 15:51:49 +01:00
Robin Appelman 01ab15a2b0 reuse etags when doing a background scan 2013-12-05 15:23:34 +01:00
Alexander Bergolth 301d469813 Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning 2013-12-04 18:01:51 +01:00
Morris Jobke d73875b2b4 Merge pull request #6169 from owncloud/php_version_warning
PHP version warning
2013-12-04 01:49:54 -08:00
Frank Karlitschek 61296ed7bb lower required php version to 5.3.3 2013-12-04 10:25:22 +01:00
Frank Karlitschek 8fdbb98899 Merge pull request #6168 from owncloud/extstorage-testtestmethod
Added unit test for the test() method of ext storage
2013-12-03 11:00:49 -08:00
Thomas Müller 16eb7c15d2 Merge pull request #6076 from owncloud/fix-6073-master
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-12-03 08:21:45 -08:00
Vincent Petry 6cf9844e9c Added unit test for the test() method
This is to make sure that method isn't broken
2013-12-03 14:35:53 +01:00
Frank Karlitschek b83e891456 Merge pull request #5929 from owncloud/code_check_on
switch code checker on by default. apps are not allowed to access
2013-12-03 01:14:35 -08:00
Robin Appelman 64bfcbee0a check if a directory exists before we try to remove it 2013-12-02 22:44:28 +01:00
Robin Appelman 4f4ad72460 remove background jobs if they are failing 2013-12-02 13:43:26 +01:00
Robin Appelman 35bb6f7e3a Catch exceptions from background jobs and log them 2013-12-02 13:41:47 +01:00
Thomas Mueller 87e795a693 fixing PHPDoc and spelling 2013-12-02 08:42:28 +01:00
Frank Karlitschek 3c62de90fd Merge pull request #6129 from owncloud/chunking-fixtouchafterassemble
Fixed touch after chunk assembling
2013-11-29 09:19:51 -08:00
Vincent Petry 80d2371f97 Fixed touch after chunk assembling
Fixed touch after chunk assembling which was using the wrong path,
resulting in the creation of an extra file.

Fixes #6007
2013-11-29 16:29:35 +01:00
Frank Karlitschek 7ca0de9bd3 make 5.3.8 the minimum supported version. This fixes several issues with broken PHP versions like: https://github.com/owncloud/core/issues/5734
Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value.
2013-11-29 15:46:10 +01:00
Morris Jobke 41a1a32e5a Merge pull request #6099 from owncloud/fix_source_not_found_warnings
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
Morris Jobke 0cbe9d79ba Merge pull request #6106 from owncloud/fix_preview_creation
Fix preview creation
2013-11-28 12:48:19 -08:00
Bjoern Schiessle 466ed01e5d correctFolder() already resolves the dirname internally 2013-11-28 19:25:49 +01:00
Bjoern Schiessle bdfef554c4 add PHPDoc for setMimetype() 2013-11-28 19:05:43 +01:00
Bjoern Schiessle eeb31420fe we need to be able to set the mimetype manually 2013-11-28 18:52:58 +01:00
Bjoern Schiessle eaedda2116 make sure that we don't try to access an already deleted files, fixes some file source not found warnings 2013-11-28 13:31:08 +01:00
Frank Karlitschek dab3629ff5 Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename
Redetect mime type whenever extension is renamed
2013-11-28 03:46:42 -08:00
Andreas Fischer 93b0bd0a9e Use getLastError() everywhere. 2013-11-28 12:05:46 +01:00
Andreas Fischer 904573d0d0 Add getLastError() 2013-11-28 12:04:28 +01:00
Andreas Fischer 955127231a No function as oci_last_error. It's oci_error. 2013-11-28 11:37:29 +01:00
Andreas Fischer fcf332abbf There is no property such as dbusername. It's 'dbuser'. 2013-11-28 11:33:49 +01:00
Andreas Fischer b90f88f939 Correct property name. It's 'dbpassword', with the 'db' prefix. 2013-11-28 11:33:43 +01:00
Andreas Fischer 005c98e46c Correct property name. It's just 'tableprefix', without the 'db' prefix. 2013-11-28 11:23:45 +01:00
Frank Karlitschek d2567129a1 Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6
on mssql the schema migration sometimes fails due to an already existing...
2013-11-28 02:16:16 -08:00
Thomas Müller f23d641b82 Merge pull request #6084 from owncloud/fix-app-routing
fix custom routes defined by apps
2013-11-28 00:00:09 -08:00
Vincent Petry 43b1cf7988 Redetect mime type whenever extension is renamed 2013-11-27 21:34:51 +01:00
Robin Appelman 885d04bc86 Fix getRawPathInfo for the '/' edge case 2013-11-27 21:28:54 +01:00
Bjoern Schiessle 6deda1b9f6 return false if user is in incognito mode 2013-11-27 16:52:30 +01:00
Robin Appelman c47e46fda0 fix custom routes defined by apps 2013-11-27 15:35:49 +01: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 7755e69af0 add PHPDoc for urlParams 2013-11-27 10:55:06 +01:00
Thomas Mueller 4fbc2774ef on mssql the schema migration sometimes fails due to an already existing transaction - error: 'New transaction is not allowed because there are other threads running in the session.'
The solution is to simple reconnect to the database to start with a fresh connection
2013-11-26 22:39:01 +01:00
blizzz 4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
Björn Schießle 1fef97f6a5 Merge pull request #6060 from owncloud/fix-6050-oc6
fixing getRawPathInfo() once more
2013-11-26 10:13:58 -08:00
Thomas Müller 52941341fd fixing failing unit test 2013-11-26 16:52:33 +01:00
Thomas Müller 2a93720f3f fixes #6050 2013-11-26 14:13:33 +01:00
Robin Appelman 10d84f6e9b Add a (currently) empty system for running common repair steps 2013-11-26 14:12:48 +01:00
Bjoern Schiessle 62afe7fe7a remove passwords from logfile 2013-11-26 12:26:32 +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
Jörn Friedrich Dreyer 4b67d4258d Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6
Fixing rawpath reverseproxy oc6
2013-11-25 08:21:33 -08:00
Thomas Müller 27cc333dfe adding chunked upload handling 2013-11-25 15:35:26 +01:00
Thomas Müller b9fed935b4 in case uri and script name don't match we better throw an exception 2013-11-25 14:42:34 +01:00
Thomas Müller a0a665ea45 handle duplicate slashes in case of reverse proxy configuration 2013-11-25 14:21:51 +01:00
Morris Jobke 7f47cc062c fix defaults.php doc 2013-11-25 14:13:58 +01:00
Simon Könnecke 243f3f0c4c No decimal points for Kilobyte and Byte #5371. 2013-11-25 12:26:03 +01:00
Thomas Müller 993fea2f05 fix appframework routing 2013-11-25 11:36:33 +01:00
Thomas Müller 1a69079139 Merge pull request #6021 from owncloud/show_build
Show build number
2013-11-24 15:01:11 -08:00
Thomas Müller a2d4cd87d0 Merge pull request #5874 from owncloud/fix-5845
Fix file uploads on Windows with SQL Server
2013-11-24 14:15:17 -08:00
Thomas Mueller 228f1788fa add new function to generate the human readable version string based on version, channel and build number 2013-11-24 21:26:34 +01:00
Thomas Mueller 6229f457d0 update PHPDoc 2013-11-24 21:18:14 +01:00
Frank Karlitschek a11192bab3 send the build number too to push the next daily build. This is needed for the new daily build update channel 2013-11-24 16:45:06 +01:00
Frank Karlitschek 2ce850f7db fix overwrite host support and make the code a bit more readable 2013-11-24 12:41:09 +01:00
Arthur Schiwon 6085878966 Avatar: accept OC_Image as in setParameter 2013-11-22 23:57:23 +01:00
Vincent Petry c62cce8269 Moved default isReadable/isUpdatable impl into Common class
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
2013-11-22 18:21:17 +01:00
Bjoern Schiessle aeefe48cba Revert "use relative paths to create images from a file. This way it also works if"
This reverts commit 3488f0b77a.
2013-11-22 18:01:44 +01:00
Vincent Petry 3b904647b0 Merge pull request #6003 from owncloud/incognito_mode
Incognito mode
2013-11-22 06:08:49 -08:00
Bjoern Schiessle 7e4f50d4e3 add incognito mode, allows to hide my user ID. For example, this is useful to access public resources while a user is still logged in 2013-11-22 13:55:38 +01:00
Thomas Müller c05177b25b Merge pull request #5882 from owncloud/preview-movie-5s
Movie preview - use frame after 5 seconds
2013-11-22 04:27:34 -08:00
Arthur Schiwon 8ccac86c98 Enable user backends to provide avatar images 2013-11-22 13:25:20 +01:00
Raghu Nayyar c503588827 Merge pull request #6000 from owncloud/use_relative_path_to_create_images
use relative paths to create images from a file.
2013-11-22 03:52:40 -08: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
Bjoern Schiessle 3488f0b77a use relative paths to create images from a file. This way it also works if
no user is logged in (e.g. public gallery share)
2013-11-22 12:26:01 +01:00
Thomas Müller 14e7075030 we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
in some cases 1MB was no enough to generate thumbnail
2013-11-22 12:23:22 +01:00
Thomas Müller c22019dec5 Working on a chunked video can result in a broken frame index the option -vsync 1 can heal that 2013-11-22 12:20:06 +01:00
Arthur Schiwon 00071401d7 Round out Avatar Public API 2013-11-21 23:40:25 +01:00
Thomas Müller 4a2f9636cf Merge pull request #5773 from owncloud/fix-2152-master
Make working en_US.UTF-8 locale a hard requirement
2013-11-21 08:03:21 -08:00
Vincent Petry d0265f3388 Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome
Quota storage wrapper is now used for all users in sharing mode
2013-11-21 06:59:50 -08:00
Thomas Müller cd1cf58875 Fixing the warning notifications 2013-11-21 14:44:25 +01:00
Vincent Petry 69e8e7dbd5 Now using the "Home" storage detection approach for quota
To find out whether to apply a quota, we now try and detect whether the
storage to wrap is a "Home" storage.
2013-11-21 12:17:47 +01:00
Vincent Petry 356eef0739 Quota storage wrapper is now used for all users in sharing mode
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.

This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
2013-11-21 12:04:54 +01:00
Thomas Müller f2fe47bc21 fixing spelling and restructure sentence 2013-11-21 09:59:21 +01:00
Vincent Petry a88aec8a5c Merge pull request #5965 from owncloud/mimetype-only-path
Change default mimetype detection for storage backends to only use filename
2013-11-20 08:11:41 -08:00
Thomas Müller 51a8172868 always get the right node for the given file path 2013-11-20 16:14:08 +01:00
Robin Appelman a0d570b4cc Change default mimetype detection for storage backends to only use filename 2013-11-20 15:25:29 +01:00
Vincent Petry 726a202cdb Fixed getLocalFile() condition for x-send-file
Until now, addSendfileHeader() was called even when no x-send-file
headers were set. Even though the method itself doesn't do anything,
a call to getLocalFile() was done and would trigger a full download
when using external storage.

Additionally, the storage resolution code is wrong and always
returns the local storage of the root filesystem, which caused the code to
be run anyway.

This commit fixes both issues.
2013-11-20 14:33:59 +01:00
Morris Jobke 4a0d295e4a Merge pull request #5927 from owncloud/quota-excludeextstorage
External storage space is now not counted in total space
2013-11-18 14:42:40 -08:00
Frank Karlitschek 7504fc0aef switch code checker on by default. apps are not allowed to access some of the internal classes where we have a public api for now 2013-11-18 18:42:06 +01:00
Vincent Petry 3e2fd9942b Root size for home storage is now size of "files" subdir
Fixes #4593
2013-11-18 18:17:25 +01:00
Vincent Petry 614e4d485c External storage space is now not counted in total space
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.

Fixes #5924
2013-11-18 18:09:01 +01:00
Frank Karlitschek 385a296864 one tab less 2013-11-18 12:19:16 +01:00
Frank Karlitschek e5994f9c1a fix the version check for downloaded apps. Fixes https://github.com/owncloud/apps/issues/1485 2013-11-18 12:16:03 +01:00
Bart Visscher 368342a085 Update error messages 2013-11-15 14:46:00 +01:00
Bart Visscher 630e46f60a Merge pull request #5789 from ogasser/db_fix_default_for_numeric
DB: Set correct default value for numeric types
2013-11-15 04:19:33 -08:00
Bart Visscher bcf56b0407 Use \Patchwork\Utf8\Bootup::initLocale 2013-11-15 13:06:35 +01:00
Thomas Müller 49e9f771ff Merge pull request #5813 from owncloud/fix-4736-master
Don't set a default value when there isn't a default specified
2013-11-15 01:06:38 -08:00
Morris Jobke 926b274200 Movie preview - use frame after 5 seconds 2013-11-15 01:46:51 +01:00
Thomas Müller 617dc0e468 Merge branch 'master' into moviepreviewfallback
Conflicts:
	lib/private/preview/movies.php
2013-11-14 20:57:29 +01:00
Thomas Müller 2bb4c266a6 Merge pull request #5862 from owncloud/files-singledotdirs
Files singledotdirs
2013-11-14 11:40:21 -08:00
Thomas Müller 447e468d1a Merge pull request #5850 from owncloud/oc_api_tests
Add unit tests for OC_API::mergeResponses and fix error with api returning incorrect status codes.
2013-11-14 07:58:51 -08:00
ringmaster bd3ead0d31 Compare dirname() results to DIRECTORY_SEPARATOR, not '/' 2013-11-14 09:42:56 -05:00
ringmaster ca675d7b08 Alias the aggregate columns so SQL Server doesn't combine them. 2013-11-14 09:41:55 -05:00
Thomas Müller 19e03ef77f Merge pull request #5827 from owncloud/avoid_preview_errors
Use dedicated OC_Image loader methods in previews
2013-11-14 05:52:51 -08:00
Vincent Petry c06d8bb007 Fixed normalizePath() to strip out single dot dirs
Now removing "/./" and trailing "/." from the paths when normalizing.
2013-11-14 13:15:03 +01:00
tomneedham 1449437c9e Merge multiple failed third party responses when returning the result 2013-11-14 01:21:54 +00:00
tomneedham bb182bbfb2 Merge multiple shipped failures before responding. 2013-11-14 01:19:46 +00:00
tomneedham ca5c39a3a1 Return failed shipped responses over succedded shipped responses 2013-11-14 01:14:37 +00:00
tomneedham a39f3fdbf9 Return result object when only one successful response is returned 2013-11-14 01:10:56 +00:00
tomneedham 790055571d Update lib/private/api.php after merge conflict 2013-11-14 01:00:14 +00:00
tomneedham b06682b7fb Merge branch 'ocs_api_fix_success_code' into oc_api_tests 2013-11-14 00:41:04 +00:00
tomneedham 00944a376a Merge branch 'master' into oc_api_tests 2013-11-14 00:40:57 +00:00
tomneedham f19caeed33 Remove OC_App dependancy from OC_API::mergeResponses() 2013-11-13 22:46:24 +00:00
Morris Jobke 408ce91b25 Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-home-only
Do not use -1 as the size for the root folder of the home storage
2013-11-13 05:57:16 -08:00
Vincent Petry 3fa651f2b1 Merge pull request #5447 from owncloud/fixing-5117-master
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
Tom Needham 17e45e2002 Pick any none 100 status code before defaulting to 100 2013-11-13 00:45:49 +00:00
Thomas Tanghus ec51825d31 Use dedicated OC_Image loader methods
This prevents excessive logging and disk access
2013-11-13 00:36:42 +01:00
Vincent Petry 34c92f6656 Now using HomeStorage for legacy home storage ids
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
2013-11-12 18:01:02 +01:00
Vincent Petry 1a65e3a725 Now calling parent method when path is not root 2013-11-12 16:15:44 +01:00
Robin Appelman 32a703ab36 Do not use -1 as the size for the root folder of the home storage 2013-11-12 16:15:43 +01:00
Oliver Gasser 53f17a71d1 treat numeric as an alias for decimal 2013-11-12 13:55:20 +01:00
Oliver Gasser 4b01eaf6cc changed type to decimal 2013-11-12 13:47:47 +01:00
Bart Visscher dcca887f18 Don't set a default value when there isn't a default specified 2013-11-11 17:58:25 +01:00
Bjoern Schiessle 68f3f2e691 make it possible to detect transferID part 2013-11-11 17:47:46 +01:00
Vincent Petry 99ee95d46c Added missing escaping 2013-11-11 15:41:03 +01:00
Morris Jobke 55331479cd Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes
Fixed watcher to also update the owner's folder sizes
2013-11-11 06:16:51 -08:00
Oliver Gasser b278356eb9 DB: Set correct default value for numeric types
Set 0 as default value for columns with numeric data type instead of the
empty string ''. Otherwise the database complains about an invalid
default value for this column.

To reproduce put the following in your ````appinfo/database.xml````:

````
<field>
        <name>modified</name>
        <type>decimal</type>
        <default/>
        <notnull>true</notnull>
        <length>15</length>
</field>
````

See owncloud/mozilla_sync#14
2013-11-10 14:15:33 +01:00
Vincent Petry df288605d4 Fixed undefined variable error when using avconv 2013-11-10 11:46:46 +01:00
Thomas Müller a8f6a2446c Merge pull request #5759 from owncloud/fixing-5757-master
adding proper htaccess commands for Apache 2.4
2013-11-09 23:13:17 -08:00
Thomas Müller b5e013973b implementing solution using <ifModule mod_authz_core> 2013-11-08 17:29:14 +01:00
Bart Visscher a6d8854d2a Make working en_US.UTF-8 locale a hard requirement 2013-11-08 14:30:08 +01:00
Vincent Petry 4b5083e3ca Fixed the rebellous space, replaced with a tab 2013-11-08 12:27:53 +01:00
Vincent Petry 0c6af55112 Added ffmpeg fallback when avconv is not available
On some distros, avconv isn't available yet.
This fix adds a fallback to ffmpeg.
When none is found, no error message is displayed in the console any
more.

Fixes #5745

Also, this now uses exec() instead of shell_exec() to be able to get the
return code.

The binary path found with "which" is now used to prevent further FS
binary lookup when running the commands.

Moved the "-ss" parameter before "-i" for ffmpeg.
2013-11-08 12:19:32 +01:00
Thomas Müller f93dcc5d77 the filesystem has to be initialized once we know the user 2013-11-08 11:24:19 +01:00
Thomas Müller 9c8b1e1775 adding proper htaccess commands for Apache 2.4 2013-11-08 10:45:35 +01:00
Morris Jobke 4459d964d6 Merge pull request #5747 from owncloud/scanner-post-hooks
Add post hooks for filesystem scanner
2013-11-07 12:44:23 -08:00
Vincent Petry 013444813e Now removing stray old cookies from 5.0.12
Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't
there,
thus making it impossible to logout correctly.

This fix adds extra code to delete such stray cookies.

Ported from stable5 branch 99e5c6f7eb
2013-11-07 18:49:50 +01:00
Robin Appelman d6845babd6 Add post hooks for filesystem scanner 2013-11-07 16:22:29 +01:00
kondou bcd776b0c0 Fix a regression (Tags→TagManager) 2013-11-07 12:51:03 +01:00
kondou 4ac05e071a Remove duplicate getAvatarManager() 2013-11-07 12:48:41 +01:00
kondou 507325dd50 Add public API for \OC\Avatar 2013-11-07 12:48:40 +01:00
blizzz 7c89309e26 Merge pull request #5691 from owncloud/switch-to-oc6-documentation
move to oc6 documentation
2013-11-05 08:22:26 -08:00
Vincent Petry e3868ba118 Fixed watcher to also update the owner's folder sizes
Note that the root folder size is mandatory for quota calculation.
2013-11-05 13:58:14 +01:00
Thomas Müller 08c8bf5a7b decode arguments as array 2013-11-05 10:30:18 +01:00
Thomas Müller 3488202f67 Merge pull request #5582 from owncloud/files-previewcaching
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
Thomas Müller f91fe8d595 Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master
Oc6 windows server mssql master
2013-11-05 00:41:11 -08:00
Thomas Müller d48ba5a5bf Merge pull request #5540 from owncloud/scanner-enhancments-master
Scanner enhancments master
2013-11-04 23:58:42 -08:00
Thomas Müller 01f2b7eb3a move to oc6 documentation 2013-11-04 22:50:12 +01:00
Andreas Fischer 8274d9f91c Inherit lastInsertId() from Adapter. 2013-11-04 22:28:41 +01:00
Thomas Müller c3898061a8 Merge pull request #5544 from owncloud/fixing-3593-2-master
Add FileId header and switch fileid and instance id
2013-11-04 04:30:12 -08:00
Thomas Müller 0f266d0f62 set log level to DEBUG 2013-11-04 12:58:30 +01:00
Thomas Mueller e37047b2a0 WIN: fixing Fatal error: Call to a member function logicToPhysical() on a non-object in C:\jenkins2\workspace\server-stable5-windows\database\mssql\label\WINDOWS\lib\files\storage\mappedlocal.php on line 311 2013-11-02 20:22:12 +01:00
Thomas Mueller 5ecebe211b mssql: fixing lastInsertId() implementation 2013-11-02 20:21:19 +01:00
Thomas Mueller eb3c5070c0 replace template function link_to_docs() with \OC_Helper::linkToDocs() 2013-11-02 19:11:46 +01:00
Morris Jobke fad2149e3f Merge pull request #5551 from owncloud/fix-5202-master
When updating an appstore app, execute a database update
2013-10-31 11:10:28 -07:00
Jörn Friedrich Dreyer ae469b67a0 Merge pull request #5637 from owncloud/fix_privatedata
Fix privatedata
2013-10-31 10:26:47 -07:00
Jörn Friedrich Dreyer b4cdac0a60 Merge pull request #5591 from owncloud/home-storage
Make home folders movable without requiring rescans
2013-10-31 10:20:03 -07:00
Andreas Fischer d6ddb12c20 Get rid of the SELECT query. Try UPDATE, on failure INSERT. 2013-10-31 16:04:18 +01:00
Thomas Müller aae6e76926 fixing undefined index in delete() 2013-10-31 10:24:28 +01:00
Thomas Müller 64d0b0d184 PHPDoc comment updated - checkLoggedIn() removed 2013-10-31 10:21:17 +01:00
Thomas Müller 0cec17ba87 no need to check if the user is logged in 2013-10-31 10:14:06 +01:00
Thomas Müller 47da2ef8db fixing php notice: Undefined index key 2013-10-31 10:02:18 +01:00
Thomas Müller b2929de0a7 no need to check if the user is logged in - this is already done in the ocs dispatcher itself
adding @return
2013-10-31 09:58:18 +01:00
Thomas Müller 64bfd21ccd Merge branch 'master' into fix_privatedata 2013-10-31 09:05:35 +01:00
Thomas Müller 3f42c890be we should check if a user is logged in before we check for admin privilege 2013-10-30 22:59:31 +01:00
Thomas Müller 261cd87efa Merge branch 'master' into home-storage 2013-10-30 22:11:19 +01:00
Lukas Reschke c1730d241c Merge pull request #5615 from owncloud/fixing-5614-master
http header OCS-ApiRequest: true is required in case of session based OC...
2013-10-30 13:12:16 -07:00
Lukas Reschke cba12e009f Added missing HTTP prefix to the $_SERVER variable 2013-10-30 21:07:19 +01:00
Frank Karlitschek 330d026be7 fix the privatedata key value store 2013-10-30 19:36:29 +01:00
Robin Appelman c9f3f2874f Merge branch 'master' into update-parent-storage-mtime
Conflicts:
	lib/private/files/cache/updater.php
2013-10-30 13:41:10 +01:00
Vincent Petry de342a5ac7 Merge pull request #5603 from owncloud/fix_file_cache_updater_master
Fix file cache updater (backport to master of #5513)
2013-10-30 02:31:08 -07:00
Thomas Müller 3d42e402c5 http header OCS-ApiRequest: true is required in case of session based OCS API calls 2013-10-29 23:07:27 +01:00
Bjoern Schiessle e1e4c7c214 Merge branch 'master' into fix_file_cache_updater_master 2013-10-29 17:47:33 +01:00
Björn Schießle e08f38f99b Merge pull request #5605 from owncloud/fix_delete_user
remove user from cache if he was deleted successfully
2013-10-29 09:46:21 -07:00
Thomas Müller e0bc89c87f Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-29 09:29:29 -07:00
Bjoern Schiessle 0d7d396d80 make sure that also the storage etag gets changed 2013-10-29 16:30:47 +01:00
Bjoern Schiessle f021dad204 remove user from cache if he was deleted successfully 2013-10-29 15:50:33 +01:00
Bjoern Schiessle a80ac9c492 make getUidAndFilename() private 2013-10-29 15:10:02 +01:00
Bjoern Schiessle fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Robin Appelman b3626f34cd Update the parent folders storage_mtime on write and delete to prevent rescans 2013-10-29 14:18:57 +01:00
Andreas Fischer b3e39dd3d9 Map empty mimetypes to octet-stream for Oracle DBMS. 2013-10-29 14:18:42 +01:00