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

2591 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Joas Schilling
bb540722cd Use base class to reset the file mapper 2014-11-19 14:52:07 +01:00
Bernhard Posselt
4e90c44301 add postfix 
add postfix
 2014-11-19 12:01:42 +01: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
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
Lukas Reschke
07f0d76fc6 Move CSRF check 
Because we're closing the session now before controllers are executed there are cases where we cannot write the session.
 2014-11-17 15:10:53 +01:00
Lukas Reschke
8595b76df2 Remove phpass and migrate to new Hasher interface 
This PR removes phpass and migrates to the new Hasher interface.

Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
 2014-11-17 13:39:13 +01:00
Joas Schilling
0ab973a3a6 Make it possible to cleanPath() absolute Windows paths 2014-11-17 10:48:15 +01:00
Joas Schilling
39ae569c5c Correctly close handle of directory when listing certificates 2014-11-17 10:48:14 +01:00
Morris Jobke
b9e86b0951 Merge pull request #12186 from owncloud/fix-12182 
eliminate OC_Template::printErrorPage in database classes, fixes #12182
 2014-11-15 16:50:15 +01:00
Lukas Reschke
cd5925036a Check if app is enabled for user 
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
 2014-11-15 11:13:55 +01:00
Arthur Schiwon
74ffda8261 do not output DB information, and do not set header 2014-11-14 17:43:22 +01:00
Arthur Schiwon
08205c63f9 errors are already logged 2014-11-14 16:59:54 +01:00
Arthur Schiwon
7ed678b04d eliminate OC_Template::printErrorPage in database classes, fixes #12182 2014-11-14 15:48:55 +01:00
Morris Jobke
c0d63680ed Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup 
cleanup group admin(s) on deleteGroup
 2014-11-13 22:39:40 +01:00
Morris Jobke
e5d46d0d94 Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change_display_name 
removal of wrong/double implemented check
 2014-11-13 15:39:07 +01:00
michag86
7e70c4ee95 removal of wrong/double implemented check 
Check already implemented in core/settings/ajax/changedisplayname.php
 2014-11-13 13:02:02 +01:00
Lukas Reschke
5f8fb8d1ee Run preupdate before an update 
The update routine tries to test the database migration before actually performing the update.

However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.

This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
 2014-11-13 12:07:49 +01:00
Morris Jobke
97a8fa418d Merge pull request #12141 from owncloud/kill-dav-client 
OC_DAVClient is not longer used - no need to carry it around anymore
 2014-11-12 21:20:52 +01:00
Lukas Reschke
4302a78b27 Deprecate older API wrappers and calls 
Those old classes have now non-static pendants and can be deprecated IMHO.
 2014-11-12 17:39:25 +01:00
Thomas Müller
6e3a841652 Merge pull request #12139 from owncloud/DoNotTouchMe 
Try to read the file only instead of trying to touch
 2014-11-12 17:29:56 +01:00
Thomas Müller
fede6b93e5 OC_DAVClient is not longer used - no need to carry it around anymore 2014-11-12 17:07:34 +01:00
Jan-Christoph Borchardt
d5796bbaf9 Merge pull request #12128 from owncloud/drop-formfactor 
Drop form_factor that is appended to JS, CSS and template filenames
 2014-11-12 16:23:19 +01:00
Lukas Reschke
49ddaf9489 Try to read the file only instead of trying to touch 
The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.

Fixes https://github.com/owncloud/core/issues/12135
 2014-11-12 15:57:19 +01:00
Morris Jobke
952abdc51a Drop form_factor that is appended to JS, CSS and template filenames 2014-11-12 13:07:23 +01:00
Lukas Reschke
da31177a8f Remove debug statement 
Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
 2014-11-12 11:32:48 +01:00
Thomas Müller
c998f620d0 Merge pull request #12105 from owncloud/dav-fixcleanpath 
Fix root path handling for WebDAV ext storage
 2014-11-12 09:16:55 +01:00
Thomas Müller
9aef0421cf Merge pull request #12107 from owncloud/dav-propfindmimetype 
Return real mime type on PROPFIND
 2014-11-12 09:16:26 +01:00
Bernhard Posselt
6d5a239abf Fix Pimple unset 2014-11-11 22:04:46 +01:00
Vincent Petry
0b2c24081f Return real mime type on PROPFIND 
Return the real (insecure) mime type on PROPFIND
 2014-11-11 15:42:50 +01:00
Vincent Petry
4b943a4810 Fix root path handling for WebDAV ext storage 
Added missing cleanPath() call that converts "/" to "" when calling
SabreDAV. This is needed because SabreDAV will discard its base URL when
passing "/".
 2014-11-11 15:20:36 +01:00
Robin Appelman
43eb375ace Add \OC\App\Manager to handle enabling/disabling apps 2014-11-10 13:52:52 +01:00
Vincent Petry
9b99c1d6f0 Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexception-secondtry 
Convert StorageNotAvailableException to SabreDAV exception
 2014-11-10 12:52:52 +01:00
Vincent Petry
676b911b22 Merge pull request #12027 from owncloud/cleanup_exceptions 
[encryption] clean up encryption exceptions
 2014-11-10 12:46:53 +01:00
Vincent Petry
cccedf6f30 Convert StorageNotAvailableException to SabreDAV exception 
Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.

This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.
 2014-11-10 12:01:24 +01:00
Craig Morrissey
541344d880 logging changes 2014-11-07 12:45:42 -05:00
Bjoern Schiessle
f27b6b0ab8 don't scan part files 2014-11-07 15:20:51 +01:00
Bjoern Schiessle
a10ae2816e clean up encryption exceptions 2014-11-07 13:48:31 +01:00
Robin Appelman
d26a427f92 Also propagate etag changes when the watcher finds a changed file 2014-11-07 12:56:09 +01:00
Lukas Reschke
e345697cab Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing 
Enc stop uploading if private key is missing
 2014-11-07 11:19:04 +01:00
Thomas Müller
88c329b394 Merge pull request #12019 from owncloud/fix-template-shortcuts 
second parameter in template shortcuts script() and style() is optional
 2014-11-07 11:01:10 +01:00
Lukas Reschke
d383c45c13 Merge pull request #12003 from owncloud/password-migration 
Use new hashing API for OC_User_Database
 2014-11-06 22:43:57 +01:00
Morris Jobke
81e6329c04 second parameter in template shortcuts script() and style() is optional 2014-11-06 21:26:50 +01:00
Morris Jobke
e53354bfd7 Merge pull request #12009 from owncloud/make-optional 
Make second argument optional
 2014-11-06 19:43:11 +01:00
Robin Appelman
0c230fb57e Merge pull request #11945 from owncloud/share-setup-other-user 
Setup shared mounts for the correct user when setting up the filesystem
 2014-11-06 19:24:24 +01:00
Robin Appelman
c21d1da01a Support displaynames for dummy user backend 2014-11-06 18:31:40 +01:00
Lukas Reschke
20cd9a134f Make second argument optional 
Equivalent to addVendorScript und addScript from OC_Util
 2014-11-06 18:17:21 +01:00
Lukas Reschke
c4d7483a0a Use new hashing API for OC_User_Database 
This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
 2014-11-06 15:42:06 +01:00
Lukas Reschke
24ca2d858f Add OCP\Security\IHasher 
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.

Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
 2014-11-06 15:16:14 +01:00
Lukas Reschke
f73d653036 Merge pull request #11972 from owncloud/usermanager-remove-delete 
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
 2014-11-06 13:52:25 +01:00
Robin Appelman
1eefc21329 Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead 2014-11-05 15:45:58 +01:00
Thomas Müller
06267fec8f Merge pull request #11928 from owncloud/support-HTML-in-logo 
Support HTML in logo
 2014-11-05 13:54:29 +01:00
Bjoern Schiessle
c2a45c1238 throw exception if private key is missing 2014-11-05 13:05:46 +01:00
Morris Jobke
7f4e447a5f fix shortcuts - underline instead of camelCase 2014-11-04 13:57:38 +01:00
Morris Jobke
fde8ef0655 Merge pull request #11916 from owncloud/introduce-bower 
Introduce bower dependency managment for frontend libraries
 2014-11-04 11:59:33 +01:00
Morris Jobke
7f1d974796 Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig 
First check whether it is the default config before touching
 2014-11-03 21:20:42 +01:00
Lukas Reschke
be5ae6c44f Support HTML in logo claim 2014-11-03 21:14:27 +01:00
Morris Jobke
d763b32048 ability to add bower resources 
* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
 2014-11-03 20:54:40 +01:00
Thomas Müller
994768d99f Update Pimple to V3.0 2014-11-03 16:57:16 +01:00
Lukas Reschke
9790801268 First check whether it is the default config before touchign 
Potentially fixes https://github.com/owncloud/core/issues/11678
 2014-11-03 16:37:04 +01:00
Morris Jobke
56cf1d9d27 fix odd behaviour 2014-10-31 18:46:47 +01:00
Vincent Petry
fd4b97d758 Merge pull request #9044 from owncloud/add-missing-email-principal 
adding missing email address for principal
 2014-10-31 13:24:42 +01:00
Vincent Petry
55658e7bb2 Merge pull request #11539 from owncloud/mount-setup-once 
Only mount the storages for the user once
 2014-10-31 10:42:29 +01:00
Morris Jobke
1c7f1a8787 Merge pull request #11877 from owncloud/fix-11875-master 
prevent PHP notice
 2014-10-30 21:43:38 +01:00
Vincent Petry
bed81ea854 Merge pull request #11080 from owncloud/addheader-text-2 
Fix the addHeader tag attributes text methods to not ignore the text parameter
 2014-10-30 18:13:46 +01:00
Thomas Müller
99921489cf prevent PHP notice 2014-10-30 17:24:25 +01:00
Georg Ehrke
33186957c8 delete all children's previews when deleting a folder 
add phpdoc
 2014-10-30 17:15:42 +01:00
Thomas Müller
9b293537a6 Merge pull request #11740 from owncloud/update-archive-tar 
Update pear/archive_tar to 1.3.13
 2014-10-30 17:14:07 +01:00
Lukas Reschke
6db69c5d05 Merge pull request #11864 from owncloud/clear-session-after-logout 
Clear session after logout
 2014-10-30 16:47:46 +01:00
Morris Jobke
90e523ead0 Merge pull request #11858 from owncloud/fix-11064 
Allow any outgoing XHR connections
 2014-10-30 16:19:39 +01:00
Thomas Müller
08b46ccc17 Update pear/archive_tar to 1.3.13 2014-10-30 16:10:00 +01:00
Thomas Müller
18f7f582ac Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro 
Fix stupid copy paste fail
 2014-10-30 14:45:58 +01:00
Morris Jobke
e2001c6d31 Merge pull request #11821 from owncloud/generic-response 
Add a generic data response
 2014-10-30 14:05:25 +01:00
Lukas Reschke
770c62c5d8 Clear session after logout 
Fixes https://github.com/owncloud/core/issues/8420
 2014-10-30 12:10:39 +01:00
Lukas Reschke
e219d72619 Fix stupid copy paste fail 
...
 2014-10-30 10:37:59 +01:00
Lukas Reschke
b3f881748d Allow any outgoing XHR connections 
Quickfix for https://github.com/owncloud/core/issues/11064
 2014-10-30 00:00:40 +01:00
Vincent Petry
106b9eb55c Merge pull request #11409 from owncloud/watcher-reuse 
Pass the cached data to the filesystem watcher
 2014-10-29 16:38:16 +01:00
Thomas Müller
fb4f993336 Fix implementation of translation short cut 2014-10-29 10:58:10 +01:00
Vincent Petry
c682b1f0c1 Fix language file detection 2014-10-29 10:13:51 +01:00
Thomas Müller
2f19de11e4 adding console command to generate javascript translation files based on existing php translation files 
read server side translations from json files
 2014-10-29 10:09:12 +01:00
Thomas Müller
a589d61b78 in case a translation javascript is not found we no longer bail out 
remove translation.php
 2014-10-29 10:09:12 +01:00
Vincent Petry
ec1a73fab9 Added OC.L10N namespace with translation functions 
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
 2014-10-29 10:09:12 +01:00
Bernhard Posselt
0696099bad add dataresponse 
fix docstrings

adjust copyright date

another copyright date update

another header update

implement third headers argument, fix indention, fix docstrings

fix docstrings
 2014-10-29 09:43:47 +01:00
Robin Appelman
2974d4d380 Reset the users setup after clearing mounts 2014-10-28 15:13:29 +01:00
Lukas Reschke
510d0b2cf3 Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter 
Also support closing tags with no text content given

Conflicts:
	lib/private/template.php
 2014-10-28 11:15:58 +01:00
Morris Jobke
4461e69873 Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handling 
Properly catch 503 storage not available in getQuotaInfo
 2014-10-28 09:33:54 +01:00
Lukas Reschke
d6380a5395 Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable 
Make supported DBs configurable within config.php
 2014-10-27 22:24:16 +01:00
Thomas Müller
79778d6a51 code cleanup during review 👍 2014-10-27 21:39:35 +01:00
Lukas Reschke
233c49f4b9 Make supported DBs configurable within config.php 
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.

To test this play around with the new configuration parameter "supportedDatabases".
 2014-10-27 21:39:34 +01:00
Robin Appelman
3f63f4b6b1 Only mount the storages for the user once 2014-10-27 18:50:28 +01:00
Vincent Petry
21d825ed6c Properly catch 503 storage not available in getQuotaInfo 
When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.

This fix prevents the expected exception to make the whole call fail.
 2014-10-27 16:27:12 +01:00
Morris Jobke
a00712aa65 Merge pull request #11783 from owncloud/allow_passing_driver_options 
allow passing db driver options
 2014-10-27 16:00:13 +01:00
Robin Appelman
8de287f2ef Merge pull request #11763 from owncloud/stable-etags 
Generate stable etags for local files
 2014-10-27 15:30:30 +01:00
Jörn Friedrich Dreyer
e16a58220d allow passing driver options, fixes #11718 2014-10-27 12:30:29 +01:00
Vincent Petry
aee1edf6b5 Merge pull request #11708 from owncloud/fix-momentjs 
Setting moment locale based on user selection
 2014-10-27 10:30:47 +01:00
Lukas Reschke
acec1afe17 Merge pull request #11760 from owncloud/add-type-hints-where-sensible 
Add type hinting to functions
 2014-10-25 14:09:48 +02:00
Morris Jobke
be32e562e3 drop unneeded hint 2014-10-25 12:00:56 +02:00
Morris Jobke
63f2b1f460 Merge pull request #11767 from danbartram/add_db_rollback 
Add missing DB rollback functionality
 2014-10-24 19:52:56 +02:00
Thomas Müller
9fa5483111 Merge pull request #11709 from owncloud/temp-handling 
Cleanup handling of temporary files
 2014-10-24 19:29:05 +02:00
Dan Bartram
9c1015b790 Add missing DB rollback functionality 2014-10-24 17:44:06 +01:00
Robin Appelman
283c10f010 Generate stable etags for local files 2014-10-24 16:47:58 +02:00
Lukas Reschke
f901c5ff08 Fix PHPDoc and remove explicit type hint 2014-10-24 15:49:55 +02:00
Lukas Reschke
b3a04840b5 Add type hinting to functions 
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
 2014-10-24 14:13:40 +02:00
Robin Appelman
16cfca6a5f Better reuse of cache data for getFolderContents 2014-10-24 12:33:54 +02:00
Robin Appelman
0a3f57f832 Pass the cached data to the filesystem watcher 2014-10-24 12:32:55 +02:00
Lukas Reschke
d060180140 Use function outside of loop 
Otherwise the function is executed n times which is a lot of overhead
 2014-10-24 12:27:53 +02:00
Robin Appelman
0b96297783 Use the TempManager to handle temporary files 2014-10-24 12:18:49 +02:00
Robin Appelman
83c74b80ad Add \OC\TempManager to handle creating and cleaning temporary files 2014-10-24 12:18:46 +02:00
Lukas Reschke
2d2a4741ce Make files non executable 
There is not much sense in having these files marked executable, we should avoid that.
 2014-10-24 11:14:51 +02:00
libasys
cbd130bed0 adding missing email address for principal 
* fix #8515
* add mail only if it exists
 2014-10-24 11:12:23 +02:00
Morris Jobke
4b5a3876ac Merge pull request #7749 from owncloud/load_avatar_header_via_php 
Load avatar in header via PHP
 2014-10-24 01:27:25 +02:00
kondou
729dffed5e Load avatar in header via PHP 
* fix #7484
* use UID, css, and div instead of span
 2014-10-23 23:17:18 +02:00
Lukas Reschke
c30b7f8197 Remove unreachable statement 2014-10-23 23:03:14 +02:00
Clark Tomlinson
ca5abe5744 Setting moment locale based on user selection 2014-10-23 10:32:47 -04:00
Thomas Müller
e26a16afea Merge pull request #11549 from owncloud/add-more-localizations-master 
implement localizations based on punic
 2014-10-23 16:09:47 +02:00
Thomas Müller
6c1871da06 Merge pull request #10985 from owncloud/db-cleanup 
Cleanup database handling
 2014-10-23 13:48:33 +02:00
Morris Jobke
b82e44b448 Merge pull request #10689 from owncloud/load_classfile_once 
make sure class file is loaded once
 2014-10-23 11:41:00 +02:00
Lukas Reschke
e9ec45ddd1 Merge pull request #11704 from owncloud/fix-type-for-query 
Use mixed as type
 2014-10-22 18:13:31 +02:00
blizzz
44a7a3690a Merge pull request #11702 from owncloud/fix-11637 
setup filesystem by username, not login name, fixes #11637
 2014-10-22 17:56:30 +02:00
Lukas Reschke
be06937e65 Use mixed as type 
Actually query() returns value of the type "mixed" (as is also stated in the interface) - this is purely there to make our IDEs and Scrutinizer happier.
 2014-10-22 15:09:33 +02:00
Jörn Friedrich Dreyer
b7fa644a54 Merge pull request #9586 from owncloud/enhanced-sql-script-generation-oracle-master 
Special treatment for Oracle
 2014-10-22 14:54:42 +02:00
Lukas Reschke
31e489b44d Merge pull request #11687 from owncloud/appframework-session-annotation 
introduce SessionMiddleWare to control session handling via an annotatio...
 2014-10-22 14:45:28 +02:00
Arthur Schiwon
993376fb6f better variable name 2014-10-22 13:36:57 +02:00
Arthur Schiwon
e0342db47c set up FS by username, not login name\! 2014-10-22 13:28:08 +02:00
Thomas Müller
02c5933af8 introduce SessionMiddleWare to control session handling via an annotation 2014-10-22 12:44:19 +02:00
Robin Appelman
d83b11d34a Use statements wrapper in \OCP\IDB 2014-10-22 12:29:53 +02:00
Robin Appelman
e6f6cdd19f Bit more cleanup 2014-10-22 12:29:53 +02:00
Robin Appelman
2ae6a0d96d Move creating the database connection to the server container 2014-10-22 12:29:53 +02:00
Robin Appelman
d4e929c37a Remove implicit prepared statement cache and get the connection from the server container in \OC_DB 2014-10-22 12:26:43 +02:00
Robin Appelman
72f99f5041 Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBConnection directly instead 2014-10-22 12:26:43 +02:00
Bjoern Schiessle
b7718bc212 always use the correct share type 2014-10-22 11:48:29 +02:00
Morris Jobke
e2ff180521 Merge pull request #11416 from owncloud/eventlogger 
Allow apps to gather performance diagnistics
 2014-10-22 11:18:26 +02:00
Lukas Reschke
cb36666600 Merge pull request #11630 from owncloud/kill-some-legacy 
remove legacy class OC_Updater
 2014-10-21 14:01:49 +02:00
Lukas Reschke
8f8abdbaee Add unit tests for convertToRelativePath 2014-10-20 15:09:43 +02:00
Lukas Reschke
7b94c7f9c1 Refer to relative path instead of absolute path 
There is no need to refer to the absolute path here if we can use the relative one.

Conflicts:
	lib/private/templatelayout.php
 2014-10-20 15:09:43 +02:00
Thomas Müller
c8e8945efb implement localizations based on punic 2014-10-20 15:04:42 +02:00
Thomas Müller
6af0e76a03 remove legacy class OC_Updater 2014-10-20 14:44:42 +02:00
Robin Appelman
9fd234f63f Log some additional events 2014-10-20 13:38:38 +02:00
Robin Appelman
beb1c6ad74 Allow adding events that hapend before the event logger was loaded 2014-10-20 13:38:38 +02:00
Robin Appelman
4a8358bc50 Rename to NullQueryLogger 2014-10-20 13:38:38 +02:00
Robin Appelman
1e69f5e7ac Log some basic events 2014-10-20 13:38:38 +02:00
Robin Appelman
6e08014781 Rename namespace to Diagnostics 2014-10-20 13:38:38 +02:00
Robin Appelman
2790bda4f8 Activate the query logger on connect 2014-10-20 13:38:37 +02:00
Robin Appelman
b71d1d3616 Add QueryLogger interface to allow apps to get a list of used queries 2014-10-20 13:38:37 +02:00
Robin Appelman
d38050cf52 Add an EventLogger interface to allow apps to get a log of the request timeline 2014-10-20 13:38:37 +02:00
Jörn Friedrich Dreyer
ca0e3fdfea throw exception in writeBack, the returned boolean is checked nowhere 2014-10-20 11:29:05 +02:00
Jörn Friedrich Dreyer
9b0f0df7f5 make skeleton compatible with objectstore 
suspend encryption proxy when copying skeleton
 2014-10-20 11:28:36 +02:00
Arthur Schiwon
4e8c7570d4 make performance less bad. Still far from good, but at least it works 2014-10-17 20:16:04 +02:00
Arthur Schiwon
a7a532f58a with several backends, more than limit can be returned 2014-10-17 20:16:04 +02:00
Morris Jobke
7bf401e48a Merge pull request #11430 from owncloud/minify-js-css-master 
adding cssmin and jssmin(minify)
 2014-10-17 15:05:59 +02:00
Lukas Reschke
439b33ec38 Merge pull request #11634 from owncloud/loadapps-encapsulaterequire 
Encapsulate require_once to avoid name space bleedind
 2014-10-17 14:32:10 +02:00
Vincent Petry
27c22f071d Encapsulate require_once to avoid name space bleedind 
The script required by require_once might use variable names like $app
which will conflict with the code that follows.

This fix encapsulates require_once into its own function to avoid such
issues.
 2014-10-17 12:45:45 +02:00
Thomas Müller
93b0f1a3bf adding cssmin and jssmin(minify) 
adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content

adding repair step to clean the asset cache after upgrade + coding style adjustments
 2014-10-17 12:22:26 +02:00
blizzz
688a141586 Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup 
drastic ldap speedup (update)
 2014-10-17 12:07:27 +02:00
Morris Jobke
f1a5ebd59d Merge pull request #11611 from owncloud/fix-svg-master 
Fix SVG icons
 2014-10-17 12:01:27 +02:00
Lukas Reschke
af335a39f1 Add PHPDoc about sanitization of "insertIfNotExist" 
Let's document this potential pitfall properly.
 2014-10-17 11:06:49 +02:00
Lukas Reschke
53e0cf2f74 Add a try catch block 
This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
 2014-10-16 21:45:09 +02:00
Thomas Müller
f7097faf82 Special treatment for Oracle 2014-10-16 17:02:15 +02:00
Lukas Reschke
a37dcf94fd Merge pull request #11591 from owncloud/addAppVersionToCSSandJS 
Add app version to JS and CSS
 2014-10-16 15:54:57 +02:00