sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simple fixes

remotes/origin/stable
Thibaut GRIDEL 2010-05-02 11:24:46 +07:00
parent 60d2f8de4e
commit 19ab1292fb
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/lib_base.php
Unescape Escape View File

@ -51,7 +51,7 @@ $CONFIG_DBNAME='owncloud';
$CONFIG_DBTYPE='sqlite'; $CONFIG_DBTYPE='sqlite';
// include the generated configfile // include the generated configfile
@oc_include_once('config.php'); @include_once($SERVERROOT.'/config/config.php');
// redirect to https site if configured // redirect to https site if configured
if(isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL){ if(isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL){
@ -477,8 +477,6 @@ function oc_require($file){
require($SERVERROOT.'/'.$file); require($SERVERROOT.'/'.$file);
}elseif(is_file($SERVERROOT.'/inc/'.$file)){ }elseif(is_file($SERVERROOT.'/inc/'.$file)){
require($SERVERROOT.'/inc/'.$file); require($SERVERROOT.'/inc/'.$file);
}elseif(is_file($SERVERROOT.'/config/'.$file)){
require($SERVERROOT.'/config/'.$file);
} }
} }
@ -501,8 +499,6 @@ function oc_require_once($file){
require_once($SERVERROOT.'/'.$file); require_once($SERVERROOT.'/'.$file);
}elseif(is_file($SERVERROOT.'/inc/'.$file)){ }elseif(is_file($SERVERROOT.'/inc/'.$file)){
require_once($SERVERROOT.'/inc/'.$file); require_once($SERVERROOT.'/inc/'.$file);
}elseif(is_file($SERVERROOT.'/config/'.$file)){
require_once($SERVERROOT.'/config/'.$file);
} }
} }
@ -525,8 +521,6 @@ function oc_include($file){
include($SERVERROOT.'/'.$file); include($SERVERROOT.'/'.$file);
}elseif(is_file($SERVERROOT.'/inc/'.$file)){ }elseif(is_file($SERVERROOT.'/inc/'.$file)){
include($SERVERROOT.'/inc/'.$file); include($SERVERROOT.'/inc/'.$file);
}elseif(is_file($SERVERROOT.'/config/'.$file)){
include($SERVERROOT.'/config/'.$file);
} }
} }
@ -549,8 +543,6 @@ function oc_include_once($file){
include_once($SERVERROOT.'/'.$file); include_once($SERVERROOT.'/'.$file);
}elseif(is_file($SERVERROOT.'/inc/'.$file)){ }elseif(is_file($SERVERROOT.'/inc/'.$file)){
include_once($SERVERROOT.'/inc/'.$file); include_once($SERVERROOT.'/inc/'.$file);
}elseif(is_file($SERVERROOT.'/config/'.$file)){
include_once($SERVERROOT.'/config/'.$file);
} }
} }

3
index.php
Unescape Escape View File

@ -28,9 +28,6 @@ if(isset($_GET['dir'])) $dir=$_GET['dir']; else $dir='';
if(isset($_GET['file'])) { if(isset($_GET['file'])) {
OC_FILES::get($dir,$_GET['file']); OC_FILES::get($dir,$_GET['file']);
OC_FILES::get($dir,$_GET['file']);
OC_FILES::get($dir,$_GET['file']);
echo('heya');
}else{ }else{
OC_UTIL::addscript('js/ajax.js'); OC_UTIL::addscript('js/ajax.js');