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

8713 commits

Author SHA1 Message Date
Lukas Reschke
05615bfd47 Simplify isValidPath and add unit tests 
The check for invalid paths is actually over-complicated and performed twice resulting in a performance penalty. Additionally, I decided to add unit-tests to that function.

Part of https://github.com/owncloud/core/issues/13221
 2015-01-10 00:40:21 +01:00
Lukas Reschke
5f31207e84 Add some more sanity checks for maintenance mode 2015-01-09 21:52:16 +01:00
Lukas Reschke
1c75b73239 Verify authentication before initializing apps and routing 
The current behaviour of the authenticion logic in base.php prevents REST APIs in ownCloud applications to work.

Because `!self::$CLI` is usually always a true statement the previously above block was entered which returned, thus the authentication logic for this part does not trigger in.

This can be reproduced by installing apps such as the News app and issuing the following command:

`curl -u admin:admin http://localhost/index.php/apps/news/api/v1-2/feeds`

The following parts needs to get throughly tested:

- [ ] OCS
- [ ] remote.php's DAV features
- [ ] Regular login features

This bug affects master and stable7. I'd propose that we merge this for 8.0 since this has the potential to break every component that relies on Basic Auth features. A backport would also be very nice.

Remark to myself: We really need to move out the authentication code for 8.1 out of base.php - I already have a local branch that does that somewhere which I will get in shape for 8.1... - This untested code is a night-mare.

Fixes itself.
 2015-01-09 21:07:29 +01:00
Lukas Reschke
b8b4df5425 Cache responses from the AppStore server 
Otherwise every time the AppStore was opened a lot of connections to the AppStore server were made which resulted in a terrible performance.

This changeset will cache the response for a sensible time so that only the first request will be somewhat slow.

Performance changes:
- Loading a category took previously more than 3 seconds on my machine. Now for every follow-up request it takes less than 200ms, resulting in a performance gain of 1950%
- Loading the category list took previously about 750ms - now it takes 154ms, a total performance gain of 395%
 2015-01-09 19:49:59 +01:00
Thomas Müller
d4355cafc6 Merge pull request #13192 from owncloud/cache_binary_path 
Use memcache for findBinaryPath
 2015-01-09 17:46:36 +01:00
Robin McCorkell
631d6571fd Merge pull request #13181 from owncloud/filecache-preventleadingslash 
Trim leading or trailing slashes in file cache paths
 2015-01-09 13:54:17 +00:00
Morris Jobke
800738f51a Merge pull request #12011 from owncloud/reuse-etag-default 
Default to reusing etags in the scanner
 2015-01-09 14:38:45 +01:00
Robin McCorkell
c291383116 Memcache binary executable searching 
It's slow, this makes it fast!
 2015-01-09 13:18:00 +00:00
Robin McCorkell
17dd5d0816 Add Null memcacher 2015-01-09 13:18:00 +00:00
Thomas Müller
1f1643b35f Merge pull request #12995 from owncloud/tbelau666-master 
Use Doctrines filter by table name
 2015-01-09 14:17:14 +01:00
Vincent Petry
888ce4d4f9 Fix cache jail to not duplicate slashes 2015-01-09 10:18:32 +01:00
Jenkins for ownCloud
d4fc2f555b [tx-robot] updated from transifex 2015-01-09 01:55:22 -05:00
Lukas Reschke
6c59253978 Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-files 
Verify whether type is correct
 2015-01-09 02:27:51 +01:00
Morris Jobke
6a5f12beca Merge pull request #12988 from owncloud/logfile_download 
Logfile download
 2015-01-09 00:33:22 +01:00
Vincent Petry
aa821ecc00 Trim leading or trailing slashes in file cache paths 2015-01-08 19:43:02 +01:00
Lukas Reschke
ceaaab6295 Verify whether type is correct 
`$this->info` can very well contain an empty array or possibly other values. This means that when this code path is called a PHP Fatal error might get thrown which is not what we want.
 2015-01-08 18:38:17 +01:00
Lukas Reschke
7fbb7f4dc4 Add version to .htaccess 
Currently if a user does not replace the .htaccess file with the new update this can lead to serious problems in case Apache is used as webserver.

This commit adds the version to the .htaccess file and the update routine fails in case not the newest version is specified in there. This obviously means that every release has to update the version specified in .htaccess as well. But I see no better solution for it.

Conflicts:
	lib/private/updater.php
 2015-01-08 12:49:02 +01:00
Thomas Müller
5f171618fd remove unused variable and fix undefined variable 2015-01-08 09:46:40 +01:00
Thomas Müller
296a852063 check for working htaccess will result in a dead lock because the server is blocking the request to itself - fixes #13153 2015-01-08 09:13:18 +01:00
Jenkins for ownCloud
6bda95037f [tx-robot] updated from transifex 2015-01-08 01:56:00 -05:00
Vincent Petry
2e57fe93e4 Disable part files for OC ext storage backend + s2s backend 
When uploading files to an OC ext storage backend or when using server
to server sharing storage, part files aren't needed because the backend
already has its own part files and takes care of the final atomic rename
operation.

This also fixes issues when using two encrypted ownCloud instances where
one mounts the other either as external storage (ownCloud backend) or
through server to server sharing.
 2015-01-07 21:21:51 +01:00
Morris Jobke
bfb6e350d5 Merge pull request #13016 from owncloud/sharing_fixes 
don't delete share table entries for the unique name if re-share permission was removed
 2015-01-07 18:14:53 +01:00
Bjoern Schiessle
b6f63e9b3d don't delete share table entries for the unique name if re-share permission was removed 2015-01-07 16:36:13 +01:00
Georg Ehrke
f579f2bd94 add Download logfile button to admin settings 
add logSettingsController

add download logfile button

move getEntries to LogSettingsController

move set log level to logsettingscontroller.php

add warning if logfile is bigger than 100MB

add unit test for set log level

fix typecasting, add new line at EoF

show log and logfile download only if log_type is set to owncloud

add unit test for getFilenameForDownload
 2015-01-07 14:55:53 +01:00
Morris Jobke
fd57820708 Merge pull request #13132 from aptivate/improve_debug_logging_messages 
Improve debugging for ServiceUnavailable exceptions
 2015-01-07 10:36:27 +01:00
Thomas Müller
4628e98cfc Merge pull request #13063 from AdamWill/assets-relocate 
allow css/js asset directory to be relocated ('assetdirectory')
 2015-01-07 09:36:26 +01:00
Jenkins for ownCloud
2daf90dae6 [tx-robot] updated from transifex 2015-01-07 01:55:42 -05:00
Morris Jobke
a8d82b7091 Merge pull request #13131 from owncloud/db-connect-stacktrace 
Prevent leaking db connection info in the stacktrace
 2015-01-07 01:17:27 +01:00
Lukas Reschke
7528a1a475 Merge pull request #13130 from owncloud/getstoragestats-error-handling 
Add error handling to getstoragestats.php
 2015-01-06 18:35:09 +01:00
Chris Wilson
402a3ed146 Improve debugging for ServiceUnavailable exceptions 
I was getting a lot of these in my logs for no apparent reason, and file
uploads were failing:

	{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"}

In order to debug it, I had to add unique messages to all the places where
this exception was thrown, to identify which one it was, and that made the
logs much more useful:

	{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
 2015-01-06 15:59:38 +00:00
Robin Appelman
3356308594 Prevent leaking db connection info in the stacktrace 2015-01-06 16:54:41 +01:00
Morris Jobke
fe4592937a Merge pull request #12653 from owncloud/full_content_search_results 
Full content width search results
 2015-01-06 16:44:58 +01:00
Robin Appelman
64e3ebae74 Add error handling to getstoragestats.php 2015-01-06 15:56:06 +01:00
Thomas Müller
68efeba343 Merge pull request #13125 from owncloud/lower-deprecation-warning-level 
degraded logging policy for server container in AppFramework
 2015-01-06 14:38:50 +01:00
Thomas Müller
20886d8151 Merge pull request #13116 from owncloud/fix_assets 
Fix JS asset generation
 2015-01-06 14:36:51 +01:00
Morris Jobke
4ffe7ddb75 degraded logging policy for server container in AppFramework 2015-01-06 13:43:40 +01:00
Jenkins for ownCloud
6a3f69c2d0 [tx-robot] updated from transifex 2015-01-06 01:54:59 -05:00
Adam Williamson
bb79aac78a allow css/js asset directory to be relocated (#13053) 
This allows the directory where CSS/JS asset collections are
written to be changed, in case SERVERROOT is not writeable. Note
it does *not* allow the expected URL to be changed: whatever
directory is used, the server must be configured to serve it
at WEBROOT/assets. It may be possible to add another config
parameter to allow the admin to specify a custom asset URL,
but I thought I'd keep the first implementation simple.
 2015-01-05 15:24:23 -08:00
Thomas Müller
c0ad6e818b Merge pull request #13101 from owncloud/variable-is-undefined-please-use-a-proper-ide-in-the-future-whoever-did-that 
Fix undefined variable and write unit tests for OC_Principal connector
 2015-01-05 20:09:10 +01:00
Robin McCorkell
2c44bc1768 Fix JS asset generation 
At some point SeparatorFilter should be included upstream
(kriswallsmith/assetic), then lib/private/assetic/separatorfilter.php can be
removed and the `use` in lib/private/templatelayout.php rewritten.

SeparatorFilter inserts a separator between assets, preventing issues when
files are incorrectly terminated. For JS this is a semicolon.
 2015-01-05 15:48:04 +00:00
Lukas Reschke
8689605999 Use info instead of warning log level 
Otherwise the log is flooded as can be seen at https://github.com/owncloud/core/issues/13106

Fixes https://github.com/owncloud/core/issues/13106
 2015-01-05 11:18:54 +01:00
Lukas Reschke
0ed00bca43 Use namespace 2015-01-05 09:54:14 +01:00
Lukas Reschke
556c9b6f46 Write unit-tests and use DI 2015-01-05 09:54:12 +01:00
Lukas Reschke
f2ddd565e8 Fix code-style 2015-01-05 09:53:01 +01:00
Morris Jobke
f2e759b533 Merge pull request #13095 from derkostka/master 
fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"
 2015-01-05 09:47:44 +01:00
Jenkins for ownCloud
8776271103 [tx-robot] updated from transifex 2015-01-05 01:54:36 -05:00
derkostka
deedfad050 fix "app":"PHP","message":"Undefined variable: user at/principal.php#66" 
changed variable #user to #name
 2015-01-04 17:07:33 +01:00
Morris Jobke
298eae9c86 Merge pull request #13060 from dratini0/master 
Fix: X-Accel-Redirect did not support custom data dir and local mounts
 2015-01-04 10:09:30 +01:00
Jenkins for ownCloud
84ed1034b4 [tx-robot] updated from transifex 2015-01-04 01:54:53 -05:00
Jenkins for ownCloud
05ffa3ab7a [tx-robot] updated from transifex 2015-01-03 01:54:29 -05:00
Jörn Friedrich Dreyer
79e790c55d add SIZE_ALL const 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
a8edb2124d fix visibility 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
606f802b7b move search results below filelist, show hint when results are off screen, use js plugin mechanism 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
0e9b05b701 ajax paging, some js cleanups 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
c738359a11 add paged provider 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
088323aad5 move code from js.js to search.js in the search app 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
d3662722f6 new OC.Search, add search result formatters and handlers, use full content width for results 2015-01-02 10:28:41 +01:00
Jenkins for ownCloud
4b357274bb [tx-robot] updated from transifex 2015-01-02 01:54:28 -05:00
Jenkins for ownCloud
ec6e70889a [tx-robot] updated from transifex 2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d [tx-robot] updated from transifex 2014-12-31 01:54:33 -05:00
dratini0
31970ee740 removed a little duplication 2014-12-30 22:36:13 +01:00
dratini0
f2075f803f Fix: X-Accel-Redirect did not support custom data dir and local mounts 2014-12-30 22:07:04 +01:00
Frank Karlitschek
cd53da43c0 Merge pull request #12854 from owncloud/add-direct-download-link 
Adding foundation for the direct download url
 2014-12-29 18:47:39 +01:00
Jenkins for ownCloud
c8e946f633 [tx-robot] updated from transifex 2014-12-29 01:54:27 -05:00
Thomas Müller
81243b0f5d adding getDirectDownload() to Wrapper 2014-12-28 17:17:14 +01:00
Thomas Müller
5b00bc1d6e Adding basement for the direct download url 2014-12-28 17:17:14 +01:00
Thomas Müller
aec79b0c0e Merge pull request #13043 from owncloud/check-for-hash 
Check for hash
 2014-12-28 14:12:57 +01:00
Lukas Reschke
2711863220 Merge pull request #13035 from owncloud/new_edition_detection 
Automatically detect the edition based on the enterprise_key app.
 2014-12-28 13:36:59 +01:00
Lukas Reschke
222e4a0762 Check for hash 
See https://github.com/owncloud/core/pull/13042
 2014-12-28 13:23:34 +01:00
Jenkins for ownCloud
d2e53d1022 [tx-robot] updated from transifex 2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8 [tx-robot] updated from transifex 2014-12-26 01:54:28 -05:00
Frank Karlitschek
4a40e5699c remove Edition 2014-12-25 11:36:41 +01:00
Frank Karlitschek
3dea2b95c6 Automatically detect the edition based on the enterprise_key app. 2014-12-25 09:48:15 +01:00
Jenkins for ownCloud
e0fc26a5cb [tx-robot] updated from transifex 2014-12-25 01:54:29 -05:00
Jenkins for ownCloud
801b9e0494 [tx-robot] updated from transifex 2014-12-24 01:54:33 -05:00
Morris Jobke
95374e1404 add default for dbtableprefix 2014-12-23 13:32:25 +01:00
Bernhard Posselt
f195123765 Intelligent container 
* resolves dependencies by type hint or variable name
* simpler route.php
* implementation of https://github.com/owncloud/core/issues/12829

Generates and injects parameters automatically. You can now build full classes like

    $c->query('MyClassName')

without having to register it as a service. The resolved object's instance will be saved by using registerService. If a constructor parameter is not type hinted, the parameter name will be taken.

Therefore the following two implementations are identical:

    class Class1 { function __construct(MyClassName $class)
    class Class1 { function __construct($MyClassName)

This makes it possible to also inject primitive values such as strings, arrays etc.

In addition if the query could not be resolved, a `QueryException` is now thrown

Routes can now be returned as an array from `routes.php` and an `appinfo/application.php` is optional

Old commit messages:

make it possible to return the routes instead of having to intialize the application
try to get the controller by convention
add first implementation of automatic resolve
add another test just to be sure
store the resolved object
more tests
add phpdoc to public app.php method
use the same variable for the public app.php method
deprecate old methods and add services for public interfaces
deprecated getServer method
disallow private api injection for apps other than core or settings (settings should be an app goddamnit :D)
register userid because its such an often used variable
fix indention and leading slash
use test namespace
add deprecation reasons, remove private api usage checks and remove deprecation from getServer()
add additional public interfaces
add public interface for rootfolder
fix syntax error
remove deprecation from methods where no alternative is there yet
remove deprecated from method which has no alternative
add timezone public service for #12881
add another deprecation hint
move deprecation into separate branch
remove dead comment
first try to get the namespace from the info.xml, if it does not exist, just uppercase the first letter
also trim the namespace name
add an interface for timefactory
move timefactory to public and add icontrollermethodreflector
keep core interface
fix copyright date in headers
 2014-12-23 09:50:42 +01:00
Jenkins for ownCloud
d8f04f5a97 [tx-robot] updated from transifex 2014-12-23 01:55:23 -05:00
Morris Jobke
dbc465de97 use injected config object and fix typos 2014-12-22 10:55:52 +01:00
Morris Jobke
de25084def inject \OCP\IConfig instance in migrator 2014-12-22 10:47:10 +01:00
tbelau666
ad8d55c327 Use Doctrines filter by table name 
Doctrine's SchemaManager can filter table names by regular expression.
On this way it picks up only ownClouds's tables in a database.

by tbelau666
 2014-12-22 10:45:32 +01:00
Morris Jobke
5d296aa6b1 Merge pull request #12969 from owncloud/clarify-docs 
Clarify return values
 2014-12-22 10:01:39 +01:00
Morris Jobke
c17b9ec068 Merge pull request #12983 from owncloud/root-iface 
Add an interface for the root folder so apps have an interface to deal with storage
 2014-12-22 09:05:23 +01:00
Jenkins for ownCloud
92c8cd3933 [tx-robot] updated from transifex 2014-12-22 01:54:49 -05:00
Bernhard Posselt
8e37214346 add an interface for the root folder so apps have an interface to deal with storage 
fix comments and newline

add newline
 2014-12-21 20:52:34 +01:00
Thomas Müller
dc12f5d9af Merge pull request #12978 from owncloud/fix-support-claim 
Change support message to be more explicit about the enterprise edition
 2014-12-21 20:30:43 +01:00
Thomas Müller
c3544bd27e Merge pull request #12982 from owncloud/timefac-iface 
Add an interface for the timefactory class
 2014-12-21 20:27:53 +01:00
Jenkins for ownCloud
312891c603 [tx-robot] updated from transifex 2014-12-21 01:54:36 -05:00
Bernhard Posselt
ba03b0b843 add an interface for the timefactory class 
fix indention
 2014-12-20 15:53:31 +01:00
Morris Jobke
5383d83f9e Change support message to be more explicit about the enterprise edition 2014-12-20 11:57:15 +01:00
Jenkins for ownCloud
5a54ca380d [tx-robot] updated from transifex 2014-12-20 01:56:24 -05:00
derkostka
1c22b1f626 Fix Undefined variable: result at tags.php#231 
Fix app":"PHP","message":"Undefined variable: result at \/var\/www\/owncloud\/lib\/private\/tags.php#231" by moving the function call into the respective loop

Adjust indentation

Do it right - indentation

sorry, this is my first one
 2014-12-19 19:44:43 +01:00
Björn Schießle
8164415b45 Merge pull request #12749 from owncloud/server2server-sharing-ng 
server to server sharing next generation
 2014-12-19 19:04:44 +01:00
blizzz
ad6814f920 Merge pull request #12101 from owncloud/ldap_split_mapping 
Ldap split mapping from Access superclass
 2014-12-19 18:52:30 +01:00
Arthur Schiwon
ec0f80fee9 Split mapping from Access and Helper classes into it's own. Fully test them, too. 
remove unused methods

split mapping methods off from Access class

fix DB query handling

move 'clear mapping' methods from static helper to new mapping class

add tests

test directly with DB

finishing tests and fix return value from setDNbyUUID

add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class.

add missing info to PHPDoc

add unmap method

fix namespaces

fix test inheritance

PHPDoc and a small code restructure for scrutinizer, no effective changes

PostgreSQL does not accept LIMIT in DELETE queries

phpdoc fixes, no code changes
 2014-12-19 18:26:12 +01:00
Bjoern Schiessle
24993280ed Next step in server-to-server sharing next generation, see #12285 
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
 2014-12-19 15:20:24 +01:00
Lukas Reschke
f671b232cc Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-mode 
Add ultra-slim hack for incognito mode
 2014-12-19 14:54:11 +01:00
Lukas Reschke
dbbf568192 Fix typo 2014-12-19 14:36:00 +01:00
Lukas Reschke
a022e65285 Clarify return values 
This function returns `null` when no user is logged-in.
 2014-12-19 14:17:40 +01:00
Thomas Müller
2d64797320 Merge pull request #12956 from owncloud/jenkins-user-backend-names 
[jenkins only] introduce names for user backends - IUserBackend
 2014-12-19 13:15:50 +01:00
Lukas Reschke
157ff1219a Merge pull request #12954 from owncloud/hhvm-apc-clear 
HHVM: In APC cache clear, only request the cache key in APCIterator.
 2014-12-19 10:46:20 +01:00
Morris Jobke
6b3600d2bf Merge pull request #12918 from owncloud/use-uid-instead-of-login-name 
Return UID instead of login name
 2014-12-19 10:24:52 +01:00
Morris Jobke
6da33e1ea7 introduce names for user backends - IUserBackend 
* LDAP with multiple servers also proved backendName
 2014-12-19 10:17:17 +01:00
Morris Jobke
39d6ddd38a Merge pull request #12865 from owncloud/files-tags-webdav 
Returns tags through WebDAV
 2014-12-19 09:33:28 +01:00
Jenkins for ownCloud
028b0efd5c [tx-robot] updated from transifex 2014-12-19 01:56:51 -05:00
Andreas Fischer
0ba5c182f0 HHVM: In APC cache clear, only request the cache key in APCIterator. 
The default value of the $format parameter of the APCIterator constructur is
APC_ITER_ALL which instructs the iterator to provide all available information
on cache values being iterated over. Only the key value is necessary for
matching and deletion via apc_delete(), though.

This prevents a "Format values FILENAME, DEVICE, INODE, MD5, NUM_HITS, MTIME,
CTIME, DTIME, ATIME, REFCOUNT not supported yet." notice on HHVM.
 2014-12-19 03:24:00 +01:00
Morris Jobke
114a6464e8 Merge pull request #12748 from owncloud/redis_cache 
Add Redis cache implementation, prefer over memcached, tests & config sample doc
 2014-12-19 00:26:25 +01:00
Morris Jobke
75e8b39826 Merge pull request #12879 from owncloud/mountconfig 
Add mount specific options
 2014-12-18 23:38:14 +01:00
Jörn Friedrich Dreyer
891474b0d6 Merge pull request #12759 from owncloud/core-reduce-js-and-css 
make sure styles and scripts are only loaded once
 2014-12-18 23:18:37 +01:00
Morris Jobke
609e10238f Merge pull request #12945 from owncloud/hhvm-image 
HHVM: Do not call filesize(null), this function expects a string.
 2014-12-18 22:20:56 +01:00
Andreas Fischer
3ebb69944b Do not call filesize(null), this function expects a string. 
filesize(null) yields an int on HHVM and thus exif_imagetype(null) is called.
 2014-12-18 20:57:19 +01:00
Morris Jobke
85301c8b85 Merge pull request #12940 from drarko/master 
Fix extra quotes in custom tags in header
 2014-12-18 18:44:44 +01:00
Vincent Petry
6224e29f25 Fix code style issues for tags plugin 2014-12-18 16:43:00 +01:00
drarko
faaa1a89cb Fix extra quotes in custom tags in header 
Fix #12939
 2014-12-18 12:40:08 -03:00
Robin Appelman
1ef01de402 Merge pull request #12907 from owncloud/delete-invalid-external-share 
Fix deleting invalid s2s shares
 2014-12-18 16:38:13 +01:00
Vincent Petry
3c67900421 Remove obsolete method 2014-12-18 16:04:36 +01:00
Jenkins for ownCloud
5c6e08213e [tx-robot] updated from transifex 2014-12-18 01:56:40 -05:00
Robin McCorkell
619dcae7af Merge pull request #12901 from owncloud/move-ldap-check-to-manager 
Move the Null-Byte LDAP check to the user manager
 2014-12-18 00:28:00 +00:00
Robin McCorkell
d83fdd7f9d Merge pull request #12913 from owncloud/hhvm-memcached-clear 
HHVM: Add workaround for missing Memcached::deleteMulti()
 2014-12-18 00:27:07 +00:00
Morris Jobke
232d4385f4 Merge pull request #12917 from owncloud/fix-ocs-12915-api 
Move basic auth login out of `isLoggedIn`
 2014-12-18 00:57:22 +01:00
Lukas Reschke
e3230b5bc2 Add ultra-slim hack for incognito mode 
As discussed at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
 2014-12-17 21:53:43 +01:00
Lukas Reschke
058324b80e Check basic auth header only for not-logged-in users 2014-12-17 21:42:07 +01:00
Morris Jobke
3d006207d1 Merge pull request #12892 from owncloud/is-addmin 
Add isAdmin and isInGroup methods for the group manager
 2014-12-17 21:40:26 +01:00
Lukas Reschke
9031d79597 Return UID instead of login name 
Without this OCS on LDAP is broken for API requests coming via Basic Authentication...
 2014-12-17 20:33:22 +01:00
Lukas Reschke
a02b00445e Store result of authentication 2014-12-17 20:22:51 +01:00
Lukas Reschke
b91a435ed4 Move basic auth login out of isLoggedIn 
Potentially fixes https://github.com/owncloud/core/issues/12915 and opens the door for potential other bugs...

Please test very carefully, this includes:

- Testing from OCS via cURL (as in #12915)
- Testing from OCS via browser (Open the "Von Dir geteilt" shares overview)
- WebDAV
- CalDAV
- CardDAV
 2014-12-17 20:12:14 +01:00
Andreas Fischer
fcf3c5197f HHVM: Add workaround for missing Memcached::deleteMulti() 2014-12-17 18:10:11 +01:00
Bernhard Posselt
6779bf113d add isAdmin and isInGroup methods for the group manager 2014-12-17 17:41:57 +01:00
Bernhard Posselt
236632702c add a isLoggedIn method to the usersession and deprecate the isLoggedIn method on the api 2014-12-17 17:40:52 +01:00
Andreas Fischer
8c509c3437 HHVM: Call libxml_use_internal_errors() instead of surpressing errors. 
In contrast to the previous solution, this also works on HHVM.
 2014-12-17 17:00:10 +01:00
Vincent Petry
0b3f0716fc Returns and update tags through WebDAV PROPFIND and PROPPATCH 
Added oc:tags and oc:favorites in PROPFIND response.
It is possible to update them with PROPPATCH.
These properties are optional which means they need to be requested
explicitly
 2014-12-17 16:50:35 +01:00
Robin Appelman
9ddd5033d4 Movable mountpoints are always deletable 2014-12-17 16:09:28 +01:00
Robin Appelman
2eab0f2121 Allow disabling previews per mount 2014-12-17 14:03:50 +01:00
Robin Appelman
fd85424742 Add getMountPoint to FileInfo 2014-12-17 14:03:50 +01:00
Robin Appelman
95a145f67f Load mount specific options from the mount config 2014-12-17 14:03:50 +01:00
Lukas Reschke
f6820406b6 Move the Null-Byte LDAP check to the user manager 
The existing method is deprecated and just a wrapper around the manager method. Since in the future other code paths might call this function instead we need to perform that check here.

Related to http://owncloud.org/security/advisory/?id=oc-sa-2014-020
 2014-12-17 12:47:00 +01:00
Thomas Müller
77c4c2856a Merge pull request #12889 from owncloud/deprecation-time 
Deprecate old and replaced appframework apis
 2014-12-17 11:28:01 +01:00
Jenkins for ownCloud
6d80524e67 [tx-robot] updated from transifex 2014-12-17 01:56:41 -05:00
Bernhard Posselt
d59c4e832f first round of deprecation 2014-12-16 19:50:31 +01:00
Thomas Müller
51a22431ee load showpassord.js conditionally in the template only if needed 2014-12-16 18:45:37 +01:00
Thomas Müller
775f6a1354 make sure styles and scripts are only loaded once 2014-12-16 18:26:43 +01:00
Joas Schilling
26100a6dfb Move timezone logic out of server.php 2014-12-16 16:16:22 +01:00
Jenkins for ownCloud
5b9c453071 [tx-robot] updated from transifex 2014-12-16 01:55:32 -05:00
Lukas Reschke
be3d4fd303 Merge pull request #12360 from owncloud/files-tags 
Add favorites to files app
 2014-12-15 19:55:18 +01:00
Lukas Reschke
76357af2d5 Merge pull request #11946 from owncloud/load-vendor-from-core-json 
Implement method that reads vendor libs from core.json
 2014-12-15 16:18:38 +01:00
Jörn Friedrich Dreyer
6602d3ac77 Merge pull request #12555 from owncloud/app_specific_search 
introduce inApps[] filter for search via ajax query
 2014-12-15 16:14:40 +01:00
Morris Jobke
9f30d3529a Implement method that reads vendor libs from core.json 
* includes them at the beginning of initTemplate()
 2014-12-15 14:30:03 +01:00
Morris Jobke
d367d1b06a Merge pull request #12839 from oparoz/ControllerMethodReflector 
\OCP\AppFramework\Utility\IControllerMethodReflector
 2014-12-15 14:20:26 +01:00
Bernhard Posselt
be45366013 Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands 
adding dependencies for command line tools and php libraries
 2014-12-15 12:34:46 +01:00
Thomas Müller
e58b9d3eb7 fixing owncloud version 2014-12-15 12:23:56 +01:00
Vincent Petry
c6be491a89 Return file info from Node API 2014-12-15 12:10:54 +01:00
Morris Jobke
b831914aa6 Merge pull request #11991 from owncloud/bower-jquery-ui 
bower jquery-ui - exported changes to a separate css file
 2014-12-15 11:39:31 +01:00
Jenkins for ownCloud
036456fe16 [tx-robot] updated from transifex 2014-12-15 01:54:30 -05:00
Olivier Paroz
469fd3b3a3 Olivier Paroz \OCP\AppFramework\Utility\IControllerMethodReflector 2014-12-14 23:54:31 +01:00
Philipp Knechtges
768aea57d3 make regex in controllermethodreflector.php compatible with PCRE 6.x 
The syntax ?<...> seems to be only supported from PCRE 7.0 on. For
backwards-compability ?P<...> is used.
 2014-12-14 10:52:21 +01:00
Jenkins for ownCloud
6ae0217326 [tx-robot] updated from transifex 2014-12-14 01:54:56 -05:00
Morris Jobke
5b3971f002 Merge pull request #12639 from owncloud/bad_mtime_format 
Fix formatting of bad dates from external storages
 2014-12-13 10:07:10 +01:00
Morris Jobke
edcd2f2706 bower jquery-ui - exported changes to a separate css file 2014-12-13 09:47:34 +01:00
Morris Jobke
efb495b09f Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index 
Add filter for backend to rest index
 2014-12-13 08:50:15 +01:00
Jenkins for ownCloud
416e21d902 [tx-robot] updated from transifex 2014-12-13 01:55:24 -05:00
Robin McCorkell
fdbb68a3c3 Return ? if mtime is 0 or -1 
Tooltip contains 'Unable to determine date'. Fixes #6395
 2014-12-12 23:54:18 +00:00
Vincent Petry
4b57892c4e Merge pull request #12778 from owncloud/searchbytags2 
Added searchByTags to view, storage and cache
 2014-12-12 14:27:19 +01:00
Joas Schilling
4f92e4a233 Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager 
Add special parameterlist to manager
 2014-12-12 13:03:26 +01:00
Thomas Müller
dcb88e395b rework api of DependencyAnalyzer 2014-12-12 12:34:53 +01:00
Vincent Petry
b1bef5cc15 Merge pull request #12587 from owncloud/dav-logerrors 
Log exceptions in DAV storage
 2014-12-12 11:58:04 +01:00
Joas Schilling
7542883bf8 Merge pull request #12807 from owncloud/fix-timespan-language 
Correctly inject the language into the subcall
 2014-12-12 11:57:22 +01:00
Vincent Petry
3878c3782f Added searchByTag in cache jail wrapper 2014-12-12 11:48:42 +01:00
Vincent Petry
15ecb28d50 Make $userId mandatory for searchByTags 
$userId is now a mandatory parameter for searchByTags.

Also fixed some places in the code where the argument was missing (Node
API and View)
 2014-12-12 11:18:35 +01:00
Joas Schilling
811f9251d6 Correctly inject the language into the subcall 2014-12-12 11:00:07 +01:00
Jenkins for ownCloud
527dd8cdf4 [tx-robot] updated from transifex 2014-12-12 04:19:09 -05:00
Morris Jobke
e969fe6b12 Merge pull request #12698 from owncloud/handle_readonly_shared_files 
Handle readonly shared files
 2014-12-12 08:34:28 +01:00
Jenkins for ownCloud
68932b30fd [tx-robot] updated from transifex 2014-12-12 01:55:24 -05:00
Morris Jobke
c56fa64801 Merge pull request #12786 from owncloud/userfolder-setup 
Ensure user mountpoints are setup when using getUserFolder
 2014-12-11 23:51:49 +01:00
Vincent Petry
25dde7e93b Added searchByTags to view, storage and cache 2014-12-11 17:38:50 +01:00
Thomas Müller
d94c1731d7 check app dependencies on installation as well 2014-12-11 17:02:07 +01:00
Thomas Müller
6566dc83e7 single dependencies will not be represented as an array + fix unit tests 2014-12-11 15:37:45 +01:00
Joas Schilling
1b18554aa7 Allow extensions to specify the list of special parameters 2014-12-11 14:56:46 +01:00
Robin Appelman
802c1b0b3a Ensure user mountpoints are setup when using getUserFolder 2014-12-11 14:34:30 +01:00
Morris Jobke
8fd90e04b6 Merge pull request #12781 from owncloud/jenkins-curl-open-basedir 
[Jenkins only] curl open basedir
 2014-12-11 14:15:24 +01:00
Joas Schilling
cbad5c998b Correctly fallback to english, if the plural case is not translated 2014-12-11 12:42:21 +01:00
Lukas Reschke
d0716d2c7d Use public interface 2014-12-11 12:29:58 +01:00
Vincent Petry
745d8706b9 Add user parameter to tag manager 2014-12-11 12:22:28 +01:00
Thomas Müller
5a03e0a5cf adding dependency to owncloud version - with fallback to requiremin and requiremax 2014-12-11 12:02:12 +01:00
Thomas Müller
ee46548f57 adding dependencies for supported platforms 2014-12-11 12:02:12 +01:00
Thomas Müller
770f987659 adding supported libraries - including min and max version 2014-12-11 12:02:11 +01:00
Thomas Müller
08f1db4451 adding dependencies for command line tools 2014-12-11 12:02:11 +01:00
Thomas Müller
c5e279e416 year go -> year ago 2014-12-11 11:30:00 +01:00
Jenkins for ownCloud
dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Lukas Reschke
9ea205dc3d Check if open_basedir is set 
The file:// protocol does not work with curl when an open_basedir is set.

This fixes https://github.com/owncloud/core/issues/12016
 2014-12-11 00:09:55 +01:00
Lukas Reschke
d84a1f6f3a Add IniGetWrapper to public interface 2014-12-11 00:09:55 +01:00
Morris Jobke
e2c51308df Merge pull request #12758 from owncloud/fix-config-doc-block 
Add type of the variables to the docs
 2014-12-10 17:22:36 +01:00
Thomas Müller
80ae311329 Merge pull request #11892 from owncloud/remove_triggerupdate 
Remove triggerupdate.php & add quiet option for CLI scanner
 2014-12-10 16:17:29 +01:00
Jörn Friedrich Dreyer
1d490b559c introduce inApps[] filter for search via ajax query, make file results show up in files app only 
use more flexible return type

check array with !empty instead of count
 2014-12-10 15:51:59 +01:00
Joas Schilling
bef7392c4c Add type of the variables to the docs 2014-12-10 15:18:06 +01:00
Robin Appelman
3898fbc0d2 Merge pull request #12750 from owncloud/cache-numericstorageidfix 
Fix numeric storage id for cache wrapper
 2014-12-10 15:03:41 +01:00
Joas Schilling
fd2599cfc2 Merge pull request #12485 from owncloud/jenkins-12383 
New DateTimeFormatter class for dates in other timezones and languages
 2014-12-10 14:48:59 +01:00
Vincent Petry
ebba54d490 Fix numeric storage id for cache wrapper 2014-12-10 13:05:31 +01:00
Jörn Friedrich Dreyer
363e9667ec Add Redis cache implementation, prefer over memcached, tests & config sample 2014-12-10 12:24:20 +01:00
Lukas Reschke
5dc6406b70 Add filter for 'backend' to user REST route 
This adds a "backend" type filter to the index REST route which is a pre-requisite for https://github.com/owncloud/core/issues/12620

For example when calling `index.php/settings/users/users?offset=0&limit=10&gid=&pattern=&backend=OC_User_Database` only users within the backend `OC_User_Database` would be shown. (requires sending a CSRF token as well)

Depends upon https://github.com/owncloud/core/pull/12711
 2014-12-10 12:07:34 +01:00
Joas Schilling
67335ccddf Require the interface and return a string instead of private classes 2014-12-10 11:58:56 +01:00
Joas Schilling
4d232e536e Deprecate Util::formatDate() 
Make DateTimeFormatter a service and adjust tests that have been inaccurate
 2014-12-10 11:58:56 +01:00
Lukas Reschke
5398bbdc00 Merge pull request #12711 from owncloud/add-backend-to-rest-index 
Expose backend type via REST API
 2014-12-10 11:56:45 +01:00
Jörn Friedrich Dreyer
0f17486c1d make path absolute 2014-12-10 11:04:17 +01:00
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Thomas Müller
7028c7150d Merge pull request #12664 from owncloud/fix-12164 
Use httphelper and cache response even when it is empty
 2014-12-10 05:42:08 +01:00
Victor Dubiniuk
c9fd3c9d29 Inject config 2014-12-10 01:13:38 +03:00
Morris Jobke
263e008d7b Merge pull request #12695 from owncloud/db-drop-table 
Add dropTable to IDBConnection
 2014-12-09 18:40:56 +01:00
Robin Appelman
6984fa8a19 Quote identifiers for oracle 2014-12-09 17:26:53 +01:00
Robin Appelman
778d8dbafd Add tableExists to public db api 2014-12-09 17:26:53 +01:00
Robin Appelman
8af3991d0c Add dropTable to IDBConnection 2014-12-09 17:26:53 +01:00
Joas Schilling
d69ea30097 Add a DateTimeFormatter class which allows overwriting the language and timezone 
Fix #12227
 2014-12-09 16:10:24 +01:00
Joas Schilling
f53f25eafe Merge pull request #12409 from owncloud/tags-getTagsForObjectIds 
Add getTagsForObjects in ITags
 2014-12-09 13:27:38 +01:00
Joas Schilling
26861a98c5 Merge pull request #12568 from owncloud/autoload-encryption-classes 
Fix namespaces of encryption classes and encryption tests
 2014-12-09 12:56:57 +01:00
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
Vincent Petry
219a129cd6 Close cursor after checking for existing config values 2014-11-28 15:33:21 +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
Vincent Petry
35ab770b11 Close cursor early in calculateFolderSize 
This method triggers additional queries in $this->update() so to avoid
potential database locks or delays, we close the cursor as soon as it is not needed any more
 2014-11-28 09:35:31 +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
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
Jenkins for ownCloud
9df50c7be6 [tx-robot] updated from transifex 2014-11-17 01:54:33 -05: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
Jenkins for ownCloud
0811b39e5f [tx-robot] updated from transifex 2014-11-14 01:54:47 -05: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
Jenkins for ownCloud
a069171cda [tx-robot] updated from transifex 2014-11-13 01:54:36 -05: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
Jenkins for ownCloud
1846fb0285 [tx-robot] updated from transifex 2014-11-12 01:55:24 -05:00
Bernhard Posselt
6d5a239abf Fix Pimple unset 2014-11-11 22:04:46 +01:00
Thomas Müller
4c1244f50c Merge pull request #11917 from owncloud/fix-11909 
Add checkbox to enforce SSL for subdomains
 2014-11-11 20:37:50 +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
Jenkins for ownCloud
c3e3432662 [tx-robot] updated from transifex 2014-11-10 01:54:30 -05: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
Jenkins for ownCloud
7d47d50724 [tx-robot] updated from transifex 2014-11-07 01:55:10 -05:00
Adam Williamson
013feb8da0 writeData(): correct variable name for config file path 
It changed since we wrote this patch.
 2014-11-06 18:10:43 -08:00
Adam Williamson
8b2b0aae31 deleteFromOpcodeCache: make parameter mandatory, document parameter 
Both pointed out in submission review by @bantu, thanks.
 2014-11-06 18:05:20 -08:00
Adam Williamson
3b4823d89c add function to invalidate one opcache file, use it if possible #9885 
Issue #9885 appears to be triggered by ownCloud invalidating the entire
PHP opcache. Testing indicates it can be avoided by only invalidating the
single file that was written from the opcache, instead of clearing the
whole thing. In general it is more efficient to invalidate only the single
file that was changed, rather than the whole cache.

This adds a deleteFromOpcodeCache() function which invalidates a single
file from the opcache if possible, returning true if the underlying
function returns true (which may mean 'success', or 'file does not exist',
or 'file exists but is not in opcache', all of which are OK to treat as
good for our purposes). It also changes writeData() in config.php to try
using deleteFromOpcodeCache() and only fall back on clearOpcodeCache() if
that fails.
 2014-11-06 17:58:58 -08: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
16b0d52031 Default to reusing etags in the scanner 2014-11-06 18:34:10 +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
5b8a6b66b5 Load PHPAss via autoloader 2014-11-06 16:32:53 +01:00
Lukas Reschke
8f1fa32e1f Merge pull request #11998 from owncloud/add-get-logger-to-interface 
Add getLogger() to IServerContainer
 2014-11-06 16:04:54 +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
5f2a083686 Merge pull request #11883 from owncloud/clear-session-for-setup 
Clear session before setup
 2014-11-06 14:39:51 +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
Lukas Reschke
0e3e1e3563 Add getLogger() to IServerContainer 
Makes my IDE complaining less ;-)
 2014-11-06 13:36:36 +01:00
Morris Jobke
73569b29bc md5 now handled via bower 2014-11-06 13:22:16 +01:00
Morris Jobke
e49b9022a1 bower snapjs 2014-11-06 12:03:57 +01:00
Vincent Petry
afa14d571c Merge pull request #11982 from owncloud/bower-underscore 
bower underscore
 2014-11-06 08:42:29 +01:00
Jenkins for ownCloud
fa4018d36c [tx-robot] updated from transifex 2014-11-06 01:55:04 -05:00
Morris Jobke
957dee5af1 bower underscore 2014-11-05 23:23:03 +01:00
Lukas Reschke
4659b0e6a0 Merge pull request #11936 from owncloud/bower-jquery 
Bower jquery
 2014-11-05 16:43:24 +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
e624e9064c Merge pull request #11965 from owncloud/fix-jsonresponse 
fix typo in content type for JSONResponse
 2014-11-05 14:03:12 +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
Bernhard Posselt
91a23bfa9c fix typo in content type 2014-11-05 12:04:56 +01:00
Jenkins for ownCloud
c8f55e7f87 [tx-robot] updated from transifex 2014-11-05 01:54:36 -05:00
Morris Jobke
74d375d8ea migrate jQuery to bower 2014-11-04 14:28:29 +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
Jenkins for ownCloud
287faf9923 [tx-robot] updated from transifex 2014-11-04 01:55:05 -05: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
1a405e56f5 replace moment.js with bower version 
* fix JS unit tests
 2014-11-03 20:54:50 +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
e73ccbd4ca Migrate "setsecurity.php" to the AppFramework 
Add switch to enforce SSL for subdomains

Add unit tests

Add test for boolean values

Camel-case

Fix ugly JS
 2014-11-03 16:53:03 +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
Thomas Müller
a4f0483f56 Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5 2014-11-03 13:52:47 +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
Lukas Reschke
d30fd23544 Clear session before setup 
Fixes https://github.com/owncloud/core/issues/11861
 2014-10-31 11:21:00 +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
Jenkins for ownCloud
e00f25e5b0 [tx-robot] updated from transifex 2014-10-31 01:55:39 -04: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
Jenkins for ownCloud
ea55848fa1 [tx-robot] updated from transifex 2014-10-30 01:55:14 -04: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
105940b9dc Merge pull request #11638 from owncloud/oc8-translations 
[OC8] Load javascript translations using standard web technologies
 2014-10-29 13:09:02 +01:00
Thomas Müller
c353cbe633 Merge pull request #11689 from owncloud/doctrine-2.5 
Update doctrine/dbal to 2.5
 2014-10-29 11:34:23 +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
9f7c571e40 update all translation files to js and json 2014-10-29 10:13:50 +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
Vincent Petry
d71cd680dd Include core translations 
Moved search result type translations to search.js

Load JS translations earlier

Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.

This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
 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
Jenkins for ownCloud
cb944814d9 [tx-robot] updated from transifex 2014-10-29 01:54:45 -04:00
Thomas Müller
46c2909c78 Update doctrine/dbal to 2.5 2014-10-28 15:39:37 +01:00
Robin Appelman
2974d4d380 Reset the users setup after clearing mounts 2014-10-28 15:13:29 +01:00
Thomas Müller
c93ddf77b9 Use composer autoloader to load Patchwork 2014-10-28 13:42:28 +01:00
Adam Williamson
0e3f2055d2 use Composer autoloader not OC for non-Composer 3rdparty (#9643) 
Composer's autoloader is rather better than the OwnCloud autoloader's
handling of non-OC classes. Plus we can rely on upstream Composer to
maintain it and not worry about it ourselves.

With this change, we drop the bits of OwnCloud's autoloader that
handled non-OC classes, and register the classes that were being
handled by that code with Composer's autoloader instead. As these
dependencies are converted to actually being managed by Composer,
the explicit registrations can be dropped as they won't be needed
any more.

Since OwnCloud's autoloader isn't going to handle non-OC classes any
more, we no longer need to test to make sure it does it right.

drop unneeded registerPrefix() and registerClass() from autoloader

Now we're not handling anything but OC's own classes, these are
unnecessary.

error out if composer autoloader is not found (thanks bantu)

We're never going to be able to work without the autoloader, if it's not
there we should just throw our hands up and surrender.
 2014-10-28 11:32:20 +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
Jenkins for ownCloud
23873d80fe [tx-robot] updated from transifex 2014-10-28 01:55:38 -04: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
Morris Jobke
290e9cd5b2 Merge pull request #11787 from owncloud/fix-php-docs 
Fix PHPDoc
 2014-10-27 14:46:41 +01:00
Lukas Reschke
f7c393fa9f Fix PHPDoc 
Stop my IDE and Scrutinizer from complaining.
 2014-10-27 13:38:40 +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
Jenkins for ownCloud
5d391910c5 [tx-robot] updated from transifex 2014-10-27 01:54:28 -04:00
Jenkins for ownCloud
214af9523a [tx-robot] updated from transifex 2014-10-26 01:54:32 -04: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
Jenkins for ownCloud
3652f02e48 [tx-robot] updated from transifex 2014-10-25 01:54:35 -04: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
Jenkins for ownCloud
9babcfb9e2 [tx-robot] updated from transifex 2014-10-24 01:55:11 -04: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
Jenkins for ownCloud
e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04: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
97a6f5c46b Extend \OCP\IDBConnection to cover more use cases 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
Jenkins for ownCloud
916e710ece [tx-robot] updated from transifex 2014-10-22 01:55:22 -04:00
Thomas Müller
2814a294c8 call initPaths() right before the server is instantiated 2014-10-21 14:10:57 +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
Jenkins for ownCloud
8485743e33 [tx-robot] updated from transifex 2014-10-21 01:55:45 -04: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
d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +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
Jenkins for ownCloud
87da62072b [tx-robot] updated from transifex 2014-10-20 01:54:34 -04:00
Jenkins for ownCloud
68dd1edbfe [tx-robot] updated from transifex 2014-10-18 01:55:30 -04: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
Jenkins for ownCloud
92f2914335 [tx-robot] updated from transifex 2014-10-17 01:58:25 -04: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
Lukas Reschke
5f3ddf5c80 Merge pull request #11383 from ockham/share-tags2 
Share tags
 2014-10-16 15:36:04 +02:00
Thomas Müller
a04159090f include the apps' versions hash to invalidate the cached assets 2014-10-16 13:29:51 +02:00
Lukas Reschke
4deb57bfae Remove insane comment 2014-10-16 12:42:00 +02:00
Lukas Reschke
9cfbf7ed1c Fix SVG icons 
FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.

Conflicts:
	lib/private/preview.php
 2014-10-16 12:35:51 +02:00
blizzz
756f64d728 Merge pull request #11595 from owncloud/make_get_display_name_more_robust 
strip whitespace from the beginning and end of the display name
 2014-10-16 11:33:12 +02:00
Jörn Friedrich Dreyer
0254a3c406 make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space 2014-10-16 10:15:43 +02:00
Jenkins for ownCloud
c8d8578d1a [tx-robot] updated from transifex 2014-10-16 01:56:30 -04:00
Lukas Reschke
63e0599218 Merge pull request #11565 from owncloud/fix-behaviourOnOSX 
Add darwin to if block
 2014-10-15 21:12:50 +02:00
Lukas Reschke
f82b996f57 Merge pull request #11528 from owncloud/use-raw-url 
Use `rawurlencode` since this seems to be expected by cURL
 2014-10-15 19:58:27 +02:00
Jörn Friedrich Dreyer
c27fd94ec8 in cli mode return true for isHtaccessWorking 2014-10-15 16:59:28 +02:00
Thomas Müller
b091394a90 introduce new app page layout 
filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label
 2014-10-15 15:21:40 +02:00
Bjoern Schiessle
239bff5766 strip whitespace from the beginning and end of the display name to avoid empty display names 2014-10-15 14:54:35 +02:00
Vincent Petry
6824a5ce7f Merge pull request #11538 from owncloud/webdav-creatable-info 
Use the cached fileinfo to get creatable permissions
 2014-10-15 14:39:07 +02:00
Lukas Reschke
6ccda2ae98 Add app version to JS and CSS 
This leads to the regeneration of the hash in case a single application is updated.

Fixes https://github.com/owncloud/core/issues/11374
 2014-10-15 14:00:20 +02:00
Vincent Petry
6fa03870e9 Merge pull request #11541 from owncloud/usersession-activeuser-setsession 
Unset the cached active user when using a different session object
 2014-10-15 13:31:05 +02:00
Vincent Petry
4650101674 Merge pull request #11548 from owncloud/extstorage-ocfields 
Allow specifying protocol in ext storage OC config
 2014-10-15 13:27:23 +02:00
Lukas Reschke
1b3feb710d Use rawurlencode since this seems to be expected by cURL 
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405
 2014-10-14 13:16:23 +02:00
Lukas Reschke
bf84cd4bcc Add darwin to if block 
Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
 2014-10-14 12:58:00 +02:00
Joas Schilling
0407bc0978 Set overwritemailurl* configs on setup 
Correctly use overwritemailurl value when generating absolute urls in CLI

Fix #11500

Rename the config to *cli

Add overwrite.cli.url to the sample config

Revert separator fix, fixes unit test
 2014-10-14 05:07:09 +02:00
goodkiller
9f0b99cd17 Update group.php 
Here is fox for my LDAP users OW 7.0.2
 2014-10-14 01:18:45 +03:00
Bernhard Reiter
b416f7d8ac PHPDoc fixes as suggested by @MorrisJobke. 2014-10-14 00:06:33 +02:00
Bernhard Reiter
1770179648 Add getTag() function for accessing of a single tag. 2014-10-14 00:06:33 +02:00
Bernhard Reiter
bc265e8b52 Make loading of tags from DB more explicit. 2014-10-14 00:06:07 +02:00
Bernhard Reiter
226d7233e1 In Tags::rename($from, $to), check if there already is a tag named $to. 2014-10-14 00:06:07 +02:00
Bernhard Reiter
7e9baafc53 Add option to include tags for shared items. 2014-10-14 00:06:07 +02:00