This commit is contained in:
friendica 2014-02-16 14:14:50 -08:00
commit 0f5ebb9b5a
4 changed files with 1620 additions and 1557 deletions

View File

@ -1574,8 +1574,13 @@ function proc_run($cmd){
$args[$x] = escapeshellarg($args[$x]);
$cmdline = implode($args," ");
if(is_windows())
proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo));
if(is_windows()) {
$cwd = getcwd();
$cmd = "cmd /c start \"title\" /D \"$cwd\" /b $cmdline";
proc_close(proc_open($cmd, array(), $foo));
}
else
proc_close(proc_open($cmdline." &",array(),$foo));
}

View File

@ -1064,5 +1064,15 @@ class RedBrowser extends DAV\Browser\Plugin {
}
/**
* This method takes a path/name of an asset and turns it into url
* suiteable for http access.
*
* @param string $assetName
* @return string
*/
protected function getAssetUrl($assetName) {
return '/cloud/?sabreAction=asset&assetName=' . urlencode($assetName);
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff