Sharing.php

ralfbecker_sf 2016-03-29 11:01:35 UTC #1

Author: ralfbecker
New Revision: 55552

URL: http://svn.stylite.de/viewvc/egroupware?rev=55552&view=rev
Log:
fix An error happened (ErrorException): Argument 4 passed to EGroupware\Api\Vfs::copy_files() must be of the type array, none given

Modified:
trunk/egroupware/api/src/Vfs.php
trunk/egroupware/api/src/Vfs/Sharing.php

Modified: trunk/egroupware/api/src/Vfs.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Vfs.php?rev=55552&r1=55551&r2=55552&view=diff

— trunk/egroupware/api/src/Vfs.php (original)
+++ trunk/egroupware/api/src/Vfs.php Tue Mar 29 13:01:34 2016
@@ -1937,8 +1937,11 @@
*
* @param array $src contains the source file
* @param string $dst is the destination directory

*/
static public function copy_files(array $src, $dst, &$errs, array &$copied)

- @param int& $errs =null on return number of errors happened
- @param array& $copied =null on return files copied
- @return boolean true for no errors, false otherwise
*/
static public function copy_files(array $src, $dst, &$errs=null, array &$copied=null)
{
if (self::is_dir($dst))
{

Modified: trunk/egroupware/api/src/Vfs/Sharing.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Vfs/Sharing.php?rev=55552&r1=55551&r2=55552&view=diff

— trunk/egroupware/api/src/Vfs/Sharing.php (original)
+++ trunk/egroupware/api/src/Vfs/Sharing.php Tue Mar 29 13:01:34 2016
@@ -460,7 +460,7 @@
if ($mode == ‘link’)
{
$user_tmp = ‘/home/’.$GLOBALS[‘egw_info’][‘user’][‘account_lid’].’/.tmp’;

  		if (!Vfs::file_exists($user_tmp) && !Vfs::mkdir($user_tmp))

  		if (!Vfs::file_exists($user_tmp) && !Vfs::mkdir($user_tmp, null, STREAM_MKDIR_RECURSIVE))
  		{
  			throw new Api\Exception\AssertionFailed("Could NOT create temp. directory '$user_tmp'!");
  		}

@@ -468,7 +468,7 @@
do {
$tmp_file = Vfs::concat($user_tmp, ($n?$n.’.’:’’).Vfs::basename($name));
}

  		while(!(is_dir($path) && Vfs::mkdir($tmp_file) ||

  		while(!(is_dir($path) && Vfs::mkdir($tmp_file, null, STREAM_MKDIR_RECURSIVE) ||
  			!is_dir($path) && (!Vfs::file_exists($tmp_file) && ($fp = Vfs::fopen($tmp_file, 'x')) ||
  				// do not copy identical files again to users tmp dir, just re-use them
  				Vfs::file_exists($tmp_file) && Vfs::compare(Vfs::PREFIX.$tmp_file, $path))) && $n++ < 100);

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs