fix merge conflicts
This commit is contained in:
commit
eb5265b106
|
@ -18,7 +18,7 @@ if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) {
|
|||
exit;
|
||||
}
|
||||
|
||||
if ($dir != '' || $file != 'Shared') {
|
||||
if ($target != '' || strtolower($file) != 'shared') {
|
||||
$targetFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file);
|
||||
$sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
|
||||
if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
|
||||
|
|
|
@ -236,7 +236,7 @@ $(document).ready(function() {
|
|||
var file = data.files[0];
|
||||
try {
|
||||
// FIXME: not so elegant... need to refactor that method to return a value
|
||||
Files.isFileNameValid(file.name);
|
||||
Files.isFileNameValid(file.name, FileList.getCurrentDirectory());
|
||||
}
|
||||
catch (errorMessage) {
|
||||
data.textStatus = 'invalidcharacters';
|
||||
|
@ -562,7 +562,7 @@ $(document).ready(function() {
|
|||
throw t('files', 'URL cannot be empty');
|
||||
} else if (type !== 'web' && !Files.isFileNameValid(filename)) {
|
||||
// Files.isFileNameValid(filename) throws an exception itself
|
||||
} else if ($('#dir').val() === '/' && filename === 'Shared') {
|
||||
} else if (FileList.getCurrentDirectory() === '/' && filename.toLowerCase() === 'shared') {
|
||||
throw t('files', 'In the home folder \'Shared\' is a reserved filename');
|
||||
} else if (FileList.inList(filename)) {
|
||||
throw t('files', '{new_name} already exists', {new_name: filename});
|
||||
|
|
|
@ -419,15 +419,12 @@ window.FileList={
|
|||
len = input.val().length;
|
||||
}
|
||||
input.selectRange(0, len);
|
||||
|
||||
var checkInput = function () {
|
||||
var filename = input.val();
|
||||
if (filename !== oldname) {
|
||||
if (!Files.isFileNameValid(filename)) {
|
||||
// Files.isFileNameValid(filename) throws an exception itself
|
||||
} else if($('#dir').val() === '/' && filename === 'Shared') {
|
||||
throw t('files','In the home folder \'Shared\' is a reserved filename');
|
||||
} else if (FileList.inList(filename)) {
|
||||
// Files.isFileNameValid(filename) throws an exception itself
|
||||
Files.isFileNameValid(filename, FileList.getCurrentDirectory());
|
||||
if (FileList.inList(filename)) {
|
||||
throw t('files', '{new_name} already exists', {new_name: filename});
|
||||
}
|
||||
}
|
||||
|
@ -1156,9 +1153,9 @@ $(document).ready(function() {
|
|||
// need to initially switch the dir to the one from the hash (IE8)
|
||||
FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
|
||||
}
|
||||
}
|
||||
|
||||
FileList.setCurrentDir(parseCurrentDirFromUrl(), false);
|
||||
FileList.setCurrentDir(parseCurrentDirFromUrl(), false);
|
||||
}
|
||||
|
||||
FileList.createFileSummary();
|
||||
});
|
||||
|
|
|
@ -87,9 +87,12 @@ var Files = {
|
|||
* Throws a string exception with an error message if
|
||||
* the file name is not valid
|
||||
*/
|
||||
isFileNameValid: function (name) {
|
||||
isFileNameValid: function (name, root) {
|
||||
var trimmedName = name.trim();
|
||||
if (trimmedName === '.' || trimmedName === '..') {
|
||||
if (trimmedName === '.'
|
||||
|| trimmedName === '..'
|
||||
|| (root === '/' && trimmedName.toLowerCase() === 'shared'))
|
||||
{
|
||||
throw t('files', '"{name}" is an invalid file name.', {name: name});
|
||||
} else if (trimmedName.length === 0) {
|
||||
throw t('files', 'File name cannot be empty.');
|
||||
|
|
|
@ -48,6 +48,41 @@ describe('Files tests', function() {
|
|||
expect(error).toEqual(false);
|
||||
}
|
||||
});
|
||||
it('Validates correct file names do not create Shared folder in root', function() {
|
||||
// create shared file in subfolder
|
||||
var error = false;
|
||||
try {
|
||||
expect(Files.isFileNameValid('shared', '/foo')).toEqual(true);
|
||||
expect(Files.isFileNameValid('Shared', '/foo')).toEqual(true);
|
||||
}
|
||||
catch (e) {
|
||||
error = e;
|
||||
}
|
||||
expect(error).toEqual(false);
|
||||
|
||||
// create shared file in root
|
||||
var threwException = false;
|
||||
try {
|
||||
Files.isFileNameValid('Shared', '/');
|
||||
console.error('Invalid file name not detected');
|
||||
}
|
||||
catch (e) {
|
||||
threwException = true;
|
||||
}
|
||||
expect(threwException).toEqual(true);
|
||||
|
||||
// create shared file in root
|
||||
var threwException = false;
|
||||
try {
|
||||
Files.isFileNameValid('shared', '/');
|
||||
console.error('Invalid file name not detected');
|
||||
}
|
||||
catch (e) {
|
||||
threwException = true;
|
||||
}
|
||||
expect(threwException).toEqual(true);
|
||||
|
||||
});
|
||||
it('Detects invalid file names', function() {
|
||||
var fileNames = [
|
||||
'',
|
||||
|
|
|
@ -264,7 +264,7 @@ $(document).ready(function() {
|
|||
OC.MountConfig.saveStorage($(this).parent().parent());
|
||||
});
|
||||
|
||||
$('#sslCertificate').on('click', 'td.remove>img', function() {
|
||||
$('#sslCertificate').on('click', 'td.remove>img', function() {
|
||||
var $tr = $(this).parent().parent();
|
||||
var row = this.parentNode.parentNode;
|
||||
$.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: row.id});
|
||||
|
|
|
@ -476,7 +476,7 @@ class OC_Mount_Config {
|
|||
*/
|
||||
public static function checksmbclient() {
|
||||
if(function_exists('shell_exec')) {
|
||||
$output=shell_exec('which smbclient 2> /dev/null');
|
||||
$output=shell_exec('command -v smbclient 2> /dev/null');
|
||||
return !empty($output);
|
||||
}else{
|
||||
return false;
|
||||
|
|
|
@ -175,6 +175,7 @@ button, .button,
|
|||
border: 1px solid rgba(190,190,190,.9);
|
||||
cursor: pointer;
|
||||
border-radius: 3px;
|
||||
outline: none;
|
||||
}
|
||||
input[type="submit"]:hover, input[type="submit"]:focus,
|
||||
input[type="button"]:hover, input[type="button"]:focus,
|
||||
|
|
|
@ -32,37 +32,37 @@ OC.Router = {
|
|||
var optional = true;
|
||||
$(route.tokens).each(function(i, token) {
|
||||
if ('text' === token[0]) {
|
||||
url = token[1] + url;
|
||||
optional = false;
|
||||
url = token[1] + url;
|
||||
optional = false;
|
||||
|
||||
return;
|
||||
return;
|
||||
}
|
||||
|
||||
if ('variable' === token[0]) {
|
||||
if (false === optional || !(token[3] in route.defaults)
|
||||
|| ((token[3] in params) && params[token[3]] != route.defaults[token[3]])) {
|
||||
if (false === optional || !(token[3] in route.defaults)
|
||||
|| ((token[3] in params) && params[token[3]] != route.defaults[token[3]])) {
|
||||
var value;
|
||||
if (token[3] in params) {
|
||||
value = params[token[3]];
|
||||
delete unusedParams[token[3]];
|
||||
value = params[token[3]];
|
||||
delete unusedParams[token[3]];
|
||||
} else if (token[3] in route.defaults) {
|
||||
value = route.defaults[token[3]];
|
||||
value = route.defaults[token[3]];
|
||||
} else if (optional) {
|
||||
return;
|
||||
return;
|
||||
} else {
|
||||
throw new Error('The route "' + name + '" requires the parameter "' + token[3] + '".');
|
||||
throw new Error('The route "' + name + '" requires the parameter "' + token[3] + '".');
|
||||
}
|
||||
|
||||
var empty = true === value || false === value || '' === value;
|
||||
|
||||
if (!empty || !optional) {
|
||||
url = token[1] + encodeURIComponent(value).replace(/%2F/g, '/') + url;
|
||||
url = token[1] + encodeURIComponent(value).replace(/%2F/g, '/') + url;
|
||||
}
|
||||
|
||||
optional = false;
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
return;
|
||||
}
|
||||
|
||||
throw new Error('The token type "' + token[0] + '" is not supported.');
|
||||
|
|
|
@ -584,8 +584,8 @@ $(document).ready(function() {
|
|||
$(checkboxes).filter('input[name="edit"]').attr('checked', false);
|
||||
// Check Edit if Create, Update, or Delete is checked
|
||||
} else if (($(this).attr('name') == 'create'
|
||||
|| $(this).attr('name') == 'update'
|
||||
|| $(this).attr('name') == 'delete'))
|
||||
|| $(this).attr('name') == 'update'
|
||||
|| $(this).attr('name') == 'delete'))
|
||||
{
|
||||
$(checkboxes).filter('input[name="edit"]').attr('checked', true);
|
||||
}
|
||||
|
|
|
@ -50,7 +50,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
|
|||
*/
|
||||
public function createFile($name, $data = null) {
|
||||
|
||||
if ($name === 'Shared' && empty($this->path)) {
|
||||
if (strtolower($name) === 'shared' && empty($this->path)) {
|
||||
throw new \Sabre_DAV_Exception_Forbidden();
|
||||
}
|
||||
|
||||
|
@ -86,7 +86,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
|
|||
*/
|
||||
public function createDirectory($name) {
|
||||
|
||||
if ($name === 'Shared' && empty($this->path)) {
|
||||
if (strtolower($name) === 'shared' && empty($this->path)) {
|
||||
throw new \Sabre_DAV_Exception_Forbidden();
|
||||
}
|
||||
|
||||
|
|
|
@ -94,6 +94,9 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
|
|||
}
|
||||
if ($sourceDir !== $destinationDir) {
|
||||
// for a full move we need update privileges on sourcePath and sourceDir as well as destinationDir
|
||||
if (ltrim($destinationDir, '/') === '' && strtolower($sourceNode->getName()) === 'shared') {
|
||||
throw new \Sabre_DAV_Exception_Forbidden();
|
||||
}
|
||||
if (!$fs->isUpdatable($sourceDir)) {
|
||||
throw new \Sabre_DAV_Exception_Forbidden();
|
||||
}
|
||||
|
|
|
@ -464,7 +464,7 @@ class OC_Installer{
|
|||
// is the code checker enabled?
|
||||
if(OC_Config::getValue('appcodechecker', true)) {
|
||||
// check if grep is installed
|
||||
$grep = exec('which grep');
|
||||
$grep = exec('command -v grep');
|
||||
if($grep=='') {
|
||||
OC_Log::write('core',
|
||||
'grep not installed. So checking the code of the app "'.$appname.'" was not possible',
|
||||
|
|
|
@ -408,6 +408,7 @@ class Preview {
|
|||
$image->loadFromFileHandle($stream);
|
||||
$this->preview = $image->valid() ? $image : null;
|
||||
$this->resizeAndCrop();
|
||||
fclose($stream);
|
||||
}
|
||||
|
||||
if (is_null($this->preview)) {
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
namespace OC\Preview;
|
||||
|
||||
function findBinaryPath($program) {
|
||||
exec('which ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
|
||||
exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
|
||||
if ($returnCode === 0 && count($output) > 0) {
|
||||
return escapeshellcmd($output[0]);
|
||||
}
|
||||
|
|
|
@ -64,12 +64,12 @@ if (!\OC_Util::runningOnWindows()) {
|
|||
$cmd = \OC_Config::getValue('preview_libreoffice_path', null);
|
||||
}
|
||||
|
||||
$whichLibreOffice = shell_exec('which libreoffice');
|
||||
$whichLibreOffice = shell_exec('command -v libreoffice');
|
||||
if($cmd === '' && !empty($whichLibreOffice)) {
|
||||
$cmd = 'libreoffice';
|
||||
}
|
||||
|
||||
$whichOpenOffice = shell_exec('which openoffice');
|
||||
$whichOpenOffice = shell_exec('command -v openoffice');
|
||||
if($cmd === '' && !empty($whichOpenOffice)) {
|
||||
$cmd = 'openoffice';
|
||||
}
|
||||
|
|
|
@ -15,9 +15,9 @@ if (extension_loaded('imagick')) {
|
|||
|
||||
// LibreOffice preview is currently not supported on Windows
|
||||
if (!\OC_Util::runningOnWindows()) {
|
||||
$whichLibreOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
|
||||
$whichLibreOffice = ($isShellExecEnabled ? shell_exec('command -v libreoffice') : '');
|
||||
$isLibreOfficeAvailable = !empty($whichLibreOffice);
|
||||
$whichOpenOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
|
||||
$whichOpenOffice = ($isShellExecEnabled ? shell_exec('command -v libreoffice') : '');
|
||||
$isOpenOfficeAvailable = !empty($whichOpenOffice);
|
||||
//let's see if there is libreoffice or openoffice on this machine
|
||||
if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
|
||||
|
|
Loading…
Reference in New Issue