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