tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from guillegiu/master 

Guillermo -   Issue #20
This commit is contained in:
Ivan Diaz 2017-06-20 22:08:37 +02:00 committed by GitHub
parent 9e3e10c9ee 91c3b4f396
commit 33b843352b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/libs/FileUploader.php
View File

@ -33,7 +33,7 @@ class FileUploader extends FileManager {
private function setNewName($fileName) { private function setNewName($fileName) {
$newName = $fileName; $newName = $fileName;
$newName = strtolower($newName); $newName = strtolower($newName);
$newName = preg_replace('/\s+/', '_', $newName); $newName = preg_replace('/[^a-zA-Z0-9\d\.\-]/', '_', $newName);
if ($this->linearCongruentialGenerator instanceof LinearCongruentialGenerator) { if ($this->linearCongruentialGenerator instanceof LinearCongruentialGenerator) {
$newName = $this->linearCongruentialGenerator->generate($this->linearCongruentialGeneratorOffset) . '_' . $newName; $newName = $this->linearCongruentialGenerator->generate($this->linearCongruentialGeneratorOffset) . '_' . $newName;

6
tests/system/file-upload-download.rb
View File

@ -3,7 +3,7 @@ describe 'File Upload and Download' do
Scripts.login('creator@os4.com', 'creator') Scripts.login('creator@os4.com', 'creator')
it 'should upload file when creating ticket' do it 'should upload file when creating ticket' do
file = File.new('../server/files/upload.txt', 'w+') file = File.new('../server/files/upload(3).txt', 'w+')
file.puts('file content') file.puts('file content')
file.close file.close
@ -14,13 +14,13 @@ describe 'File Upload and Download' do
'content' => 'this is a ticket that contains a file', 'content' => 'this is a ticket that contains a file',
'language' => 'en', 'language' => 'en',
'departmentId' => 1, 'departmentId' => 1,
'file' => File.open( "../server/files/upload.txt") 'file' => File.open( "../server/files/upload(3).txt")
}) })
(result['status']).should.equal('success') (result['status']).should.equal('success')
ticket = $database.getLastRow('ticket') ticket = $database.getLastRow('ticket')
(ticket['file'].include? 'upload.txt').should.equal(true) (ticket['file'].include? 'upload_3_.txt').should.equal(true)
(File.exist? ('../server/files/' + ticket['file'])).should.equal(true) (File.exist? ('../server/files/' + ticket['file'])).should.equal(true)
end end