upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-05 00:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

use native functions of php to parse the string into the Var

Browse source
This commit is contained in:
Georg Ehrke 2012-04-23 17:09:28 +02:00
parent 9226cb7a6a
commit 6d92ebca45
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/js/js.js
View file

@ -53,7 +53,7 @@ OC={
var isCore=OC.coreApps.indexOf(app)!=-1;
var link=OC.webroot;
if(file.substring(file.length-3) == 'php' && !isCore){
link+='/?app=' + app + '&getfile=' + type + '/' + file;
link+='/?app=' + app + '&getfile=' + encodeURI(type + '/' + file);
}else{
link+='/';
app+='/';

13
lib/base.php
View file

@ -284,7 +284,7 @@ class OC{
if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE)){
require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE);
}else{
header('404 Not found');
echo "WTF";
}
}
@ -401,12 +401,11 @@ class OC{
self::$REQUESTEDAPP = (isset($_GET['app'])?strip_tags($_GET['app']):'files');
self::$REQUESTEDFILE = $_GET['getfile'];
if(substr_count(self::$REQUESTEDFILE, '?') != 0){
$pos_questionmark = strpos(self::$REQUESTEDFILE, '?');
$pos_equal = strpos(self::$REQUESTEDFILE, '=');
$pos_and = strpos(self::$REQUESTEDFILE, '?');
$_GET[substr(self::$REQUESTEDFILE, $pos_questionmark + 1, $pos_equal - $pos_questionmark - 1)] = substr(self::$REQUESTEDFILE, $pos_equal + 1, $pos_and);
self::$REQUESTEDFILE = substr(self::$REQUESTEDFILE, 0, $pos_questionmark);
$_GET['getfile'] = OC::$REQUESTEDFILE;
$file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?'));
$param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1);
parse_str($param, $_GET);
self::$REQUESTEDFILE = $file;
$_GET['getfile'] = $file;
}
self::$REQUESTEDFILE = (isset($_GET['getfile'])?(OC_Helper::issubdirectory(OC::$APPSROOT . '/' . self::$REQUESTEDAPP . '/' . self::$REQUESTEDFILE, OC::$APPSROOT . '/' . self::$REQUESTEDAPP)?self::$REQUESTEDFILE:null):null);
}

2
lib/helper.php
View file

@ -45,7 +45,7 @@ class OC_Helper {
$app = substr($app, 0, strlen($app) - 1);
}
$urlLinkTo = OC::$APPSWEBROOT . '/?app=' . $app;
$urlLinkTo .= ($file!='index.php')?'&getfile=' . $file:'';
$urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):'';
}
else{
$urlLinkTo = OC::$WEBROOT . '/' . $app . $file;