pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #135 from ONLYOFFICE/feature/fix-filename

Browse Source 
Feature/fix filename
This commit is contained in:
Sergey Linnik
2021-03-30 12:06:34 +03:00
committed by GitHub
parent db8d816660 578ecec9af
commit abe807f288
18 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/documentserver-example/csharp/Default.aspx.cs
View File

@ -321,7 +321,7 @@ namespace OnlineEditorsExample
{
_fileName = Path.GetFileName(context.Request["filename"]);
var extension = (Path.GetExtension(_fileName) ?? "").Trim('.');
var extension = (Path.GetExtension(_fileName).ToLower() ?? "").Trim('.');
var internalExtension = FileType.GetInternalExtension(_fileName).Trim('.');
if (ConvertExts.Contains("." + extension)
@ -383,7 +383,7 @@ namespace OnlineEditorsExample
public static string GetCorrectName(string fileName, string userAddress = null)
{
var baseName = Path.GetFileNameWithoutExtension(fileName);
var ext = Path.GetExtension(fileName);
var ext = Path.GetExtension(fileName).ToLower();
var name = baseName + ext;
for (var i = 1; File.Exists(StoragePath(name, userAddress)); i++)

2
web/documentserver-example/csharp/DocEditor.aspx.cs
View File

@ -100,7 +100,7 @@ namespace OnlineEditorsExample
Response.Redirect("doceditor.aspx?fileID=" + HttpUtility.UrlEncode(FileName));
}
var ext = Path.GetExtension(FileName);
var ext = Path.GetExtension(FileName).ToLower();
var editorsMode = Request.GetOrDefault("editorsMode", "edit");

2
web/documentserver-example/csharp/DocumentConverter.cs
View File

@ -87,7 +87,7 @@ namespace ASC.Api.DocumentConverter
{
convertedDocumentUri = string.Empty;
fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri) : fromExtension;
fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri).ToLower() : fromExtension;
var title = Path.GetFileName(documentUri);
title = string.IsNullOrEmpty(title) ? Guid.NewGuid().ToString() : title;

8
web/documentserver-example/csharp/TrackManager.cs
View File

@ -88,8 +88,8 @@ namespace OnlineEditorsExample
public static int processSave(Dictionary<string, object> fileData, string fileName, string userAddress)
{
var downloadUri = (string)fileData["url"];
var curExt = Path.GetExtension(fileName);
var downloadExt = Path.GetExtension(downloadUri) ?? "";
var curExt = Path.GetExtension(fileName).ToLower();
var downloadExt = Path.GetExtension(downloadUri).ToLower() ?? "";
var newFileName = fileName;
if (!downloadExt.Equals(curExt, StringComparison.InvariantCultureIgnoreCase))
@ -158,8 +158,8 @@ namespace OnlineEditorsExample
{
var downloadUri = (string)fileData["url"];
string curExt = Path.GetExtension(fileName);
string downloadExt = Path.GetExtension(downloadUri);
string curExt = Path.GetExtension(fileName).ToLower();
string downloadExt = Path.GetExtension(downloadUri).ToLower();
Boolean newFileName = false;
if (!curExt.Equals(downloadExt))