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

226 commits

Author SHA1 Message Date
Robin Appelman
7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Robin Appelman
7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Felix Moeller
e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Robin Appelman
7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +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
Robin Appelman
77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Bart Visscher
04824162d9 core.js and core.css don't need to be absolute 2012-10-17 10:52:16 +02:00
Robin Appelman
fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Björn Schießle
4d451f649d fixed offset calculation (bug #1961) 2012-10-11 12:42:57 +02:00
Robin Appelman
aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +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
Robin Appelman
2a73678fef use file extension for determining mimetypes on default 
should be more reliable for files that "look like" other types based on their magic numbers such as odf and docx files
also a lot faster then the old way
 2012-07-22 01:53:20 +02:00
Robin Appelman
48306a3c4f fix unused variables 2012-07-20 17:58:05 +02:00
Arthur Schiwon
52822652bc provide multibyte aware helper functions mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling with UTF 8 2012-07-02 20:31:19 +02:00
Florian Hülsmann
4ed55315e7 fixed linkTo() 2012-06-30 16:53:41 +02:00
Bart Visscher
19bb4e83c9 Remove redundant code from OC_Helper::linkTo 2012-06-28 22:11:04 +02:00
Robin Appelman
12f7cb8767 fix running tests from cli 2012-06-27 13:21:45 +02:00
Brice Maron
e5c56b2433 Merge branch 'master' into multi_app_dir 
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
 2012-06-21 17:15:35 +00:00
Thomas Mueller
c1df0539a0 fixes oc-668 2012-06-18 23:33:02 +02:00
Brice Maron
4753cc3ebd Merge branch 'master' into multi_app_dir 
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
 2012-06-14 21:16:59 +00:00
Thomas Tanghus
8fd9cbcc54 White-space fix. 2012-06-14 13:23:12 +02:00
Thomas Tanghus
a34db3fbe0 Don't add slash if it's there already. 2012-06-14 13:23:12 +02:00
Brice Maron
6a812644e4 Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
Brice Maron
cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Brice Maron
b6c5ca126b First almost working version 2012-06-06 20:23:17 +00:00
Frank Karlitschek
e3031ae28b more reliable host detection for reverse proxy servers 2012-06-05 12:52:23 +02:00
Bart Visscher
4a5973662c Merge branch 'unstable' 
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
 2012-06-04 23:02:05 +02:00
Frank Karlitschek
24d14783d7 added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer 2012-06-01 10:38:44 +02:00
Frank Karlitschek
22a04d8e93 don´t hardcode /tmp 2012-05-30 14:14:32 +02:00
Frank Karlitschek
a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Bart Visscher
f71fec8cdc Combine and minimize core and default app css files 2012-05-16 18:53:46 +02:00
Georg Ehrke
52717d2a1b remove comments 2012-05-08 17:07:50 +02:00
Bart Visscher
4dbc2093c6 Create a function for linking to remote.php 2012-05-07 21:47:14 +02:00
Georg Ehrke
5b7cefb1e5 make ampache work with remote.php 2012-05-07 20:26:09 +02:00
Georg Ehrke
d032345191 fix validation of getfile parameter - i hate this bloody merge conflicts 2012-05-07 13:23:55 +02:00
Jernej Virag
e459309511 Fixed escaping of filename when determining MIME type 2012-04-25 10:33:52 +02:00
Frank Karlitschek
93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Thomas Mueller
07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Georg Ehrke
2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Georg Ehrke
3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Georg Ehrke
0b06eff3a0 another fix for linkto function 2012-04-24 20:17:00 +02:00
Georg Ehrke
29b9e27078 fix linkto function in OC_Helper 2012-04-24 20:14:42 +02:00
Georg Ehrke
6d92ebca45 use native functions of php to parse the string into the Var 2012-04-23 17:09:28 +02:00
Georg Ehrke
9226cb7a6a rename var file to getfile to prevent fails in files app 2012-04-23 16:36:24 +02:00
Georg Ehrke
aaedb23f05 fix bug in lib/helper.php and fix file upload 2012-04-23 16:28:37 +02:00
Georg Ehrke
711aa229b8 Merge branch 'master' into movable_apps 2012-04-20 22:41:39 +02:00
Robin Appelman
bdb3962b8d add function to get mimetype from string 2012-04-18 20:54:28 +02:00
Georg Ehrke
dfc92675e0 make menu work with movable apps 2012-04-18 17:25:44 +02:00
Georg Ehrke
eb29c577c2 Merge branch 'master' into movable_apps 2012-04-18 12:20:09 +02:00
Georg Ehrke
3e0e6e35f4 open app thru index.php 2012-04-18 08:20:51 +02:00
Robin Appelman
464c751f30 fix creating unique filenames 2012-04-16 10:58:40 +02:00
Thomas Müller
a0d917fe98 fixing oc-375 - a number is appended tp the filename 2012-04-15 17:00:49 +02:00
Jan-Christoph Borchardt
7ddd043427 renamed extention to extension, also now only showing lowercase 2012-04-15 13:34:30 +02:00
Arthur Schiwon
b9bdad5165 make sure temporary files are being removed, fixes oc-450 2012-04-13 23:02:42 +02:00
Daniele E. Domenichelli
156bdae2fe Use OC_Helper::serverHost() in OC_Helper::linkToAbsolute() 2012-04-12 17:51:17 +02:00
Daniele E. Domenichelli
7b5395675d Add method OC_Helper::serverHost() 
This method returns the server host, even if the website uses one or
more reverse proxies.
 2012-04-12 17:51:17 +02:00
Robin Appelman
d8e9db207f add tempory folder utility to OC_Helper 2012-03-28 23:47:44 +02:00
Frank Karlitschek
7cad6ccce0 don´t show ugly error message 2012-03-23 16:48:16 +01:00
Georg Ehrke
fa104fee17 fix mimetype detection 2012-03-19 12:42:33 +01:00
Robin Appelman
b23b5aae7f remove debug output 2012-02-29 23:17:49 +01:00
Frank Karlitschek
5e9d268c21 never try to load an non existing template,css,img. 
do propper checking, error reporting and motivate the developerto fix it ;-)
 2012-02-28 16:14:12 +01:00
Robin Appelman
a76ff563d6 fix temporary file creation 2012-02-28 11:32:45 +01:00
Robin Appelman
77b51f03e3 add temporary file managment 2012-02-28 11:16:19 +01:00
Frank Karlitschek
5943af17e7 spaces -> tabs 
Thanks to Jakob for reminding me
 2012-02-27 18:01:43 +01:00
Robin Appelman
cef230c141 extend filestorage common and provide test implementation 2012-02-27 12:04:42 +01:00
Frank Karlitschek
ab96fa67c8 first part of the abstraction work of the apps folder. more to come 2012-02-26 18:26:41 +01:00
Robin Appelman
d4d09b06f8 merge master into encryption 2012-02-26 14:21:06 +01:00
Robin Appelman
fe0832746b intval() of a number seems unnecessary 
and it could cause 32bit integer overflow issues
 2012-02-26 03:31:04 +01:00
Robin Appelman
d9c7e4c333 proper mimetypes for encrypted files 2012-02-21 20:48:48 +01:00
Bart Visscher
987845c312 Move the redirect_url from linkTo function to the checkLoggedIn function 2012-02-21 20:09:24 +01:00
Bart Visscher
f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Frank Karlitschek
d53ed4b40b make it possible to override every image and logo with a new version from within a theme. I think we have a very cool theming here. *self-praise* 2012-02-14 16:32:38 +01:00
Robin Appelman
500407dbe9 change https detection a bit, hopefully fixing an edge case 2012-01-27 00:37:11 +01:00
Robin Appelman
5e711f37ca make filesize parsing case insensitive 2011-12-11 23:34:27 +01:00
Robin Appelman
d7fa2a0f77 mimetype icon improvements 2011-10-13 16:33:39 +02:00
Robin Appelman
1f562a2e83 fixes for the mimetype icons 2011-10-07 18:09:49 +02:00
Marvin Thomas Rabe
33f24a42b8 redirect url fixed 2011-10-04 19:27:57 +02:00
Marvin Thomas Rabe
ccfa2dd24c Error when only oc_remember_login cookie set fixed. 
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
 2011-09-30 18:25:34 +02:00
Bart Visscher
82c7598861 Remove global vars and use the OC static version. 
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
 2011-09-18 19:37:54 +02:00
Bart Visscher
760b47a62f Use OC_Helper::linkTo also for absolute urls. 
One central place to check for https.
 2011-09-09 22:19:15 +02:00
Bart Visscher
3130234640 Remove execute permissions from source files 2011-09-03 22:15:23 +02:00
Jan-Christoph Borchardt
99790d6805 lots of image changes, use svg EVERYWHERE POSSIBLE 2011-08-11 19:00:32 +02:00
Frank Karlitschek
1dc3cb67fa more improved error reporting 2011-08-06 23:31:38 +02:00
Jakob Sack
bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack
2ff8d7a8bc One class per file! 2011-07-29 21:03:53 +02:00
Robin Appelman
6d0c8ea7e4 use proper file icons for image and audio files 2011-07-29 01:37:08 +02:00
Robin Appelman
0d408fe6f5 make use of the command line tools id3info and mp3info for scanning music if they are available 2011-07-28 20:10:58 +02:00
Aamir Khan
2098cbd822 redirect_url to be respected in linkTo function 2011-06-25 01:14:28 +05:30
Jakob Sack
eb1ce7819a Fix linkTo() 2011-06-20 21:01:34 +02:00
Jakob Sack
91c37bbb76 moved core stuff to /core 2011-06-20 20:29:30 +02:00
Robin Appelman
7f987b84a5 fix OC_HELPER::linkTo again 2011-06-02 20:21:02 +02:00
Robin Appelman
2b45a28bd4 fix OC_HELPER::linkto() when the link is not a valid file. 
(e.g. a php script with ?foo=bar appended)
 2011-06-02 02:58:42 +02:00
Robin Appelman
f4e4617be7 App installer backend. 
Not yet attached to the gui
 2011-05-28 17:33:25 +02:00
Alessandro Cosentino
1ec304227e changed the path in imagePath again 2011-05-17 23:29:09 -04:00
François Kubler
13ddf8100f New installer. 
* Forms have been revamped (CSS + javascript),
* Process has been improved : errors are displayed on the form page,
* Some changes in the index.php page so that everything related to installation is in lib/setup.php
* Also added a small function in OC_HELPER class to set input values.

All these should improve the installation process in terms of ergonomics.
Well, I do hope so.
 2011-05-17 22:34:31 +02:00
Jakob Sack
e314a83a7b Fixing the image link for apps 2011-05-17 17:19:21 +02:00
Robin Appelman
8d52fdb7fa fix chmodr 2011-04-24 15:23:18 +02:00
Marco Michelino
d1b4f74bc2 Avoid // in URIs 2011-04-19 12:32:37 +02:00
Jan-Christoph Borchardt
660e2c8102 renamed application-octet-stream.png to file.png 2011-04-18 22:16:32 +02:00
Arthur Schiwon
a14f8243e8 get max upload file size for upload form from php settings 2011-04-17 12:03:23 +02:00
Robin Appelman
101877351b use the correct variable name 2011-04-16 19:46:47 +02:00
Arthur Schiwon
627dc95d19 don't manifold slashes in case empty $app is forwarded to linkTo() 2011-04-16 12:43:37 +02:00
Robin Appelman
69289bf943 move chmodr to OC_HELPER 2011-04-16 10:23:15 +02:00
Jakob Sack
f36f453dd2 apps are now stored in /apps 2011-04-16 09:46:58 +02:00
Jakob Sack
a3070405d9 OC_HELPER, OC_LOG and OC_TEMPLATE prepared for refactoring 2011-03-13 17:25:34 +01:00
Jakob Sack
e5ea0a3daa Added helper for filesize, fixed wrong name for mimetypeIcon() 2011-03-02 22:28:32 +01:00
Jakob Sack
dfa6b749ba Introducing OC_HELPER for small helper functions; making setup of filesystem optional 2011-03-02 22:18:22 +01:00