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

147 commits

Author SHA1 Message Date
TheSFReader
2aead5727e Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-01-25 17:15:02 +01:00
TheSFReader
9f5847b739 Simplify the code and remove a first unnecessary (and non conform) '&' character when there are pending arguments 2013-01-25 17:02:44 +01:00
Lukas Reschke
42b924da0e Also replace the backslash with a minus 
For Windows systems
 2013-01-19 19:47:26 +01:00
Thomas Müller
31cc9aa80d Merge pull request #986 from owncloud/fixing-784-master 
the maximum upload size is now part of the response of the upload and de...
 2013-01-18 14:06:00 -08:00
Thomas Mueller
5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Thomas Mueller
44e5c052b3 handling proper display of files/folders with negative size 
refs #1162
 2013-01-14 23:39:31 +01:00
Lukas Reschke
99adfbdb86 Check for string position instead of string existence 
otherwise /foo/bar would be detected as a subfolder of /bar

THX @icewind1991
 2013-01-14 16:51:35 +01:00
Lukas Reschke
b7db967dc5 Commentblocks should begin with two * 2013-01-13 14:54:18 +01:00
Lukas Reschke
c27833b143 Add @brief to description 2013-01-13 14:50:31 +01:00
Lukas Reschke
e151210a62 Simplify the isSubDirectory() function 
isSubDirectory() checks if a specified $sub is a subdirectory of the
$parent, this is needed to prevent file inclusions.

Actually, the current code is more kind of a "hack" which I always
struggle over if browsing through source. So this should be a much
better implementation.

The implementation is really straightforward:
- [realpath()](http://php.net/manual/function.realpath.php) expands all
symbolic links and resolves references to '/./', '/../' and extra '/'
characters in the input path and return the canonicalized absolute
pathname.
- [strpos()](php.net/manual/function.strpos.php) returns FALSE if the
substring wasn't found.

Since this is an absolutely critical piece of code, I'd like to ensure
that this is absolutely safe!
 2013-01-13 14:33:19 +01:00
Thomas Mueller
bae1755184 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
	lib/helper.php
 2013-01-06 22:40:35 +01:00
Thomas Mueller
dfc8d757b5 OC_Helper::is_function_enabled() added to find out if a function is available 
And some documentation adjusted on the way
 2013-01-04 23:00:51 +01:00
Thomas Müller
39d874cd90 the maximum upload size is now part of the response of the upload and delete operation. 
the maximum upload size is updated within the browser once an upload or delete operation has been finished
 2012-12-20 17:16:53 +01:00
Bart Visscher
8256650da8 Fix "No space found after comma in function call" 2012-12-15 00:43:46 +01:00
Jörn Friedrich Dreyer
d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Frank Karlitschek
5b2aeebaf0 Merge pull request #280 from butonic/feature_bmp_support 
add bmp support
 2012-11-19 00:53:46 -08:00
Valerio Ponte
de7e419610 Fixed style according to owncloud styleguide 2012-11-14 20:10:20 +01:00
Valerio Ponte
8e190a5a97 Moved X-Sendfile headers into OC_Files::get 
now should work with temp files too
 2012-11-14 20:10:20 +01:00
Jörn Friedrich Dreyer
0ce5e9257e add php-doc for ellipsis 2012-11-12 14:04:23 +01:00
Jörn Friedrich Dreyer
28671d92c0 move code to better places 2012-11-12 13:56:29 +01:00
Tom Needham
0833be9d4e Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr 
Check files when copying recursivley

Remove obsolete method

Dont count '.' and '..' as directories when importing.
 2012-11-08 11:37:27 +00:00
Felix Moeller
f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Felix Moeller
dfc8228fb4 NoSpaceAfterComma 2012-10-28 23:58:08 +01:00
Bart Visscher
0120f3fd62 Merge branch 'routing' 
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
 2012-10-27 11:58:02 +02:00
Victor Dubiniuk
d428d72dab Fix mimetype detection with the 'file' utility 2012-10-26 21:02:04 +03:00
Felix Moeller
e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Felix Moeller
2d61f03452 More Checkstyle cleanup 
This is for all LowerCaseConstant warnings
 2012-10-23 08:01:09 +02:00
Felix Moeller
03581ef463 Correct a first issue Checkstyle is complaining about ... 
This is BracketsNotRequired
 2012-10-22 21:40:33 +02:00
Bart Visscher
6081bfa2bc Merge branch 'master' into routing 
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
 2012-10-17 16:38:11 +02:00
Bart Visscher
04824162d9 core.js and core.css don't need to be absolute 2012-10-17 10:52:16 +02:00
Björn Schießle
4d451f649d fixed offset calculation (bug #1961) 2012-10-11 12:42:57 +02:00
Robin Appelman
258782584e fix mimetype detection using the 'file' command in some edge cases 2012-09-30 03:58:58 +02:00
Bart Visscher
22d22d19c0 Do urlencoding in linkTo functions 2012-09-28 22:27:52 +02:00
Bart Visscher
bf1057143c Merge branch 'master' into routing 
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
 2012-09-28 15:38:49 +02:00
Robin Appelman
4131b205d4 fix some more phpdoc 2012-09-23 02:40:03 +02:00
Björn Schießle
2570ea7114 don't interpret strpos '0' as 'false' in while loop 2012-09-18 16:14:04 +02:00
Björn Schießle
1207ae1f99 add leading '?' to parameter list (fixes bug #1732) 2012-09-17 17:02:17 +02:00
Bart Visscher
3efe1d3b24 Add linkToRoute functionality 2012-09-12 18:00:33 +02:00
Bart Visscher
5eba579827 Merge branch 'master' into routing 
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
 2012-09-07 15:51:44 +02:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher
1a46192433 Add args parameter to linkTo(Absolute) function, to append the args automaticly 2012-09-03 21:51:32 +02:00
Bart Visscher
b483f2aab8 Merge branch 'master' into routing 
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
 2012-08-30 21:49:28 +02:00
Michael Gapczynski
0a9d1ed3a6 Initial previewer for public links 2012-08-27 20:37:38 -04:00
Bart Visscher
16dacba490 Routing: And start using them from php 2012-08-12 16:53:00 +02:00
Bart Visscher
99ce7ba1df Move serverHost and serverProtocol functions to OC_Request 2012-08-07 20:43:00 +02:00
Bart Visscher
c4f1a1de5b Added function to make url absolute 2012-08-07 20:43:00 +02:00
Arthur Schiwon
6b320a2604 provide recursiveArraySearch as Helper function and make available through API 2012-07-25 12:56:08 +02:00
Robin Appelman
856d9c0b54 some indention fixes 2012-07-24 00:39:59 +02:00