diff options
| -rw-r--r-- | lib/base.php | 8 | ||||
| -rw-r--r-- | lib/private/mimetypes.list.php | 1 | ||||
| -rw-r--r-- | settings/templates/admin.php | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 5871ecba839..dcaf3725fcb 100644 --- a/lib/base.php +++ b/lib/base.php @@ -785,14 +785,18 @@ class OC { * Load a PHP file belonging to the specified application * @param array $param The application and file to load * @return bool Whether the file has been found (will return 404 and false if not) + * @deprecated This function will be removed in ownCloud 8 - use proper routing instead + * @param $param + * @return bool Whether the file has been found (will return 404 and false if not) */ public static function loadAppScriptFile($param) { OC_App::loadApps(); $app = $param['app']; $file = $param['file']; $app_path = OC_App::getAppPath($app); - if (OC_App::isEnabled($app) && $app_path !== false) { - $file = $app_path . '/' . $file; + $file = $app_path . '/' . $file; + + if (OC_App::isEnabled($app) && $app_path !== false && OC_Helper::issubdirectory($file, $app_path)) { unset($app, $app_path); if (file_exists($file)) { require_once $file; diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index ba1b9ca10b1..d27e9e6348b 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -74,6 +74,7 @@ return array( 'jpg' => array('image/jpeg', null), 'js' => array('application/javascript', 'text/plain'), 'json' => array('application/json', 'text/plain'), + 'key' => array('application/x-iwork-keynote-sffkey', null), 'keynote' => array('application/x-iwork-keynote-sffkey', null), 'kra' => array('application/x-krita', null), 'm2t' => array('video/mp2t', null), diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 5a00320313b..e1348916b69 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -304,8 +304,9 @@ if (!$_['internetconnectionworking']) { <option value="<?php p($group['gid'])?>" <?php if($group['excluded']) { p('selected="selected"'); }?>><?php p($group['gid']);?></option> <?php endforeach;?> </select> - </div> + <br /> <em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em> + </div> </td> </tr> </table> |