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

8043 commits

Author SHA1 Message Date
Lukas Reschke
4c13918bd8 Expose backend type via REST API 
This change will expose the user backend via the REST API which is a pre-requisite for https://github.com/owncloud/core/issues/12620.

For example:
````json
[{"name":"9707A09E-CA9A-4ABE-A66A-3F632F16C409","displayname":"Document Conversion User Account","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/9707A09E-CA9A-4ABE-A66A-3F632F16C409","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"ED86733E-745C-4E4D-90CB-278A9737DB3C","displayname":"Hacker","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/ED86733E-745C-4E4D-90CB-278A9737DB3C","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"71CDF45B-E125-450D-983C-D9192F36EC88","displayname":"admin","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/71CDF45B-E125-450D-983C-D9192F36EC88","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"admin","displayname":"admin","groups":["admin"],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/admin","lastLogin":"1418057287","backend":"OC_User_Database"},{"name":"test","displayname":"test","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/test","lastLogin":0,"backend":"OC_User_Database"}]
```
 2014-12-09 12:04:19 +01:00
Thomas Müller
5609d421cd Merge pull request #12672 from LEDfan/cm-per-unit 
Fix Contactsmanager permission + unit test
 2014-12-09 10:57:22 +01:00
Joas Schilling
78a307995c Fix namespace of Files_Encryption outside of the app 2014-12-09 09:47:26 +01:00
Thomas Müller
c36bac3abd Merge pull request #12406 from owncloud/drop-getApps-getUsers 
Config cleanup - OC_Preferences refactoring
 2014-12-09 09:36:38 +01:00
Lukas Reschke
25a87d4058 Merge pull request #12577 from owncloud/public-mount-api 
Add a public api for apps to add mounts
 2014-12-08 22:57:33 +01:00
Morris Jobke
9a7362dd0d drop unused isDebugMode and setDebugMode of OC_Config 2014-12-08 22:42:44 +01:00
Morris Jobke
0d4f0ab871 reduce OC_Preferences, OC_Config and \OCP\Config usage 
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
 2014-12-08 22:42:37 +01:00
Morris Jobke
2d5fc9c1a6 Workaround to fix the too early init dilemma 
* this needs to be properly fixed by a proper organisation of the base.php
* introduced fixDIInit() in AllConfig that moves the injection
  of DatabaseConnection to a later point in time
* problems mostly because of the autoconfig setup
 2014-12-08 22:33:36 +01:00
Morris Jobke
af91ee97c9 introduce preCondition for setUserValue to provide atomic check-and-update 2014-12-08 22:33:36 +01:00
Morris Jobke
f0b10324ca Refactoring of OC_Preferences to AllConfig 
* keep old static methods - mapped to new ones and deprecated
* removed deleteApp, getUsers, getApps because they are unused
* make AllConfig unit tests more robust against not cleaned up environments
 2014-12-08 22:33:29 +01:00
Morris Jobke
f164161f69 fix base.php for not installed systems 2014-12-08 22:29:43 +01:00
Morris Jobke
a9e411e076 migrate \OC\AllConfig to \OCP\IConfig 2014-12-08 22:29:43 +01:00
Morris Jobke
719008836d introduce deleteAllUserValues 2014-12-08 22:29:42 +01:00
Morris Jobke
985b15f770 introduce proper interface for deleteAppValue 2014-12-08 22:29:42 +01:00
Morris Jobke
b01c59b224 use old methods and redirect in deprecated methods 2014-12-08 22:29:42 +01:00
Morris Jobke
d6da627eb4 @deprecated messages for \OCP\Config and \OCP\AppConfig 2014-12-08 22:29:42 +01:00
Morris Jobke
50c2a819a0 Extract interaction with config.php into SystemConfig 
* introduce SystemConfig to avoid DI circle (used by database connection which is itself needed by AllConfig that itself contains the methods to access the config.php which then would need the database connection - did you get it? ;))
* use DI container and use that method in legacy code paths (for easier refactoring later)
* create and use getSystemConfig instead of query() in DI container
 2014-12-08 22:29:42 +01:00
Vincent Petry
cae600722e Add getTagsForObjects in ITags 
Returns the list of tags that are set on the given object ids.
 2014-12-08 22:02:00 +01:00
Lukas Reschke
f219f5a7a6 Merge pull request #12618 from owncloud/initial-work-migrate-to-appframework 
Add REST route for managing groups and users
 2014-12-08 21:37:41 +01:00
Victor Dubiniuk
81d5712419 Fix tests. Add two more test cases 2014-12-08 22:16:47 +03:00
Jörn Friedrich Dreyer
85176ec072 return correct result 2014-12-08 15:25:21 +01:00
Morris Jobke
1362c0b67a Merge pull request #12452 from owncloud/server2server-ng-ocs 
OCS API for server-to-server sharing
 2014-12-08 14:12:03 +01:00
Lukas Reschke
fe7d9a7ca0 Add REST route for user & group management 
First step of a somewhat testable user management. - I know, the JSON returns are in an ugly format but the JS expects it that way. So let's keep it that way until we have time to fix the JS in the future.
 2014-12-08 12:11:01 +01:00
Jenkins for ownCloud
2784d580bd [tx-robot] updated from transifex 2014-12-08 01:54:57 -05:00
Olivier Paroz
7917d3b068 Remove changes which were inadvertently pushed to master 2014-12-08 04:03:02 +01:00
Olivier Paroz
d9c0be8785 Dump Arrays, Objects and Exceptions to the log 
This is a first draft. It has only been tested with the ownlcloud logger.
Some internal fields are JSON encoded several times which makes it harder to read.

Most of the normalizer is borrowed from Monolog
https://github.com/Seldaek/monolog/blob/master/src/Monolog/Formatter/NormalizerFormatter.php
 2014-12-08 03:53:07 +01:00
Lukas Reschke
e4255e9d54 Merge pull request #12644 from owncloud/add-hack-for-config 
Create config if it does not exists
 2014-12-07 22:33:16 +01:00
Jenkins for ownCloud
8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Victor Dubiniuk
303fce44f4 Use httphelper and cache response even when it empty 2014-12-06 20:17:47 +03:00
Lukas Reschke
bd520d2e53 Create config if it does not exists 
The codepath that is executed when executing ownCloud via CLI is different than via browser. Specifically, the config is created by the user session already in `OC_Util::getInstanceId()` by a call to `setValue`. That said, this seems to be quite a bad side-effect, but for the sake of "not breaking whatever might break if we touch this" let's keep it that way for now.

When executing the autoconfig via `php -f index.php` the said session was not setup and thus no `config/config.php` file was created resulting in an installation error.

To reproduce this try to setup ownCloud via `php -f index.php` with and without that patch. (ensure to delete all existing configs before and don't access ownCloud with a browser in the meantime)

Fixes itself.
 2014-12-06 14:00:14 +01:00
LEDfan
b412e59c26 Fix permissions 2014-12-06 13:58:10 +01:00
Jenkins for ownCloud
94eb2e782f [tx-robot] updated from transifex 2014-12-06 01:54:56 -05:00
Lukas Reschke
ddcf2b84ec Remove checks for safe mode and magic quotes 
Both are removed from 5.4.0

Safe Mode: http://php.net/manual/en/features.safe-mode.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.

Magic Quotes: http://php.net/manual/en/security.magicquotes.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.
 2014-12-05 19:14:47 +01:00
Morris Jobke
5f66cb3250 Merge pull request #12561 from oparoz/vectoricon 
Improve the bitmap and vector mime icons
 2014-12-05 14:51:03 +01:00
Morris Jobke
4ec1da3014 Merge pull request #12583 from owncloud/trim-port 
Trim port from domain
 2014-12-05 11:27:20 +01:00
Jenkins for ownCloud
4d53f163fd [tx-robot] updated from transifex 2014-12-05 01:55:52 -05:00
Morris Jobke
b6975143ff Merge pull request #12619 from owncloud/use-also-original-hea 
Merge headers
 2014-12-04 16:59:42 +01:00
Robin Appelman
f4701d7721 Add public api for mount configurations 2014-12-04 16:47:27 +01:00
Morris Jobke
f3213571bb Merge pull request #12616 from owncloud/node-fileinfo 
make \OC\Files\Node\Node implement the FileInfo interface
 2014-12-04 16:34:30 +01:00
Clark Tomlinson
b8a2fdaa21 Merge pull request #12607 from owncloud/this-is-an-awesome-day 
PHP 5.4 is now required for master
 2014-12-04 10:33:04 -05:00
Lukas Reschke
db9765b4d5 Merge headers 
Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV.
 2014-12-04 14:45:15 +01:00
Thomas Müller
e9f0b30023 Merge pull request #12609 from owncloud/remove-53-fixme 
Remove workaround for 5.3
 2014-12-04 14:25:47 +01:00
Jörn Friedrich Dreyer
7ef6df04da remove triggerupdate, ref #11872 2014-12-04 13:44:30 +01:00
Robin Appelman
672495a1a3 make \OC\Files\Node\Node implement the FileInfo interface 2014-12-04 13:27:08 +01:00
Bjoern Schiessle
698ecbf308 OCS API for server-to-server sharing 2014-12-04 13:18:13 +01:00
Thomas Müller
b55ac514ac no nested xml tags on dependencies 2014-12-04 11:40:33 +01:00
Thomas Müller
eb81c52b95 fix an issue where the types tag holds an empty string 2014-12-04 11:40:33 +01:00
Thomas Müller
b028a6afac adjust dependency analyzer to use attributes properly 2014-12-04 11:40:33 +01:00
Thomas Müller
c80ec91f28 switch to different parsing implementation to get xml attributes properly handled 2014-12-04 11:40:33 +01:00
Thomas Müller
ba52c996cf adding supported databases 2014-12-04 11:40:33 +01:00
Thomas Müller
b469e9f6fb introduce dependency analyzer to take care of app dependencies 
some more unit tests on xml info parser
 2014-12-04 11:40:33 +01:00
Thomas Müller
40e03ba314 adding default key value pair for 'types' 2014-12-04 11:40:33 +01:00
Thomas Müller
1354cee18e translate labels properly 2014-12-04 11:40:33 +01:00
Lukas Reschke
ee1f8b0242 Remove workaround for 5.3 
Function is natively available with 5.4
 2014-12-04 11:17:33 +01:00
Lukas Reschke
1b0bc2e099 PHP 5.4 is now required for master 
🍻
 2014-12-04 10:46:38 +01:00
Vincent Petry
bc12d28f23 Log exceptions in DAV storage 
In some cases a "NotFound" might be expected, so just return false as
before. But for other exceptions, the exception is now logged.
 2014-12-03 22:20:00 +01:00
Lukas Reschke
b3515a98e9 Add workaround for older instances 
To be removed with oCAdd workaround for older instances

To be removed with oC99
 2014-12-03 21:13:27 +01:00
Lukas Reschke
69f5f6649e Trim port from domain 
Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500)

To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)
 2014-12-03 19:59:50 +01:00
Lukas Reschke
8700ffe698 Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood 
Stop flooding the log, when previews are disabled
 2014-12-03 14:51:03 +01:00
Thomas Müller
7291b915b8 Merge pull request #12553 from owncloud/default-iosid 
add missing public interface for iOS client app id
 2014-12-03 14:05:27 +01:00
Joas Schilling
69a5a0c1a0 Stop flooding the log, when previews are disabled 2014-12-03 12:52:42 +01:00
Robin Appelman
2bbb11fb63 Merge pull request #10881 from owncloud/touch-statcache 
Clear statcache before getting the mtime from local storage backends
 2014-12-02 23:29:24 +01:00
Olivier Paroz
5990293331 Improve the bitmap and vector mime icons 
* Vector files such as Illustrator files currently show the "image"
icon. I propose to add a new type to mimetypeIcon() called
"image/vector" and which would be used by SVG as well
* We can use the current image-svg+xml icon, but would simply rename it
to image-vector
* The black and white "image" icon looks too much like a settings icon.
A simple picture representation pasted over the file icon should work
 2014-12-02 21:11:56 +01:00
Robin Appelman
1bbb18fe87 also clear statcache in mapped local 2014-12-02 16:39:03 +01:00
Morris Jobke
a16d1a85ef Merge pull request #11975 from owncloud/Combustible-combustible_dev 
Check imagecreate*() return before using and use logger in \OC_Image
 2014-12-02 16:18:00 +01:00
Morris Jobke
5b3dbb4ef8 add missing public interface for iOS client app id 2014-12-02 16:10:07 +01:00
Robin Appelman
db3f7238dd Clear statcache before getting the mtime from local storage backends 2014-12-02 14:25:49 +01:00
Thomas Müller
e9029f94cb Merge pull request #12310 from kampka/master 
Implement a logger to log to error_log
 2014-12-02 09:19:12 +01:00
Christian Kampka
553ce946d3 Implement a logger to log to error_log 2014-12-01 21:20:57 +01:00
Thomas Müller
0769556989 Merge pull request #12419 from owncloud/read-only-config 
Allow read-only configuration
 2014-12-01 16:37:29 +01:00
Thomas Müller
b2175f0e25 Use \OCP\ILogger 2014-12-01 16:21:54 +01:00
Byron Marohn
fa9b36b726 Added error check to lib/private/image.php 
This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.

Signed-off-by: Byron Marohn <combustible@live.com>
 2014-12-01 16:20:17 +01:00
Vincent Petry
8db4dd7585 Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mapped 
Issue/12460 port local changes2mapped
 2014-12-01 10:42:39 +01:00
Lukas Reschke
ffd1fc42e7 Merge pull request #12427 from owncloud/issue/6101-deprecate-namespaced-functions 
Depcrate namespaced functions, since they can not be autoloaded
 2014-12-01 09:38:15 +01:00
Morris Jobke
6fa748621f Merge pull request #12398 from oparoz/patch-5 
You can only change the oritentation of a JPEG
 2014-11-30 10:32:51 +01:00
Jenkins for ownCloud
83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Lukas Reschke
ebb243344a Merge pull request #12499 from owncloud/disableMSSQL 
Disable MSSQL and OCI for new CE installations
 2014-11-28 18:38:34 +01:00
Lukas Reschke
f0e6876f2e Merge pull request #12488 from owncloud/activity_group_multiple_conditions 
activitymanager: concatenate queries with 'or'
 2014-11-28 17:35:05 +01:00
Lukas Reschke
9a8dc4a832 Disable OCI as it is unsupported by most CE apps 2014-11-28 16:23:03 +01:00
Lukas Reschke
f3e75c085c Disable MSSQL for new CE installations 
Since automatic schema migrations are not yet possible let's disable this for now.
 2014-11-28 16:08:38 +01:00
Bjoern Schiessle
bf2c9be066 concatenate queries with 'or' 2014-11-28 14:46:27 +01:00
Lukas Reschke
2c157da1c2 Merge pull request #12486 from owncloud/activity_priorities 
add activity priorities to core so that other apps can reuse it
 2014-11-28 14:40:27 +01:00
Lukas Reschke
b3afc98f82 Merge pull request #12483 from owncloud/issue/6101-preview-providers 
Issue/6101 Autoload preview providers
 2014-11-28 13:43:41 +01:00
Bjoern Schiessle
00ad7d48c7 add activity priorities to core so that other apps can reuse it 2014-11-28 10:37:16 +01:00
Morris Jobke
b188710af3 Merge pull request #12472 from owncloud/modifyCookies 
Add functions to modify cookies to response class
 2014-11-28 10:16:22 +01:00
Morris Jobke
7a9af8c40c Merge pull request #12443 from owncloud/issue/6101-all-classes-autoloadable 
Issue/6101 Make all interfaces/classes autoloadable
 2014-11-28 09:40:27 +01:00
Morris Jobke
99d0e7e92d Merge pull request #12479 from rclarkson/master 
Limit blacklist to php files
 2014-11-28 09:29:15 +01:00
Joas Schilling
ec7b55f5be Split bitmap providers into one per file 2014-11-28 09:28:33 +01:00
Joas Schilling
3ec42ad598 Split office providers into one class per file 2014-11-28 09:28:30 +01:00
Joas Schilling
9cb54e3809 Fix intendation and doc blocks of preview providers 2014-11-28 09:28:28 +01:00
Jenkins for ownCloud
96b0328d39 [tx-robot] updated from transifex 2014-11-28 01:55:29 -05:00
Richard Clarkson
0d98329cac Limit blacklist to php files 
During performance optimization I have discovered that the installer scans all files for the blacklisted words. This greatly impacts speed on lower end devices such as the raspberry pie. This commit limits it to PHP files which seems to achieve the desired effect. 

I have used the --include option to achieve this, see http://stackoverflow.com/questions/1987926/how-do-i-grep-recursively

This contribution is MIT licensed
 2014-11-27 20:26:45 +01:00
Joas Schilling
fca9d32545 Move registration of core preview providers to preview 
So the class files only have class code and don't execute code
 2014-11-27 19:40:23 +01:00
Joas Schilling
7bbc27708a Move NaturalSort_DefaultCollator to its own file 2014-11-27 17:47:21 +01:00
Joas Schilling
7b8824a4e3 Move iHomeStorage to own file 2014-11-27 17:47:20 +01:00
Joas Schilling
dfde04291e Move share interfaces to own files so they can be autoloaded 2014-11-27 17:47:19 +01:00
Robin Appelman
05a069c101 Merge pull request #12426 from owncloud/jail-mask-wrappers 
Add Jail and PermissionsMask storage wrappers
 2014-11-27 16:00:14 +01:00
Robin Appelman
33b64868d7 Add storage and cache wrappers to apply a permissions mask to a storage 2014-11-27 15:25:57 +01:00
Robin Appelman
abb6e89c5d Add storage and cache wrappers to jail a storage to a subfolder 2014-11-27 15:25:53 +01:00
Lukas Reschke
af56429a9a Merge pull request #12470 from owncloud/jenkins-12447 
Jenkins 12447
 2014-11-27 15:16:14 +01:00
Joas Schilling
7761f0288e Also clearstatcache() in MappedLocal before using the stats 
Local change 283c10f010
 2014-11-27 14:59:10 +01:00
Joas Schilling
50f85bfd1f Check whether file exists before trying to touch() it 
Local changes from d069ee8a8b
and 258ad38fd3
 2014-11-27 14:59:09 +01:00
Joas Schilling
c5427da76d Check return of disk_free_space before returning it 
Local changes copied from ed83597371
and 25370fcb82
 2014-11-27 14:59:08 +01:00
Joas Schilling
1062f4fe44 Check file existance in MappedLocal in hasUpdated() 
Only fixed in Local by eeee9eacea
 2014-11-27 14:59:07 +01:00
Joas Schilling
b886d3d645 Make MappedLocal::isLocal() true like for Local 
Missed in 788c8540aa
 2014-11-27 14:59:07 +01:00
Vincent Petry
e733d32eec Merge pull request #12462 from owncloud/issue/12460-localstorage-buildpath 
Introduce buildPath() in Storage\Local to reduce the difference to MappedLocal
 2014-11-27 14:57:08 +01:00
Lukas Reschke
e35feadac2 Pass \OC::$WEBROOT to the ctr 2014-11-27 14:50:14 +01:00
Lukas Reschke
fef32e63dd Remove redundant code 2014-11-27 14:38:38 +01:00
Lukas Reschke
d197f43475 Use server container 2014-11-27 14:36:11 +01:00
Lukas Reschke
048139074d Add functions to modify cookies to response class 
Currently there is no AppFramework way to modify cookies, which makes it unusable for quite some use-cases or results in untestable code.

This PR adds some basic functionalities to add and invalidate cookies.

Usage:
```php
$response = new TemplateResponse(...);
$response->addCookie('foo', 'bar');
$response->invalidateCookie('foo');
$response->addCookie('bar', 'foo', new \DateTime('2015-01-01 00:00'));
```

Existing cookies can be accessed with the AppFramework using `$this->request->getCookie($name)`.
 2014-11-27 14:19:00 +01:00
Joas Schilling
0ed86c0993 Move OC_USER_BACKEND_* constants to OC_User_Backend class 2014-11-27 13:47:32 +01:00
Joas Schilling
24511c6f00 Move OC_GROUP_BACKEND_* constants to OC_Group_Backend class 2014-11-27 13:47:30 +01:00
Joas Schilling
a2172786a8 Merge pull request #12449 from owncloud/issue/12444-namespace-exceptions 
Issue/12444 namespace exceptions
 2014-11-27 12:14:06 +01:00
Morris Jobke
f52ba9c73c Merge pull request #12418 from owncloud/delete_previews 
delete old previews
 2014-11-27 12:09:39 +01:00
Joas Schilling
4f1bbc4fd5 Remove unused 2nd parameter of buildPath() and rename to getSourcePath() 2014-11-27 11:19:20 +01:00
Joas Schilling
20237fba47 Introduce getSourcePath() in Storage\Local to reduce the difference to MappedLocal 2014-11-27 11:19:18 +01:00
Vincent Petry
a74822279c Merge pull request #12464 from owncloud/cache-available-languages 
Cache results of available languages
 2014-11-27 11:12:18 +01:00
Joas Schilling
ea3780f911 Replace exception with standard exception 2014-11-27 11:10:05 +01:00
Joas Schilling
e1f3abf7a5 Correctly namespace and autoload DatabaseException 2014-11-27 11:10:04 +01:00
Vincent Petry
51190f711d Merge pull request #12451 from owncloud/issue/6101-remove-gettype-class 
Move constants from GET_TYPE to OC\Files so they can be autoloaded
 2014-11-27 11:03:55 +01:00
Lukas Reschke
b20d698ebd Cache results of available languages 
This function is about 8 times calles for every single page call, when caching this variable I was able to gain a small performance improvement from 20,512 µs to 630 µs profiled with xhprof

Surely, this is no gigantic gain but if we would do that for every function out there...
 2014-11-27 00:01:55 +01:00
Thomas Müller
5097d4dc05 remove deprecated \OC:$session 2014-11-26 15:32:47 +01:00
Joas Schilling
8e28bf012c Move constants from GET_TYPE to OC\Files so they can be autoloaded 2014-11-26 12:56:54 +01:00
Joas Schilling
3338eede3c Correctly namespace DatabaseSetupException 2014-11-26 12:30:07 +01:00
Joas Schilling
a109f94fee Depcrate namespaced functions, since they can not be autoloaded 2014-11-26 11:01:24 +01:00
Lukas Reschke
c749570a06 Merge pull request #12411 from owncloud/unknown-command-windows 
Replace some more "command -v" calls with the Helper method
 2014-11-26 10:29:41 +01:00
Morris Jobke
1da46b1a58 Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-api 
because OC_User::login will create a new session we shall only try to lo...
 2014-11-26 10:22:16 +01:00
Morris Jobke
60e4aa120f Merge pull request #12350 from mprokop/link_expiration 
fix calculation of expiration date if there is a default expiration date...
 2014-11-26 10:19:12 +01:00
Thomas Müller
320a3c3784 because OC_User::login will create a new session we shall only try to login if user and pass are set 
ensure to never destroy an existing session
 2014-11-26 09:19:10 +01:00
Morris Jobke
c5fa8f1bdc Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants 
Issue/6101 remove namespace permission constants
 2014-11-26 08:31:23 +01:00
Morris Jobke
e9696a8c9a Merge pull request #12420 from owncloud/sqlite-wal-2 
adding new config parameter for sqlite to specify the journal mode
 2014-11-26 00:47:22 +01:00
Joas Schilling
0274dcba57 Replace some more "command -v" calls with the Helper method 2014-11-25 18:10:03 +01:00
Joas Schilling
2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Thomas Müller
a6c088a1ef adding new config parameter for sqlite to specify the journal mode 2014-11-25 16:29:06 +01:00
Joas Schilling
711912a7b3 Move namespaced constants to namespaced class 2014-11-25 16:27:27 +01:00
Lukas Reschke
fc116f563f Allow read-only configuration 
Workaround required for IIS setups running ownCloud to prevent dataloss.

Long-term solution would be to move some configuration settings to the database
 2014-11-25 16:26:47 +01:00
Thomas Müller
0f18274ca5 Merge pull request #12416 from owncloud/app-info-xml-parser-2 
App info xml parser 2
 2014-11-25 15:56:52 +01:00
Georg Ehrke
1a1b459ae8 delete old previews 2014-11-25 15:42:02 +01:00
Thomas Müller
5ce34fbaf6 handle invalid xml file 2014-11-25 11:53:28 +01:00
Thomas Müller
d4f107d4dd simplify xml parser code 2014-11-25 11:53:28 +01:00
Thomas Müller
c503ecd544 Introduce app info xml parser including basic unit test - necessary for #10777 2014-11-25 11:53:28 +01:00
Olivier Paroz
93a6cc17a5 The class name is Movie NOT Movies 2014-11-25 11:35:38 +01:00
Morris Jobke
53b2d85709 Merge pull request #12402 from owncloud/fix-phpdoc 
Fix PHPDoc and deprecated code
 2014-11-25 09:20:36 +01:00
Lukas Reschke
eb1dcb87c1 Merge pull request #12380 from owncloud/remove-oc-migrate 
Remove OC_Migrate
 2014-11-25 00:25:37 +01:00
Lukas Reschke
b947b65e5b Fix PHPDoc and deprecated code 
Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.
 2014-11-24 23:09:49 +01:00
Olivier Paroz
e2a9bd7838 You can only change the oritentation of a JPEG 
TIFFs also have EXIF headers, but they're not supported by the Image class

PHP doc
http://php.net/manual/en/function.exif-read-data.php
 2014-11-24 17:32:53 +01:00
Thomas Müller
ddacd7f900 Merge pull request #12294 from owncloud/route-postfix 
Add route postfix to allow url versioning when only the http method changed
 2014-11-24 16:32:54 +01:00
Morris Jobke
168fce0b18 Merge pull request #12303 from owncloud/windows-unknown-command-command 
Deduplicate findBinaryPath() and do not try "command -v" on windows
 2014-11-24 14:03:07 +01:00
Morris Jobke
1b17429c1d Merge pull request #12142 from owncloud/DeprecateOldIAPICalls 
Deprecate older API wrappers and calls
 2014-11-24 14:01:49 +01:00
Morris Jobke
8782b2237c Merge pull request #12084 from owncloud/sharing_fix_shared_with_info 
sharing: make sure that we only find the shares from a given owner
 2014-11-24 11:44:43 +01:00
Lukas Reschke
216d617938 Remove OC_Migrate 
This is unused legacy code. Let it die with ~~~honor~~ fire.

Fixes https://github.com/owncloud/core/issues/12346
 2014-11-24 10:53:45 +01:00
Jenkins for ownCloud
0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Georg Ehrke
45d985f2d8 remove ugly hack and don't use OC\Preview\Image for tiffs and svgs 2014-11-23 19:11:03 +01:00
Jenkins for ownCloud
fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Bjoern Schiessle
a7ebfe87c9 also check for the correct owner if it was submitted 2014-11-21 16:17:37 +01:00
Miguel Prokop
397f14ed86 Consolidate if statement, and update unit test 2014-11-21 13:31:56 +01:00
Miguel Prokop
1d4d308a6c fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire. 2014-11-21 11:01:39 +01:00
Jenkins for ownCloud
f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Morris Jobke
593ef76e36 Revert "drop OC_Preferences::getUsers and getApps" 
This reverts commit 09fd34eed9.
 2014-11-20 22:02:26 +01:00
Morris Jobke
09fd34eed9 drop OC_Preferences::getUsers and getApps 2014-11-20 17:56:05 +01:00
Morris Jobke
985f8c3f69 Merge pull request #12330 from owncloud/jenkins-eat-that 
drop dependency of some commands on old config object
 2014-11-20 17:11:08 +01:00
Thomas Müller
7fa4c6d0bc Merge pull request #12321 from owncloud/checkForXMLWriter 
Check for XMLWriter class
 2014-11-20 17:04:27 +01:00
Morris Jobke
604bf61e10 Merge pull request #12299 from owncloud/clean-lib-base-config 
replace all static calls to OC_Config and OC_Preferences to calls to OCP...
 2014-11-20 16:24:37 +01:00
Lukas Reschke
713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang 
cleanup languages. closes #11274
 2014-11-20 16:12:49 +01:00
Morris Jobke
8ae8eb4734 drop dependency of some commands on old config object 2014-11-20 15:03:16 +01:00
Thomas Müller
cbb9caf030 Merge pull request #12226 from owncloud/remove-phpass 
Remove phpass and migrate to new Hasher interface
 2014-11-20 14:59:59 +01:00
Morris Jobke
46e6104795 Merge pull request #12297 from owncloud/issue/10991-all-testcase 
Issue/10991 all testcase
 2014-11-20 14:53:18 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Lukas Reschke
9a1673c79d Check for XMLWriter class 
This is not installed by default in all cases and will break the DAV features of ownCloud. Lot's of reports such as https://github.com/owncloud/ios-issues/issues/167#issuecomment-63798507
 2014-11-20 13:13:14 +01:00
Vincent Petry
6a08fca363 Merge pull request #12253 from owncloud/port-12154 
Port 12154
 2014-11-20 12:47:27 +01:00
Joas Schilling
d15f1882f9 Simplify the binary finding code in the movie preview class 2014-11-20 12:41:55 +01:00
Joas Schilling
64421d76fd Deduplicate function by moving it to the OC_Helper 2014-11-20 12:37:59 +01:00
Jenkins for ownCloud
fffc5bc002 [tx-robot] updated from transifex 2014-11-20 01:55:06 -05:00
Joas Schilling
bb540722cd Use base class to reset the file mapper 2014-11-19 14:52:07 +01:00
Morris Jobke
980dd4d22a replace double quotes with single quotes 2014-11-19 13:15:04 +01:00
Morris Jobke
fef9d4218c replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig 2014-11-19 13:06:22 +01:00
Bernhard Posselt
4e90c44301 add postfix 
add postfix
 2014-11-19 12:01:42 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Morris Jobke
d40bdfb35e drop unneeded var_dump - fixes #9997 2014-11-18 22:36:42 +01:00
Morris Jobke
81d112fb42 Merge pull request #12261 from oparoz/patch-1 
Replace deprecated switches
 2014-11-18 18:59:34 +01:00
Björn Schießle
106d0f9c75 Merge pull request #12224 from owncloud/fix_12211 
make sure that we don't find the wrong shares if a user and a group have the same ID
 2014-11-18 17:26:02 +01:00
Olivier Paroz
cb118ce371 Replace deprecated switches 
Warning: -convert-to is deprecated.  Use --convert-to instead.
Warning: -outdir is deprecated.  Use --outdir instead.
 2014-11-18 15:04:01 +01:00
Lukas Reschke
309788003d Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager 
Fix type hinting for app manager
 2014-11-18 13:56:40 +01:00
Lukas Reschke
8d4e63dd7c Merge pull request #12242 from owncloud/fix-undefined-size 
Check if the size field is available
 2014-11-18 12:37:16 +01:00
Lukas Reschke
260a084d27 Add repair steps for legacy config files 
Remove all ports from the trusted domains

Conflicts:
	lib/private/repair.php
	lib/repair/repairconfig.php
 2014-11-18 12:36:03 +01:00
Lukas Reschke
d0a30b0e55 Ignore port for trusted domains 
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)

Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.

Conflicts:
	lib/private/request.php
 2014-11-18 12:36:03 +01:00
Robin Appelman
0b630a37ab Fix type hinting for app manager 2014-11-18 12:22:13 +01:00
Bjoern Schiessle
ea4eedd35a only users can have a display name different from the id 2014-11-18 11:46:28 +01:00
Bjoern Schiessle
367468ff1f make sure that we only find the shares from the correct share type if users and groups with the same ID exists 2014-11-18 11:11:49 +01:00
Bjoern Schiessle
5192641447 make sure that we don't find the wrong shares if a user and a group have the same ID 2014-11-18 11:03:08 +01:00
Morris Jobke
36ba935381 Merge pull request #12237 from owncloud/fix-12236 
Make declaration compatible
 2014-11-18 10:30:17 +01:00
Lukas Reschke
944cd327b1 Merge pull request #9962 from owncloud/app-group-enable-remote 
Fix remote.php routes for apps that are enabled for specific groups
 2014-11-18 10:08:20 +01:00
Jenkins for ownCloud
91f7c0af6e [tx-robot] updated from transifex 2014-11-18 01:54:31 -05:00
Lukas Reschke
6535540dcd Check if the size field is available 
In some cases the 'size' field is not available resulting in some PHP errors such as:

```json
{"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"}
```

This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
 2014-11-17 22:39:40 +01:00
Lukas Reschke
e8f90133e0 Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse 
Move CSRF check
 2014-11-17 18:34:55 +01:00
Lukas Reschke
0b9dffa828 Make declaration compatible 
Fixes #12236
 2014-11-17 18:30:17 +01:00
Vincent Petry
af7688ec17 Merge pull request #11741 from owncloud/delete_all_children_preview_2 
delete all children's previews when deleting a folder
 2014-11-17 16:45:54 +01:00
Morris Jobke
146cb920c9 Merge pull request #12218 from owncloud/issue/10991-fixes 
Issue/10991 Make unit tests pass on windows
 2014-11-17 16:44:45 +01:00
Robin Appelman
7cb12d4bff Add sabredav plugin to check if a user has access to an app 2014-11-17 15:50:24 +01:00
Robin Appelman
36528c6ef6 Merge pull request #12031 from owncloud/app-manager 
Add \OC\App\Manager to handle enabling/disabling apps
 2014-11-17 15:49:15 +01:00