🐛 better theme name consistency (#7380)

closes #7313

- Adds `getSanitizedFileName` function to storage/base.js which replaces non A-Z0-9@. chacracters with -
- modifies /api/theme.js so that zip.shortName is consistent throughout.

core/server/api/themes.js

@@ -25,11 +25,12 @@ themes = {
         // consistent filename uploads
         options.originalname = options.originalname.toLowerCase();
 
-        var zip = {
+        var storageAdapter = storage.getStorage('themes'),
+        zip = {
             path: options.path,
             name: options.originalname,
-            shortName: options.originalname.split('.zip')[0]
-        }, theme, storageAdapter = storage.getStorage('themes');
+            shortName: storageAdapter.getSanitizedFileName(options.originalname.split('.zip')[0])
+        }, theme;
 
         // check if zip name is casper.zip
         if (zip.name === 'casper.zip') {

core/server/storage/base.js

@@ -51,12 +51,18 @@ StorageBase.prototype.getUniqueFileName = function (store, image, targetDir) {
     // poor extension validation
     // .1 is not a valid extension
     if (!ext.match(/.\d/)) {
-        name = path.basename(image.name, ext).replace(/[^\w@.]/gi, '-');
+        name = this.getSanitizedFileName(path.basename(image.name, ext));
         return this.generateUnique(store, targetDir, name, ext, 0);
     } else {
-        name = path.basename(image.name).replace(/[^\w@.]/gi, '-');
+        name = this.getSanitizedFileName(path.basename(image.name));
         return this.generateUnique(store, targetDir, name, null, 0);
     }
 };
 
+StorageBase.prototype.getSanitizedFileName = function getSanitizedFileName(fileName) {
+    // below only matches ascii characters, @, and .
+    // unicode filenames like город.zip would therefore resolve to ----.zip
+    return fileName.replace(/[^\w@.]/gi, '-');
+};
+
 module.exports = StorageBase;

core/test/unit/storage/base_spec.js

@@ -0,0 +1,12 @@
+var should = require('should'),
+    storage = require('../../../server/storage');
+
+// to stop jshint complaining
+should.equal(true, true);
+
+describe('storage: base_spec', function () {
+    it('escape non accepted characters in filenames', function () {
+        var chosenStorage = storage.getStorage('themes');
+        chosenStorage.getSanitizedFileName('(abc*@#123).zip').should.eql('-abc-@-123-.zip');
+    });
+});