Yajbir-Malik/DocumentServer-v-9.2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Alexander Trofimov
2015-06-25 11:27:08 +03:00
parent dbf21ee32f
commit a10605c91f
174 changed files with 24121 additions and 8908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ServerComponents/FileConverterUtils2/DocsChanges.cs
View File

@@ -42,6 +42,8 @@ namespace FileConverterUtils2
{
public string data;
public string userid;
public string username;
public DateTime date;
}
public class DocsChanges
{
@@ -66,6 +68,8 @@ namespace FileConverterUtils2
DocsChange oDocsChange = new DocsChange();
oDocsChange.data = Convert.ToString(oReader["dc_data"]);
oDocsChange.userid = Convert.ToString(oReader["dc_user_id_original"]);
oDocsChange.username = Convert.ToString(oReader["dc_user_name"]);
oDocsChange.date = Convert.ToDateTime(oReader["dc_date"]);
aChanges.Add(oDocsChange);
}
}

5
ServerComponents/FileConverterUtils2/FileConverterUtils2.cs
View File

@@ -60,8 +60,8 @@ namespace FileConverterUtils2
public const string mc_sPostgreProvider = "Npgsql";
public static System.Globalization.CultureInfo mc_oCultureInfo = new System.Globalization.CultureInfo(0x409);
public const string mc_sResourceServiceUrlRel = "/ResourceService.ashx?path=";
public const string mc_sWebClientUserAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; .NET CLR 1.0.3705;)";
public const string mc_sWebClientUserAgent = "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2427.7 Safari/537.36";
public const int mc_nBufferSize = 1024 * 1024;
}
public class Utils
@@ -659,6 +659,7 @@ namespace FileConverterUtils2
public bool embeddedfonts { get; set; }
public bool innersave { get; set; }
public string userid { get; set; }
public bool viewmode { get; set; }
public int status { get; set; }
public int status_info { get; set; }

18
ServerComponents/FileConverterUtils2/FileConverterUtils2.csproj
View File

@@ -33,35 +33,35 @@
<ItemGroup>
<Reference Include="ASC.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\Bin\ASC.Common.dll</HintPath>
<HintPath>..\..\..\wwwroot\Bin\ASC.Common.dll</HintPath>
</Reference>
<Reference Include="ASC.Core.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\Bin\ASC.Core.Common.dll</HintPath>
<HintPath>..\..\..\wwwroot\Bin\ASC.Core.Common.dll</HintPath>
</Reference>
<Reference Include="AWSSDK, Version=1.5.2.2, Culture=neutral, PublicKeyToken=cd2d24cd2bace800, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\Bin\AWSSDK.dll</HintPath>
<HintPath>..\..\..\wwwroot\Bin\AWSSDK.dll</HintPath>
</Reference>
<Reference Include="Enyim.Caching, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\Bin\Enyim.Caching.dll</HintPath>
<HintPath>..\..\..\wwwroot\Bin\Enyim.Caching.dll</HintPath>
</Reference>
<Reference Include="Ionic.Zip.Reduced, Version=1.9.1.5, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\Bin\Ionic.Zip.Reduced.dll</HintPath>
<HintPath>..\..\..\wwwroot\Bin\Ionic.Zip.Reduced.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\Bin\log4net.dll</HintPath>
<HintPath>..\..\..\wwwroot\Bin\log4net.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.3.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\Bin\MySql.Data.dll</HintPath>
<HintPath>..\..\..\wwwroot\Bin\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="OpenMcdf, Version=1.5.4.22637, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\ThirdParty\Bin\OpenMcdf.dll</HintPath>
<HintPath>..\..\..\wwwroot\Bin\OpenMcdf.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@@ -125,6 +125,6 @@
</Target>
-->
<PropertyGroup>
<PostBuildEvent>copy $(TargetPath) $(ProjectDir)..\Bin\</PostBuildEvent>
<PostBuildEvent>copy $(TargetPath) $(ProjectDir)..\..\..\wwwroot\Bin\</PostBuildEvent>
</PropertyGroup>
</Project>

2
ServerComponents/FileConverterUtils2/LicenseInfo.cs
View File

@@ -49,6 +49,8 @@ namespace FileConverterUtils2
Convertation = 3
}
}
}

4
ServerComponents/FileConverterUtils2/Properties/AssemblyInfo.cs
View File

@@ -46,5 +46,5 @@ using System.Runtime.InteropServices;
[assembly: Guid("9a6d8058-b3ef-4586-8492-0136f44cedd5")]
[assembly: AssemblyVersion("1.0.0.114")]
[assembly: AssemblyFileVersion("1.0.0.114")]
[assembly: AssemblyVersion("1.0.0.118")]
[assembly: AssemblyFileVersion("1.0.0.118")]