Merge branch 'master' of git://gitorious.org/owncloud/owncloud
This commit is contained in:
Robin Appelman
commit
962e548495
|
|
@ -22,11 +22,9 @@
|
|||
*/
|
||||
require_once('../inc/lib_base.php');
|
||||
|
||||
// sleep(5); //immitate slow internet.
|
||||
|
||||
$fileName=$_FILES['file']['name'];
|
||||
$source=$_FILES['file']['tmp_name'];
|
||||
$target=$_GET['dir'].'/'.$fileName;
|
||||
$target=stripslashes($_GET['dir']).'/'.$fileName;
|
||||
if(isset($_SESSION['username']) and $_SESSION['username'] and strpos($_GET['dir'],'..')===false){
|
||||
if(OC_FILESYSTEM::fromTmpFile($source,$target)){
|
||||
echo 'true';
|
||||
|
|
|
|||
|
|
@ -926,7 +926,7 @@ class MDB2_Result_sqlite extends MDB2_Result_Common
|
|||
if ($object_class == 'stdClass') {
|
||||
$row = (object) $row;
|
||||
} else {
|
||||
$row = &new $object_class($row);
|
||||
$row = new $object_class($row);
|
||||
}
|
||||
}
|
||||
++$this->rownum;
|
||||
|
|
|
|||
|
|
@ -112,11 +112,14 @@ class OC_USER_DATABASE extends OC_USER_BACKEND {
|
|||
*
|
||||
*/
|
||||
public static function logoutLisener() {
|
||||
global $WEBROOT;
|
||||
if ( isset($_GET['logoutbutton']) AND isset($_SESSION['username']) ) {
|
||||
OC_LOG::event($_SESSION['username'], 2, '');
|
||||
$_SESSION['user_id'] = false;
|
||||
$_SESSION['username'] = '';
|
||||
$_SESSION['username_clean'] = '';
|
||||
|
||||
header("location: $WEBROOT");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ date_default_timezone_set('Europe/Berlin');
|
|||
ini_set('arg_separator.output','&');
|
||||
ini_set('session.cookie_httponly','1;');
|
||||
session_start();
|
||||
|
||||
// calculate the documentroot
|
||||
$SERVERROOT=substr(__FILE__,0,-17);
|
||||
$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
|
||||
|
|
@ -119,6 +118,7 @@ class OC_UTIL {
|
|||
if(self::$fsSetup){//setting up the filesystem twice can only lead to trouble
|
||||
return false;
|
||||
}
|
||||
global $SERVERROOT;
|
||||
global $CONFIG_DATADIRECTORY_ROOT;
|
||||
global $CONFIG_DATADIRECTORY;
|
||||
global $CONFIG_BACKUPDIRECTORY;
|
||||
|
|
@ -172,7 +172,7 @@ class OC_UTIL {
|
|||
* @return array
|
||||
*/
|
||||
public static function getVersion(){
|
||||
return array(1,0,60);
|
||||
return array(1,1,0);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -322,17 +322,30 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
|
|||
$check_fn = "is_executable";
|
||||
}
|
||||
|
||||
// now check the directories in the path for the program
|
||||
foreach (explode(PATH_SEPARATOR, $path) as $dir) {
|
||||
// skip invalid path entries
|
||||
if (!file_exists($dir)) continue;
|
||||
if (!is_dir($dir)) continue;
|
||||
// Default check will be done with $path directories :
|
||||
$dirs = explode(PATH_SEPARATOR, $path);
|
||||
|
||||
// and now look for the file
|
||||
foreach ($exts as $ext) {
|
||||
if ($check_fn("$dir/$name".$ext)) return true;
|
||||
}
|
||||
}
|
||||
// WARNING : We have to check if open_basedir is enabled :
|
||||
$obd = ini_get('open_basedir');
|
||||
|
||||
if($obd != "none")
|
||||
$obd_values = explode(PATH_SEPARATOR, $obd);
|
||||
|
||||
if(count($obd_values) > 0)
|
||||
{
|
||||
// open_basedir is in effect !
|
||||
// We need to check if the program is in one of these dirs :
|
||||
$dirs = $obd_values;
|
||||
}
|
||||
|
||||
foreach($dirs as $dir)
|
||||
{
|
||||
foreach($exts as $ext)
|
||||
{
|
||||
if($check_fn("$dir/$name".$ext))
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ echo('<form method="post" action="'.$action.'">')
|
|||
echo "<tr><td colspan='3' class='error'>$CONFIG_ERROR</td></tr>";
|
||||
}
|
||||
if($FIRSTRUN){?>
|
||||
<tr><th colspan="2">Administartor User</th></tr>
|
||||
<tr><th colspan="2">Administrator User</th></tr>
|
||||
<tr title="Name used to log in."><td>user name:</td><td><input type="text" name="adminlogin" size="30" class="formstyle" value=""></input></td></tr>
|
||||
<tr title="Make a secure password, use at least 9 characters. Use letters and numbers."><td>password:</td><td><input type="password" name="adminpassword" size="30" class="formstyle"></input></td></tr>
|
||||
<tr title="Retype password to avoid typing errors."><td>retype password:</td><td><input type="password" name="adminpassword2" size="30" class="formstyle"></input></td></tr>
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ OC_FILES.browser.show_callback=function(content){
|
|||
OC_FILES.browser.files.show(null,content);
|
||||
}
|
||||
if(OC_FILES.uploadForm){
|
||||
OC_FILES.uploadForm.setAttribute('action','files/upload.php?dir='+dir);
|
||||
OC_FILES.uploadForm.setAttribute('action','files/upload.php?dir='+encodeURIComponent(dir));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -423,7 +423,7 @@ OC_FILES.browser.showuploader=function(dir,parent,max_upload){
|
|||
var iframeId=OC_FILES.uploadIFrames.length
|
||||
OC_FILES.uploadForm=document.createElement('form');
|
||||
OC_FILES.uploadForm.setAttribute('target','uploadIFrame'+iframeId);
|
||||
OC_FILES.uploadForm.setAttribute('action','files/upload.php?dir='+dir);
|
||||
OC_FILES.uploadForm.setAttribute('action','files/upload.php?dir='+encodeURIComponent(dir));
|
||||
OC_FILES.uploadForm.method='post';
|
||||
OC_FILES.uploadForm.setAttribute('enctype','multipart/form-data');
|
||||
OC_FILES.uploadIFrames[iframeId]=document.createElement('iframe');
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* ownCloud
|
||||
*
|
||||
* @author Frank Karlitschek
|
||||
* @copyright 2010 Frank Karlitschek karlitschek@kde.org
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
require_once('../../inc/lib_base.php');
|
||||
|
||||
|
||||
OC_UTIL::showheader();
|
||||
|
||||
echo('<div class="center">');
|
||||
echo('nothing here yet :-)');
|
||||
echo('</div>');
|
||||
|
||||
|
||||
OC_UTIL::showfooter();
|
||||
|
||||
?>
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* ownCloud
|
||||
*
|
||||
* @author Frank Karlitschek
|
||||
* @copyright 2010 Frank Karlitschek karlitschek@kde.org
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
OC_UTIL::addnavigationentry('Music','/plugins/music');
|
||||
|
||||
|
||||
|
||||
?>
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<plugin version='1.0'>
|
||||
<info>
|
||||
<id>music</id>
|
||||
<name>Music player for ownCloud</name>
|
||||
<version>0.1</version>
|
||||
<licence>AGPL</licence>
|
||||
<author>2010 Frank Karlitschek karlitschek@kde.org</author>
|
||||
<require>1.1</require>
|
||||
</info>
|
||||
<runtime>
|
||||
<include>lib_music.php</include>
|
||||
</runtime>
|
||||
</plugin>
|
||||
|
|
@ -33,8 +33,8 @@ $FIRSTRUN=false;
|
|||
OC_CONFIG::addForm('User Settings','/inc/templates/configform.php');
|
||||
if(OC_USER::ingroup($_SESSION['username'],'admin')){
|
||||
OC_CONFIG::addForm('System Settings','/inc/templates/adminform.php');
|
||||
OC_CONFIG::addForm('User Managment','/inc/templates/userform.php');
|
||||
OC_CONFIG::addForm('Plugin Managment','/inc/templates/pluginform.php');
|
||||
OC_CONFIG::addForm('User Management','/inc/templates/userform.php');
|
||||
OC_CONFIG::addForm('Plugin Management','/inc/templates/pluginform.php');
|
||||
}
|
||||
|
||||
echo('<div class="center">');
|
||||
|
|
|
|||
Loading…
Reference in New Issue