This commit is contained in:
2022-09-06 16:04:17 +00:00
parent 715cb183a0
commit d6e7e9d6b7
5 changed files with 222 additions and 224 deletions

View File

@@ -74,69 +74,69 @@ namespace rockfishCore.Controllers
}
[HttpPost("isspam/{account}/{id}")]
public JsonResult IsSpam([FromRoute] string account, [FromRoute] uint id)
{
// [HttpPost("isspam/{account}/{id}")]
// public JsonResult IsSpam([FromRoute] string account, [FromRoute] uint id)
// {
RfMail.rfMailAccount acct = RfMail.rfMailAccount.support;
if (account.Contains("sales"))
{
acct = RfMail.rfMailAccount.sales;
}
// RfMail.rfMailAccount acct = RfMail.rfMailAccount.support;
// if (account.Contains("sales"))
// {
// acct = RfMail.rfMailAccount.sales;
// }
try
{
RfMail.HandleSpamMessage(id, acct);
return Json(new { msg = "message processed as spam", ok = 1 });
}
catch (Exception ex)
{
return Json(new { msg = ex.Message, error = 1 });
}
}
// try
// {
// RfMail.HandleSpamMessage(id, acct);
// return Json(new { msg = "message processed as spam", ok = 1 });
// }
// catch (Exception ex)
// {
// return Json(new { msg = ex.Message, error = 1 });
// }
// }
[HttpPost("movetosub/{account}/{id}")]
public JsonResult MoveToSub([FromRoute] string account, [FromRoute] uint id)
{
// [HttpPost("movetosub/{account}/{id}")]
// public JsonResult MoveToSub([FromRoute] string account, [FromRoute] uint id)
// {
RfMail.rfMailAccount acct = RfMail.rfMailAccount.support;
if (account.Contains("sales"))
{
acct = RfMail.rfMailAccount.sales;
}
// RfMail.rfMailAccount acct = RfMail.rfMailAccount.support;
// if (account.Contains("sales"))
// {
// acct = RfMail.rfMailAccount.sales;
// }
try
{
RfMail.MoveAndMarkRead(id, acct, true);
return Json(new { msg = "message processed as spam", ok = 1 });
}
catch (Exception ex)
{
return Json(new { msg = ex.Message, error = 1 });
}
}
// try
// {
// RfMail.MoveAndMarkRead(id, acct, true);
// return Json(new { msg = "message processed as spam", ok = 1 });
// }
// catch (Exception ex)
// {
// return Json(new { msg = ex.Message, error = 1 });
// }
// }
[HttpPost("movetonotsub/{account}/{id}")]
public JsonResult MoveToNotSub([FromRoute] string account, [FromRoute] uint id)
{
// [HttpPost("movetonotsub/{account}/{id}")]
// public JsonResult MoveToNotSub([FromRoute] string account, [FromRoute] uint id)
// {
RfMail.rfMailAccount acct = RfMail.rfMailAccount.support;
if (account.Contains("sales"))
{
acct = RfMail.rfMailAccount.sales;
}
// RfMail.rfMailAccount acct = RfMail.rfMailAccount.support;
// if (account.Contains("sales"))
// {
// acct = RfMail.rfMailAccount.sales;
// }
try
{
RfMail.MoveAndMarkRead(id, acct, false);
return Json(new { msg = "message processed as spam", ok = 1 });
}
catch (Exception ex)
{
return Json(new { msg = ex.Message, error = 1 });
}
}
// try
// {
// RfMail.MoveAndMarkRead(id, acct, false);
// return Json(new { msg = "message processed as spam", ok = 1 });
// }
// catch (Exception ex)
// {
// return Json(new { msg = ex.Message, error = 1 });
// }
// }
// //------------------------------------------------------

View File

@@ -29,16 +29,16 @@ namespace rockfishCore.Controllers
{
switch (service)
{
case "MailMirror":
Ret.Status = RfMail.MailIsMirroringProperly();
{
DateTime? sslExpiry = OpsDiagnostics.SSLCertExpiryDate("https://mail.ayanova.com/");
if (sslExpiry != null)
{
Ret.ServiceCheckError += "Mail server SSL expires: " + sslExpiry.ToString();
}
}
break;
// case "MailMirror":
// Ret.Status = RfMail.MailIsMirroringProperly();
// {
// DateTime? sslExpiry = OpsDiagnostics.SSLCertExpiryDate("https://mail.ayanova.com/");
// if (sslExpiry != null)
// {
// Ret.ServiceCheckError += "Mail server SSL expires: " + sslExpiry.ToString();
// }
// }
// break;
case "AyaNovaSite":
Ret.Status = OpsDiagnostics.CheckWebsite("https://www.ayanova.com/", "Ground Zero Tech-Works Inc.");
{
@@ -67,17 +67,17 @@ namespace rockfishCore.Controllers
case "Forum":
Ret.Status = OpsDiagnostics.CheckWebsite("http://forum.ayanova.com/", "<title>AyaNova forum</title>");//changed july 2021 but unreleased yet
break;
case "DevOps":
Ret.Status = OpsDiagnostics.CheckWebsite("https://test.helloayanova.com/api/v8/", "AyaNova server");
//devops https check url is https://www.helloayanova.com/
{
DateTime? sslExpiry = OpsDiagnostics.SSLCertExpiryDate("https://www.helloayanova.com/");
if (sslExpiry != null)
{
Ret.ServiceCheckError += "DEVOPS SSL expires: " + sslExpiry.ToString();
}
}
break;
// case "DevOps":
// Ret.Status = OpsDiagnostics.CheckWebsite("https://test.helloayanova.com/api/v8/", "AyaNova server");
// //devops https check url is https://www.helloayanova.com/
// {
// DateTime? sslExpiry = OpsDiagnostics.SSLCertExpiryDate("https://www.helloayanova.com/");
// if (sslExpiry != null)
// {
// Ret.ServiceCheckError += "DEVOPS SSL expires: " + sslExpiry.ToString();
// }
// }
// break;
case "Backup":
Ret.Status = OpsDiagnostics.VerifyBackups();
break;