mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge git://gitorious.org/owncloud/owncloud into oc_image

This commit is contained in:
Thomas Tanghus 2012-01-02 19:38:10 +01:00
parent 6a7fbf9d13 cc55f00481
commit 2a184631d1
4 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/js/setup.js
View File

@ -7,7 +7,9 @@ $(document).ready(function() {
$('#dbhost').hide();
$('#dbhostlabel').hide();
}
$('#adminlogin').change(function(){
$('#adminlogin').val($.trim($('#adminlogin').val()));
});
$('#sqlite').click(function() {
$('#use_other_db').slideUp(250);
$('#dbhost').hide(250);

39
lib/filesystem.php
View File

@ -199,11 +199,26 @@ class OC_Filesystem{
*/
static public function getLocalFile($path){
$parent=substr($path,0,strrpos($path,'/'));
if(self::is_readable($parent) and $storage=self::getStorage($path)){
if(self::isValidPath($parent) and $storage=self::getStorage($path)){
return $storage->getLocalFile(self::getInternalPath($path));
}
}
/**
* check if the requested path is valid
* @param string path
* @return bool
*/
static public function isValidPath($path){
if(substr($path,0,1)!=='/'){
$path='/'.$path;
}
if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
return false;
}
return true;
}
static public function mkdir($path){
return self::basicOperation('mkdir',$path,array('create','write'));
}
@ -238,24 +253,10 @@ class OC_Filesystem{
return self::basicOperation('readfile',$path,array('read'));
}
static public function is_readable($path){
if(substr($path,0,1)!=='/'){
$path='/'.$path;
}
if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
return false;
}
$storage=self::getStorage($path);
return $storage->is_readable(self::getInternalPath($path));
return self::basicOperation('is_readable',$path);
}
static public function is_writeable($path){
if(substr($path,0,1)!=='/'){
$path='/'.$path;
}
if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
return false;
}
$storage=self::getStorage($path);
return $storage->is_writeable(self::getInternalPath($path));
return self::basicOperation('is_writeable',$path);
}
static public function file_exists($path){
if($path=='/'){
@ -358,7 +359,7 @@ class OC_Filesystem{
return self::basicOperation('fopen',$path,$hooks,$mode);
}
static public function toTmpFile($path){
if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::is_readable($path) and $storage=self::getStorage($path)){
if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
return $storage->toTmpFile(self::getInternalPath($path));
}
@ -447,7 +448,7 @@ class OC_Filesystem{
* @return mixed
*/
private static function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::is_readable($path) and $storage=self::getStorage($path)){
if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::isValidPath($path) and $storage=self::getStorage($path)){
$interalPath=self::getInternalPath($path);
$run=true;
foreach($hooks as $hook){

2
lib/user.php
View File

@ -120,7 +120,7 @@ class OC_User {
return false;
}
// No empty username
if( !$uid ){
if(trim($uid) == ''){
return false;
}
// Check if user already exists

2
settings/js/users.js
View File

@ -126,7 +126,7 @@ $(document).ready(function(){
$('#newuser').submit(function(event){
event.preventDefault();
var username=$('#newusername').val();
if(username == '') {
if($.trim(username) == '') {
alert('Please provide a username!');
return false;
}