holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix PHP Fatal in filemanager/cli.php on minimal installs

Browse Source
This commit is contained in:
Ralf Becker 2017-04-05 10:02:00 +02:00
parent 0eaae4b4e4
commit d2f28aab34
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
filemanager/cli.php
View File

@ -6,7 +6,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @package filemanager * @package filemanager
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2007-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007-17 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
* *
@ -305,7 +305,7 @@ switch($cmd)
case 'rm': case 'rm':
if ($recursive) if ($recursive)
{ {
if (!class_exists('egw_vfs')) if (!class_exists('EGroupware\\Api\\Vfs'))
{ {
die("rm -r only implemented for eGW streams!"); // dont want to repeat the code here die("rm -r only implemented for eGW streams!"); // dont want to repeat the code here
} }
@ -353,7 +353,7 @@ switch($cmd)
{ {
$set = 0; $set = 0;
} }
if (!class_exists('egw_vfs')) if (!class_exists('EGroupware\\Api\\Vfs'))
{ {
die("chmod only implemented for eGW streams!"); // dont want to repeat the code here die("chmod only implemented for eGW streams!"); // dont want to repeat the code here
} }
@ -397,11 +397,11 @@ switch($cmd)
{ {
load_wrapper($url); load_wrapper($url);
} }
if ($recursive && class_exists('egw_vfs')) if ($recursive && class_exists('EGroupware\\Api\\Vfs'))
{ {
array_unshift($argv,$url); array_unshift($argv,$url);
$params = array($argv,null,$cmd,$params[1]); $params = array($argv,null,$cmd,$params[1]);
$cmd = array('egw_vfs','find'); $cmd = array('EGroupware\\Api\\Vfs','find');
$argv = array(); // we processed all url's $argv = array(); // we processed all url's
} }
//echo "calling cmd=".print_r($cmd,true).", params=".print_r($params,true)."\n"; //echo "calling cmd=".print_r($cmd,true).", params=".print_r($params,true)."\n";
@ -412,7 +412,7 @@ switch($cmd)
case 'ls': case 'ls':
default: default:
// recursive ls atm only for vfs:// // recursive ls atm only for vfs://
if ($cmd != 'cat' && $recursive && class_exists('egw_vfs')) if ($cmd != 'cat' && $recursive && class_exists('EGroupware\\Api\\Vfs'))
{ {
load_wrapper($url); load_wrapper($url);
array_unshift($argv,$url); array_unshift($argv,$url);
@ -580,7 +580,7 @@ function do_eacl(array $argv)
usage('Wrong number of parameters!'); usage('Wrong number of parameters!');
} }
load_wrapper($url = $argv[0]); load_wrapper($url = $argv[0]);
if (!class_exists('egw_vfs')) if (!class_exists('EGroupware\\Api\\Vfs'))
{ {
die('eacl only implemented for eGW streams!'); die('eacl only implemented for eGW streams!');
} }
@ -645,7 +645,7 @@ function do_stat($url,$long=false,$numeric=false,$full_path=false,$inode=false)
{ {
//echo $url; print_r($stat); //echo $url; print_r($stat);
if (class_exists('egw_vfs')) if (class_exists('EGroupware\\Api\\Vfs'))
{ {
$perms = Vfs::int2mode($stat['mode']); $perms = Vfs::int2mode($stat['mode']);
} }
@ -682,7 +682,7 @@ function do_stat($url,$long=false,$numeric=false,$full_path=false,$inode=false)
$nlink = $stat['nlink']; $nlink = $stat['nlink'];
if (($stat['mode'] & 0xA000) == 0xA000) if (($stat['mode'] & 0xA000) == 0xA000)
{ {
$symlink = " -> ".(class_exists('egw_vfs') ? Vfs::readlink($url) : readlink($url)); $symlink = " -> ".(class_exists('EGroupware\\Api\\Vfs') ? Vfs::readlink($url) : readlink($url));
} }
if ($inode) if ($inode)
{ {
@ -718,7 +718,7 @@ function do_cp($argv,$recursive=false,$perms=false)
$anz_dirs = $anz_files = 0; $anz_dirs = $anz_files = 0;
foreach($argv as $from) foreach($argv as $from)
{ {
if (is_dir($from) && (!file_exists($to) || is_dir($to)) && $recursive && class_exists('egw_vfs')) if (is_dir($from) && (!file_exists($to) || is_dir($to)) && $recursive && class_exists('EGroupware\\Api\\Vfs'))
{ {
foreach(Vfs::find($from,array('url' => true)) as $f) foreach(Vfs::find($from,array('url' => true)) as $f)
{ {
@ -792,8 +792,8 @@ function _cp_perms($from,$to)
{ {
if ($from_stat[$perm] != $to_stat[$perm]) if ($from_stat[$perm] != $to_stat[$perm])
{ {
//echo "egw_vfs::$cmd($to,{$from_stat[$perm]}\n"; //echo "Vfs::$cmd($to,{$from_stat[$perm]}\n";
call_user_func(array('egw_vfs',$cmd),$to,$from_stat[$perm]); call_user_func(array('EGroupware\\Api\\Vfs',$cmd),$to,$from_stat[$perm]);
} }
} }
} }