Skip to content

Commit 598fbd3

Browse files
committed
Merge remote-tracking branch 'origin/2023.11' into 2024.11
2 parents 71dc620 + 70e688b commit 598fbd3

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

tests/tine20/Filemanager/Frontend/WebDAVTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ public function testCreateFile()
13181318
{
13191319
$parent = $this->testgetNodeForPath_webdav_filemanager_shared_unittestdirectory();
13201320
$rc = fopen('php://temp', 'r');
1321-
$etag = $parent->createFile('AR-0394xa5 => GS-00sb064', $rc);
1321+
$etag = $parent->createFile('AR-0394xa5 = GS-00sb064', $rc);
13221322
fclose($rc);
13231323
self::assertRegExp('/"[a-z0-9]+"/', $etag);
13241324
}

tine20/Filemanager/js/NodeTreePanel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ Tine.Filemanager.NodeTreePanel = Ext.extend(Tine.widgets.container.TreePanel, {
364364
}
365365

366366
if (!Tine.Filemanager.Model.Node.isNameValid(text)) {
367-
Ext.Msg.alert(String.format(this.app.i18n._('No {0} added'), nodeName), this.app.i18n._('Illegal characters: ') + forbidden);
367+
Ext.Msg.alert(String.format(this.app.i18n._('No {0} added'), nodeName), this.app.i18n._('Illegal characters: ') + text);
368368
return;
369369
}
370370

tine20/Tinebase/Frontend/WebDAV/Node.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ public static function checkForbiddenFile($name)
165165
throw new Tine20\DAV\Exception\Forbidden('forbidden name');
166166
} else if (substr($name, 0, 2) == '._') {
167167
throw new Tine20\DAV\Exception\Forbidden('no resource files accepted');
168+
} else if (preg_match(Tinebase_Model_Tree_Node::FILENAME_FORBIDDEN_CHARS_EXP, $name, $matches)) {
169+
throw new Tine20\DAV\Exception\Forbidden('Illegal characters: ' . print_r($matches, true));
168170
}
169171
}
170172

0 commit comments

Comments
 (0)