IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix-messages: IDE1006

Browse Source
This commit is contained in:
SuhorukovAnton 2020-09-29 15:27:28 +03:00
parent 9d5a9dd769
commit 31cc18f568
18 changed files with 140 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/ASC.Core.Common/Notify/Engine/InterceptorStorage.cs
View File

@ -38,7 +38,7 @@ namespace ASC.Notify.Engine
private readonly Dictionary<string, ISendInterceptor> globalInterceptors = new Dictionary<string, ISendInterceptor>(10);
private Dictionary<string, ISendInterceptor> callInterceptors
private Dictionary<string, ISendInterceptor> CallInterceptors
{
get
{
@ -60,7 +60,7 @@ namespace ASC.Notify.Engine
switch (interceptor.Lifetime)
{
case InterceptorLifetime.Call:
AddInternal(interceptor, callInterceptors);
AddInternal(interceptor, CallInterceptors);
break;
case InterceptorLifetime.Global:
AddInternal(interceptor, globalInterceptors);
@ -73,7 +73,7 @@ namespace ASC.Notify.Engine
public ISendInterceptor Get(string name)
{
if (string.IsNullOrEmpty(name)) throw new ArgumentException("empty name", "name");
var result = GetInternal(name, callInterceptors);
var result = GetInternal(name, CallInterceptors);
if (result == null) result = GetInternal(name, globalInterceptors);
return result;
}
@ -82,7 +82,7 @@ namespace ASC.Notify.Engine
{
if (string.IsNullOrEmpty(name)) throw new ArgumentException("empty name", "name");
RemoveInternal(name, callInterceptors);
RemoveInternal(name, CallInterceptors);
RemoveInternal(name, globalInterceptors);
}
@ -95,7 +95,7 @@ namespace ASC.Notify.Engine
{
lock (syncRoot)
{
if ((lifetime & InterceptorLifetime.Call) == InterceptorLifetime.Call) callInterceptors.Clear();
if ((lifetime & InterceptorLifetime.Call) == InterceptorLifetime.Call) CallInterceptors.Clear();
if ((lifetime & InterceptorLifetime.Global) == InterceptorLifetime.Global) globalInterceptors.Clear();
}
}
@ -103,7 +103,7 @@ namespace ASC.Notify.Engine
public List<ISendInterceptor> GetAll()
{
var result = new List<ISendInterceptor>();
result.AddRange(callInterceptors.Values);
result.AddRange(CallInterceptors.Values);
result.AddRange(globalInterceptors.Values);
return result;
}

4
common/ASC.Core.Common/Notify/Senders/AWSSender.cs
View File

@ -86,9 +86,9 @@ namespace ASC.Core.Notify.Senders
if (!configuration.SmtpSettings.IsDefaultSettings)
{
_useCoreSettings = true;
UseCoreSettings = true;
result = base.Send(m);
_useCoreSettings = false;
UseCoreSettings = false;
}
else
{

6
common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
View File

@ -65,7 +65,7 @@ namespace ASC.Core.Notify.Senders
private int Port { get; set; }
private bool Ssl { get; set; }
private ICredentials Credentials { get; set; }
protected bool _useCoreSettings { get; set; }
protected bool UseCoreSettings { get; set; }
const int NETWORK_TIMEOUT = 30000;
public SmtpSender(
@ -81,7 +81,7 @@ namespace ASC.Core.Notify.Senders
{
if (properties.ContainsKey("useCoreSettings") && bool.Parse(properties["useCoreSettings"]))
{
_useCoreSettings = true;
UseCoreSettings = true;
}
else
{
@ -122,7 +122,7 @@ namespace ASC.Core.Notify.Senders
{
try
{
if (_useCoreSettings)
if (UseCoreSettings)
InitUseCoreSettings(configuration);
var mail = BuildMailMessage(m);

34
common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
View File

@ -49,13 +49,13 @@ namespace ASC.Core.Common.Notify.Telegram
public void Configure(string name, CachedTelegramDao options)
{
Configure(options);
options.tgDao = Service.Get(name);
options.TgDao = Service.Get(name);
}
public void Configure(CachedTelegramDao options)
{
options.tgDao = Service.Value;
options.cache = AscCache.Memory;
options.TgDao = Service.Value;
options.Cache = AscCache.Memory;
options.Expiration = TimeSpan.FromMinutes(20);
options.PairKeyFormat = "tgUser:{0}:{1}";
@ -65,8 +65,8 @@ namespace ASC.Core.Common.Notify.Telegram
public class CachedTelegramDao
{
public TelegramDao tgDao { get; set; }
public ICache cache { get; set; }
public TelegramDao TgDao { get; set; }
public ICache Cache { get; set; }
public TimeSpan Expiration { get; set; }
public string PairKeyFormat { get; set; }
@ -75,25 +75,25 @@ namespace ASC.Core.Common.Notify.Telegram
public void Delete(Guid userId, int tenantId)
{
cache.Remove(string.Format(PairKeyFormat, userId, tenantId));
tgDao.Delete(userId, tenantId);
Cache.Remove(string.Format(PairKeyFormat, userId, tenantId));
TgDao.Delete(userId, tenantId);
}
public void Delete(int telegramId)
{
cache.Remove(string.Format(SingleKeyFormat, telegramId));
tgDao.Delete(telegramId);
Cache.Remove(string.Format(SingleKeyFormat, telegramId));
TgDao.Delete(telegramId);
}
public TelegramUser GetUser(Guid userId, int tenantId)
{
var key = string.Format(PairKeyFormat, userId, tenantId);
var user = cache.Get<TelegramUser>(key);
var user = Cache.Get<TelegramUser>(key);
if (user != null) return user;
user = tgDao.GetUser(userId, tenantId);
if (user != null) cache.Insert(key, user, Expiration);
user = TgDao.GetUser(userId, tenantId);
if (user != null) Cache.Insert(key, user, Expiration);
return user;
}
@ -101,20 +101,20 @@ namespace ASC.Core.Common.Notify.Telegram
{
var key = string.Format(SingleKeyFormat, telegramId);
var users = cache.Get<List<TelegramUser>>(key);
var users = Cache.Get<List<TelegramUser>>(key);
if (users != null) return users;
users = tgDao.GetUser(telegramId);
if (users.Any()) cache.Insert(key, users, Expiration);
users = TgDao.GetUser(telegramId);
if (users.Any()) Cache.Insert(key, users, Expiration);
return users;
}
public void RegisterUser(Guid userId, int tenantId, int telegramId)
{
tgDao.RegisterUser(userId, tenantId, telegramId);
TgDao.RegisterUser(userId, tenantId, telegramId);
var key = string.Format(PairKeyFormat, userId, tenantId);
cache.Insert(key, new TelegramUser { PortalUserId = userId, TenantId = tenantId, TelegramUserId = telegramId }, Expiration);
Cache.Insert(key, new TelegramUser { PortalUserId = userId, TenantId = tenantId, TelegramUserId = telegramId }, Expiration);
}
}

12
common/ASC.Core.Common/Security/CustomClaimsPrincipal.cs
View File

@ -5,19 +5,11 @@ namespace ASC.Core.Common.Security
{
public class CustomClaimsPrincipal : ClaimsPrincipal
{
private IIdentity identity { get; set; }
public override IIdentity Identity
{
get
{
return identity;
}
}
public override IIdentity Identity { get;}
public CustomClaimsPrincipal(ClaimsIdentity claimsIdentity, IIdentity identity) : base(claimsIdentity)
{
this.identity = identity;
this.Identity = identity;
}
}
}

12
common/ASC.Core.Common/Tests/XmlPatternProvider2Test.cs
View File

@ -49,17 +49,17 @@ namespace ASC.Common.Tests.Notify
class PatternResource
{
internal static string resource1
internal static string Resource1
{
get { return "resource1"; }
}
internal static string resource2
internal static string Resource2
{
get { return "resource2"; }
}
internal static string resource3
internal static string Resource3
{
get { return "resource3"; }
}
@ -97,8 +97,8 @@ namespace ASC.Common.Tests.Notify
var pattern = xmlPatternProvider2.GetPattern(new NotifyAction("id1"), "email.sender");
Assert.IsNotNull(pattern);
Assert.AreEqual("id1", pattern.ID);
Assert.AreEqual(PatternResource.resource1, pattern.Subject);
Assert.AreEqual(PatternResource.resource2, pattern.Body);
Assert.AreEqual(PatternResource.Resource1, pattern.Subject);
Assert.AreEqual(PatternResource.Resource2, pattern.Body);
Assert.AreEqual("ASC.Notify.Textile.TextileStyler,ASC.Notify.Textile", pattern.Styler);
Assert.AreEqual("html", pattern.ContentType);
@ -106,7 +106,7 @@ namespace ASC.Common.Tests.Notify
Assert.IsNotNull(pattern);
Assert.AreEqual("id1", pattern.ID);
Assert.AreEqual(string.Empty, pattern.Subject);
Assert.AreEqual(PatternResource.resource3, pattern.Body);
Assert.AreEqual(PatternResource.Resource3, pattern.Body);
Assert.AreEqual("ASC.Notify.Textile.JabberStyler,ASC.Notify.Textile", pattern.Styler);
Assert.AreEqual("html", pattern.ContentType);

4
common/ASC.Textile/TextileFormatterFormatting.cs
View File

@ -22,7 +22,7 @@ namespace Textile
private readonly Regex VelocityArguments =
new Regex("nostyle(?<arg>.*?)/nostyle", RegexOptions.IgnoreCase | RegexOptions.Singleline);
private string argMatchReplace(Match match)
private string ArgMatchReplace(Match match)
{
return match.Result("${arg}");
}
@ -74,7 +74,7 @@ namespace Textile
}
}
tmp = VelocityArguments.Replace(tmp, argMatchReplace);
tmp = VelocityArguments.Replace(tmp, ArgMatchReplace);
// Format the current line.
CurrentState.FormatLine(tmp);

56
products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
View File

@ -1224,7 +1224,7 @@ namespace ASC.Files.Core.Data
.Where(r => r.CurrentVersion);
var q4 = FromQuery(q3)
.Join(FilesDbContext.Security.DefaultIfEmpty(), r => r.file.Id.ToString(), s => s.EntryId, (f, s) => new DbFileQueryWithSecurity { DbFileQuery = f, Security = s })
.Join(FilesDbContext.Security.DefaultIfEmpty(), r => r.File.Id.ToString(), s => s.EntryId, (f, s) => new DbFileQueryWithSecurity { DbFileQuery = f, Security = s })
.Where(r => r.Security.TenantId == tenant)
.Where(r => r.Security.EntryType == FileEntryType.File)
.Where(r => r.Security.Security == Security.FileShare.Restrict)
@ -1332,8 +1332,8 @@ namespace ASC.Files.Core.Data
return dbFiles
.Select(r => new DbFileQuery
{
file = r,
root =
File = r,
Root =
FilesDbContext.Folders
.Join(FilesDbContext.Tree, a => a.Id, b => b.ParentId, (folder, tree) => new { folder, tree })
.Where(x => x.folder.TenantId == r.TenantId)
@ -1341,7 +1341,7 @@ namespace ASC.Files.Core.Data
.OrderByDescending(r => r.tree.Level)
.Select(r => r.folder)
.FirstOrDefault(),
shared =
Shared =
FilesDbContext.Security
.Where(x => x.EntryType == FileEntryType.File)
.Where(x => x.EntryId == r.Id.ToString())
@ -1354,15 +1354,15 @@ namespace ASC.Files.Core.Data
return dbFiles
.Select(r => new DbFileQuery
{
file = r,
root = FilesDbContext.Folders
File = r,
Root = FilesDbContext.Folders
.Join(FilesDbContext.Tree, a => a.Id, b => b.ParentId, (folder, tree) => new { folder, tree })
.Where(x => x.folder.TenantId == r.TenantId)
.Where(x => x.tree.FolderId == r.FolderId)
.OrderByDescending(r => r.tree.Level)
.Select(r => r.folder)
.FirstOrDefault(),
shared = true
Shared = true
});
}
@ -1370,24 +1370,24 @@ namespace ASC.Files.Core.Data
{
var file = ServiceProvider.GetService<File<int>>();
if (r == null) return null;
file.ID = r.file.Id;
file.Title = r.file.Title;
file.FolderID = r.file.FolderId;
file.CreateOn = TenantUtil.DateTimeFromUtc(r.file.CreateOn);
file.CreateBy = r.file.CreateBy;
file.Version = r.file.Version;
file.VersionGroup = r.file.VersionGroup;
file.ContentLength = r.file.ContentLength;
file.ModifiedOn = TenantUtil.DateTimeFromUtc(r.file.ModifiedOn);
file.ModifiedBy = r.file.ModifiedBy;
file.RootFolderType = r.root?.FolderType ?? default;
file.RootFolderCreator = r.root?.CreateBy ?? default;
file.RootFolderId = r.root?.Id ?? default;
file.Shared = r.shared;
file.ConvertedType = r.file.ConvertedType;
file.Comment = r.file.Comment;
file.Encrypted = r.file.Encrypted;
file.Forcesave = r.file.Forcesave;
file.ID = r.File.Id;
file.Title = r.File.Title;
file.FolderID = r.File.FolderId;
file.CreateOn = TenantUtil.DateTimeFromUtc(r.File.CreateOn);
file.CreateBy = r.File.CreateBy;
file.Version = r.File.Version;
file.VersionGroup = r.File.VersionGroup;
file.ContentLength = r.File.ContentLength;
file.ModifiedOn = TenantUtil.DateTimeFromUtc(r.File.ModifiedOn);
file.ModifiedBy = r.File.ModifiedBy;
file.RootFolderType = r.Root?.FolderType ?? default;
file.RootFolderCreator = r.Root?.CreateBy ?? default;
file.RootFolderId = r.Root?.Id ?? default;
file.Shared = r.Shared;
file.ConvertedType = r.File.ConvertedType;
file.Comment = r.File.Comment;
file.Encrypted = r.File.Encrypted;
file.Forcesave = r.File.Forcesave;
return file;
}
@ -1439,9 +1439,9 @@ namespace ASC.Files.Core.Data
public class DbFileQuery
{
public DbFile file { get; set; }
public DbFolder root { get; set; }
public bool shared { get; set; }
public DbFile File { get; set; }
public DbFolder Root { get; set; }
public bool Shared { get; set; }
}
public class DbFileQueryWithSecurity

48
products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
View File

@ -1049,8 +1049,8 @@ namespace ASC.Files.Core.Data
return dbFiles
.Select(r => new DbFolderQuery
{
folder = r,
root = FilesDbContext.Folders
Folder = r,
Root = FilesDbContext.Folders
.Join(FilesDbContext.Tree, a => a.Id, b => b.ParentId, (folder, tree) => new { folder, tree })
.Where(x => x.folder.TenantId == r.TenantId)
.Where(x => x.tree.FolderId == r.ParentId)
@ -1058,7 +1058,7 @@ namespace ASC.Files.Core.Data
.Select(r => r.folder)
.Take(1)
.FirstOrDefault(),
shared = FilesDbContext.Security
Shared = FilesDbContext.Security
.Where(r => r.EntryType == FileEntryType.Folder)
.Where(x => x.EntryId == r.Id.ToString())
.Any()
@ -1070,8 +1070,8 @@ namespace ASC.Files.Core.Data
return dbFiles
.Select(r => new DbFolderQuery
{
folder = r,
root = FilesDbContext.Folders
Folder = r,
Root = FilesDbContext.Folders
.Join(FilesDbContext.Tree, a => a.Id, b => b.ParentId, (folder, tree) => new { folder, tree })
.Where(x => x.folder.TenantId == r.TenantId)
.Where(x => x.tree.FolderId == r.ParentId)
@ -1079,7 +1079,7 @@ namespace ASC.Files.Core.Data
.Select(x => x.folder)
.Take(1)
.FirstOrDefault(),
shared = true
Shared = true
});
}
@ -1087,20 +1087,20 @@ namespace ASC.Files.Core.Data
{
if (r == null) return null;
var result = ServiceProvider.GetService<Folder<int>>();
result.ID = r.folder.Id;
result.ParentFolderID = r.folder.ParentId;
result.Title = r.folder.Title;
result.CreateOn = TenantUtil.DateTimeFromUtc(r.folder.CreateOn);
result.CreateBy = r.folder.CreateBy;
result.ModifiedOn = TenantUtil.DateTimeFromUtc(r.folder.ModifiedOn);
result.ModifiedBy = r.folder.ModifiedBy;
result.FolderType = r.folder.FolderType;
result.TotalSubFolders = r.folder.FoldersCount;
result.TotalFiles = r.folder.FilesCount;
result.RootFolderType = r.root?.FolderType ?? default;
result.RootFolderCreator = r.root?.CreateBy ?? default;
result.RootFolderId = r.root?.Id ?? default;
result.Shared = r.shared;
result.ID = r.Folder.Id;
result.ParentFolderID = r.Folder.ParentId;
result.Title = r.Folder.Title;
result.CreateOn = TenantUtil.DateTimeFromUtc(r.Folder.CreateOn);
result.CreateBy = r.Folder.CreateBy;
result.ModifiedOn = TenantUtil.DateTimeFromUtc(r.Folder.ModifiedOn);
result.ModifiedBy = r.Folder.ModifiedBy;
result.FolderType = r.Folder.FolderType;
result.TotalSubFolders = r.Folder.FoldersCount;
result.TotalFiles = r.Folder.FilesCount;
result.RootFolderType = r.Root?.FolderType ?? default;
result.RootFolderCreator = r.Root?.CreateBy ?? default;
result.RootFolderId = r.Root?.Id ?? default;
result.Shared = r.Shared;
switch (result.FolderType)
{
@ -1192,7 +1192,7 @@ namespace ASC.Files.Core.Data
.Where(r => r.FolderType == FolderType.DEFAULT);
var q4 = FromQuery(q3)
.Join(FilesDbContext.Security.DefaultIfEmpty(), r => r.folder.Id.ToString(), s => s.EntryId, (f, s) => new DbFolderQueryWithSecurity { DbFolderQuery = f, Security = s })
.Join(FilesDbContext.Security.DefaultIfEmpty(), r => r.Folder.Id.ToString(), s => s.EntryId, (f, s) => new DbFolderQueryWithSecurity { DbFolderQuery = f, Security = s })
.Where(r => r.Security.TenantId == tenant)
.Where(r => r.Security.EntryType == FileEntryType.Folder)
.Where(r => r.Security.Security == FileShare.Restrict)
@ -1280,9 +1280,9 @@ namespace ASC.Files.Core.Data
public class DbFolderQuery
{
public DbFolder folder { get; set; }
public DbFolder root { get; set; }
public bool shared { get; set; }
public DbFolder Folder { get; set; }
public DbFolder Root { get; set; }
public bool Shared { get; set; }
}
public class DbFolderQueryWithSecurity

2
web/ASC.Web.Core/Calendars/IEvent.cs
View File

@ -76,7 +76,7 @@ namespace ASC.Web.Core.Calendars
#endregion
}
public interface IEvent : IiCalFormatView
public interface IEvent : IICalFormatView
{
string Id { get; }
string Uid { get; }

2
web/ASC.Web.Core/Calendars/IExternalCalendar.cs
View File

@ -49,7 +49,7 @@ namespace ASC.Web.Core.Calendars
#endregion
}
public interface ICalendar : IiCalFormatView
public interface ICalendar : IICalFormatView
{
string Id { get; }
string Name { get; }

2
web/ASC.Web.Core/Calendars/ITodo.cs
View File

@ -41,7 +41,7 @@ namespace ASC.Web.Core.Calendars
#endregion
}
public interface ITodo : IiCalFormatView
public interface ITodo : IICalFormatView
{
string Id { get; }
string Uid { get; }

2
web/ASC.Web.Core/Calendars/IiCalFormatView.cs
View File

@ -26,7 +26,7 @@
namespace ASC.Web.Core.Calendars
{
public interface IiCalFormatView
public interface IICalFormatView
{
string ToiCalFormat();
}

16
web/ASC.Web.Core/Calendars/RecurrenceRule.cs
View File

@ -87,7 +87,7 @@ namespace ASC.Web.Core.Calendars
Hourly = 9
}
public class RecurrenceRule : IiCalFormatView, ICloneable
public class RecurrenceRule : IICalFormatView, ICloneable
{
public static RecurrenceRule Parse(EventRepeatType repeatType)
{
@ -198,7 +198,7 @@ namespace ASC.Web.Core.Calendars
public struct ExDate
{
public DateTime Date { get; set; }
public bool isDateTime { get; set; }
public bool IsDateTime { get; set; }
}
public List<ExDate> ExDates { get; set; }
@ -576,7 +576,7 @@ namespace ASC.Web.Core.Calendars
if (removeExDates && ExDates != null)
{
foreach (var exDate in ExDates)
dates.RemoveAll(dt => (exDate.isDateTime && dt == exDate.Date) || (!exDate.isDateTime && dt.Date == exDate.Date));
dates.RemoveAll(dt => (exDate.IsDateTime && dt == exDate.Date) || (!exDate.IsDateTime && dt.Date == exDate.Date));
}
dates.RemoveAll(dt => dt < fromDate || dt > endDate);
@ -593,7 +593,7 @@ namespace ASC.Web.Core.Calendars
{
if (ExDates != null && ExDates.Count > 0)
{
return dates.FindAll(dt => dt >= fromDate && !ExDates.Exists(exDate => (exDate.isDateTime && dt == exDate.Date) || (!exDate.isDateTime && dt.Date == exDate.Date)))
return dates.FindAll(dt => dt >= fromDate && !ExDates.Exists(exDate => (exDate.IsDateTime && dt == exDate.Date) || (!exDate.IsDateTime && dt.Date == exDate.Date)))
.Count < maxCount;
}
else
@ -802,7 +802,7 @@ namespace ASC.Web.Core.Calendars
sb.AppendFormat(";exdates=");
foreach (var d in this.ExDates)
{
if (d.isDateTime)
if (d.IsDateTime)
sb.Append(d.Date.ToString("yyyyMMdd'T'HHmmssK") + ",");
else
sb.Append(d.Date.ToString("yyyyMMdd") + ",");
@ -925,7 +925,7 @@ namespace ASC.Web.Core.Calendars
foreach (var date in val.Split(','))
{
if (DateTime.TryParseExact(date.ToUpper(), _dateTimeFormats, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out var dt))
rr.ExDates.Add(new ExDate() { Date = dt, isDateTime = (date.ToLower().IndexOf('t') >= 0) });
rr.ExDates.Add(new ExDate() { Date = dt, IsDateTime = (date.ToLower().IndexOf('t') >= 0) });
}
break;
@ -948,13 +948,13 @@ namespace ASC.Web.Core.Calendars
if (this.ExDates.Count > 0)
{
sb.Append("\r\nEXDATE");
if (!this.ExDates[0].isDateTime)
if (!this.ExDates[0].IsDateTime)
sb.Append(";VALUE=DATE");
sb.Append(":");
foreach (var d in this.ExDates)
{
if (d.isDateTime)
if (d.IsDateTime)
sb.Append(d.Date.ToString("yyyyMMdd'T'HHmmssK"));
else
sb.Append(d.Date.ToString("yyyyMMdd"));

48
web/ASC.Web.Core/Helpers/ImageHelpers.cs
View File

@ -126,7 +126,7 @@ namespace ASC.Web.Studio.Helpers
readonly int _widthPreview;
readonly int _heightPreview;
public IDataStore store
public IDataStore Store
{
get;
set;
@ -163,16 +163,16 @@ namespace ASC.Web.Studio.Helpers
ep.Param[0] = new EncoderParameter(Encoder.Quality, (long)90);
var icJPG = getCodecInfo("image/jpeg");
var icJPG = GetCodecInfo("image/jpeg");
if (!string.IsNullOrEmpty(imageInfo.Name) && imageInfo.Name.Contains("."))
{
var indexDot = imageInfo.Name.ToLower().LastIndexOf(".");
if (imageInfo.Name.ToLower().IndexOf("png", indexDot) > indexDot)
icJPG = getCodecInfo("image/png");
icJPG = GetCodecInfo("image/png");
else if (imageInfo.Name.ToLower().IndexOf("gif", indexDot) > indexDot)
icJPG = getCodecInfo("image/png");
icJPG = GetCodecInfo("image/png");
}
Bitmap thumbnail;
@ -181,7 +181,7 @@ namespace ASC.Web.Studio.Helpers
imageInfo.ThumbnailWidth = realWidth;
imageInfo.ThumbnailHeight = realHeight;
if (store == null)
if (Store == null)
image.Save(outputPath);
else
{
@ -189,7 +189,7 @@ namespace ASC.Web.Studio.Helpers
var ms = new MemoryStream();
image.Save(ms, icJPG, ep);
ms.Seek(0, SeekOrigin.Begin);
store.Save(outputPath, ms);
Store.Save(outputPath, ms);
ms.Dispose();
}
return;
@ -234,7 +234,7 @@ namespace ASC.Web.Studio.Helpers
graphic.DrawImage(image, rect);
}
if (store == null)
if (Store == null)
thumbnail.Save(outputPath, icJPG, ep);
else
{
@ -242,7 +242,7 @@ namespace ASC.Web.Studio.Helpers
var ms = new MemoryStream();
thumbnail.Save(ms, icJPG, ep);
ms.Seek(0, SeekOrigin.Begin);
store.Save(outputPath, ms);
Store.Save(outputPath, ms);
ms.Dispose();
}
@ -270,7 +270,7 @@ namespace ASC.Web.Studio.Helpers
var widthPreview = realWidth;
var ep = new EncoderParameters(1);
var icJPG = getCodecInfo("image/jpeg");
var icJPG = GetCodecInfo("image/jpeg");
ep.Param[0] = new EncoderParameter(Encoder.Quality, (long)90);
if (realWidth <= _widthPreview && realHeight <= _heightPreview)
@ -278,7 +278,7 @@ namespace ASC.Web.Studio.Helpers
imageInfo.PreviewWidth = widthPreview;
imageInfo.PreviewHeight = heightPreview;
if (store == null)
if (Store == null)
image.Save(outputPath);
else
{
@ -286,7 +286,7 @@ namespace ASC.Web.Studio.Helpers
var ms = new MemoryStream();
image.Save(ms, icJPG, ep);
ms.Seek(0, SeekOrigin.Begin);
store.Save(outputPath, ms);
Store.Save(outputPath, ms);
ms.Dispose();
}
@ -322,7 +322,7 @@ namespace ASC.Web.Studio.Helpers
graphic.DrawImage(image, 0, 0, widthPreview, heightPreview);
}
if (store == null)
if (Store == null)
preview.Save(outputPath, icJPG, ep);
else
{
@ -330,7 +330,7 @@ namespace ASC.Web.Studio.Helpers
var ms = new MemoryStream();
preview.Save(ms, icJPG, ep);
ms.Seek(0, SeekOrigin.Begin);
store.Save(outputPath, ms);
Store.Save(outputPath, ms);
ms.Dispose();
}
@ -341,7 +341,7 @@ namespace ASC.Web.Studio.Helpers
{
try
{
using var stream = store.GetReadStream(path);
using var stream = Store.GetReadStream(path);
using var image = Image.FromStream(stream);
if (back)
{
@ -353,10 +353,10 @@ namespace ASC.Web.Studio.Helpers
}
var ep = new EncoderParameters(1);
var icJPG = getCodecInfo("image/jpeg");
var icJPG = GetCodecInfo("image/jpeg");
ep.Param[0] = new EncoderParameter(Encoder.Quality, (long)100);
if (store == null)
if (Store == null)
{
image.Save(outputPath, icJPG, ep);
}
@ -365,15 +365,15 @@ namespace ASC.Web.Studio.Helpers
using var ms = new MemoryStream();
image.Save(ms, icJPG, ep);
ms.Seek(0, SeekOrigin.Begin);
store.Save(outputPath, ms);
Store.Save(outputPath, ms);
}
store.Delete(path);
Store.Delete(path);
}
catch { }
}
private static ImageCodecInfo getCodecInfo(string mt)
private static ImageCodecInfo GetCodecInfo(string mt)
{
var ici = ImageCodecInfo.GetImageEncoders();
var idx = 0;
@ -435,7 +435,7 @@ namespace ASC.Web.Studio.Helpers
maxWidthPreview,
maxHeightPreview)
{
store = store
Store = store
};
_generator.DoThumbnail(path, outputPath, ref imageInfo);
@ -448,7 +448,7 @@ namespace ASC.Web.Studio.Helpers
maxWidthPreview,
maxHeightPreview)
{
store = store
Store = store
};
_generator.DoThumbnail(stream, outputPath, ref imageInfo);
@ -474,7 +474,7 @@ namespace ASC.Web.Studio.Helpers
maxWidthPreview,
maxHeightPreview)
{
store = store
Store = store
};
_generator.DoThumbnail(stream, outputPath, ref imageInfo);
}
@ -510,7 +510,7 @@ namespace ASC.Web.Studio.Helpers
maxWidthPreview,
maxHeightPreview)
{
store = store
Store = store
};
_generator.DoPreviewImage(stream, outputPath, ref imageInfo);
@ -525,7 +525,7 @@ namespace ASC.Web.Studio.Helpers
maxWidthPreview,
maxHeightPreview)
{
store = store
Store = store
};
_generator.RotateImage(path, outputPath, back);

6
web/ASC.Web.Core/Mail/MailServiceHelper.cs
View File

@ -128,7 +128,7 @@ namespace ASC.Web.Core.Mail
public bool IsMailServerAvailable()
{
return _GetMailServerInfo() != null;
return InnerGetMailServerInfo() != null;
}
@ -136,10 +136,10 @@ namespace ASC.Web.Core.Mail
{
DemandPermission();
return _GetMailServerInfo();
return InnerGetMailServerInfo();
}
private MailServerInfo _GetMailServerInfo()
private MailServerInfo InnerGetMailServerInfo()
{
var cachedData = Cache.Get<Tuple<MailServerInfo>>(CacheKey);

8
web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
View File

@ -142,7 +142,7 @@ namespace ASC.Web.Studio.Core.Notify
Title = HtmlUtil.GetText(f.Title, 512),
URL = commonLinkUtility.GetFullAbsolutePath(f.ItemUrl),
BreadCrumbs = new string[0],
Action = getWhatsNewActionText(f)
Action = GetWhatsNewActionText(f)
}).ToList());
@ -165,7 +165,7 @@ namespace ASC.Web.Studio.Core.Notify
Title = HtmlUtil.GetText(prawbc.Title, 512),
URL = commonLinkUtility.GetFullAbsolutePath(prawbc.ItemUrl),
BreadCrumbs = new string[0],
Action = getWhatsNewActionText(prawbc)
Action = GetWhatsNewActionText(prawbc)
});
}
@ -185,7 +185,7 @@ namespace ASC.Web.Studio.Core.Notify
Title = HtmlUtil.GetText(ls.Title, 512),
URL = commonLinkUtility.GetFullAbsolutePath(ls.ItemUrl),
BreadCrumbs = i == 0 ? new string[1] { gr.Key } : new string[0],
Action = getWhatsNewActionText(ls)
Action = GetWhatsNewActionText(ls)
});
}
}
@ -214,7 +214,7 @@ namespace ASC.Web.Studio.Core.Notify
}
}
private static string getWhatsNewActionText(FeedMin feed)
private static string GetWhatsNewActionText(FeedMin feed)
{
if (feed.Module == ASC.Feed.Constants.BookmarksModule)

14
web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
View File

@ -50,13 +50,13 @@ namespace ASC.Web.Core.WhiteLabel
public string CompanyLogoFileName { get; set; }
[JsonPropertyName("Default")]
internal bool _isDefault { get; set; }
internal bool IsDefault { get; set; }
public ISettings GetDefault(IServiceProvider serviceProvider)
{
return new TenantInfoSettings()
{
_isDefault = true
IsDefault = true
};
}
@ -99,7 +99,7 @@ namespace ASC.Web.Core.WhiteLabel
public void RestoreDefaultLogo(TenantInfoSettings tenantInfoSettings, TenantLogoManager tenantLogoManager)
{
tenantInfoSettings._isDefault = true;
tenantInfoSettings.IsDefault = true;
var store = StorageFactory.GetStorage(TenantManager.GetCurrentTenant().TenantId.ToString(), "logo");
try
@ -118,7 +118,7 @@ namespace ASC.Web.Core.WhiteLabel
{
var store = StorageFactory.GetStorage(TenantManager.GetCurrentTenant().TenantId.ToString(), "logo");
if (!tenantInfoSettings._isDefault)
if (!tenantInfoSettings.IsDefault)
{
try
{
@ -136,14 +136,14 @@ namespace ASC.Web.Core.WhiteLabel
store.Save(companyLogoFileName, memory);
tenantInfoSettings.CompanyLogoFileName = companyLogoFileName;
}
tenantInfoSettings._isDefault = false;
tenantInfoSettings.IsDefault = false;
tenantLogoManager.RemoveMailLogoDataFromCache();
}
public string GetAbsoluteCompanyLogoPath(TenantInfoSettings tenantInfoSettings)
{
if (tenantInfoSettings._isDefault)
if (tenantInfoSettings.IsDefault)
{
return WebImageSupplier.GetAbsoluteWebPath("onlyoffice_logo/dark_general.png");
}
@ -157,7 +157,7 @@ namespace ASC.Web.Core.WhiteLabel
/// </summary>
public Stream GetStorageLogoData(TenantInfoSettings tenantInfoSettings)
{
if (tenantInfoSettings._isDefault) return null;
if (tenantInfoSettings.IsDefault) return null;
var storage = StorageFactory.GetStorage(TenantManager.GetCurrentTenant().TenantId.ToString(CultureInfo.InvariantCulture), "logo");