Commit 65445ce5 by Urvil Shah

more Beautify.

parent 0e5286d6
Pipeline #7263 passed with stages
in 22 minutes 46 seconds
......@@ -64,7 +64,7 @@ namespace Mobile.Search.Web.Controllers
{
html = value.AsString();
}
templateDict.Add(document["templateKey"].AsString(),html);
templateDict.Add(document["templateKey"].AsString(), html);
}
// sort dictionary
......@@ -75,7 +75,7 @@ namespace Mobile.Search.Web.Controllers
// GET: Template/Create
public ActionResult Create()
{
return View("Edit", new KeyValuePair<string,string>(Chronos.GenerateRandom.String(6), "<html></html>"));
return View("Edit", new KeyValuePair<string, string>(Chronos.GenerateRandom.String(6), "<html></html>"));
}
public ActionResult CreateFroala()
{
......@@ -96,10 +96,10 @@ namespace Mobile.Search.Web.Controllers
return Json(FroalaEditor.S3.GetHash(config), JsonRequestBehavior.AllowGet);
}
// GET: Template/Edit/5
public ActionResult Edit( string templateKey)
public ActionResult Edit(string templateKey)
{
var json = _dynamoClient.Get("prd_2click_templates", "templateKey", templateKey);
var j = JObject.Parse(json);
......@@ -148,46 +148,46 @@ namespace Mobile.Search.Web.Controllers
try
{
string url = "http://config.minbox.email/Offer/Create/template_attribute=";
Match m;
string HRefPattern = "href\\s*=\\s*(?:[\"'](?<1>[^\"']*)[\"']|(?<1>\\S+))";
// _dynamoClient.WriteSingle("prd_2click_templates", d);
m = Regex.Match(value, HRefPattern,
RegexOptions.IgnoreCase | RegexOptions.Compiled,
TimeSpan.FromSeconds(1));
while (m.Success)
{
m = Regex.Match(value, HRefPattern,
RegexOptions.IgnoreCase | RegexOptions.Compiled,
TimeSpan.FromSeconds(1));
while (m.Success)
{
string to_replace = String.Format("{{{{WrapUrl('{0}')}}}}", m.Groups[1]);
value=value.Replace(m.Groups[1].Value, to_replace);
m = m.NextMatch();
}
value = value.Replace(m.Groups[1].Value, to_replace);
m = m.NextMatch();
}
var d = new Dictionary<string, object>
{
{"templateKey", key.ToLower()},
{"html", value}
};
};
if (isSendEmail)
{
if(sendEmail(value, EmailId))
if (sendEmail(value, EmailId))
{
return Json(new { status = "Success" });
}
else
{
return Json(new { status = "Failed" });
}
}
else
{
_dynamoClient.WriteSingle("prd_2click_templates", d);
}
url = url+ key;
url = url + key;
return Redirect(url);
}
......@@ -198,33 +198,33 @@ namespace Mobile.Search.Web.Controllers
}
}
public ActionResult SendEmail(string value,string EmailId)
public ActionResult SendEmail(string value, string EmailId)
{
return View();
}
public bool sendEmail(string value,string email_id)
public bool sendEmail(string value, string email_id)
{
MailAddress from = new MailAddress(FromEmail, "TemplateTest");
MailAddress to = new MailAddress(email_id);
MailMessage message = new MailMessage(from, to);
message.Subject = "Template Testing Via Html Editor";
message.Body = value;
message.IsBodyHtml = true;
message.IsBodyHtml = true;
SmtpClient client = new SmtpClient();
client.Port = Port;
if(email_id.Contains("minbox"))
if (email_id.Contains("minbox"))
{
client.Host = SmtpMinboxHost;
}
else
{
client.Host = SmtpSendGridHost;
System.Net.NetworkCredential credentials = new System.Net.NetworkCredential(SmtpSendGridUsername,SmtpSendGridPassword);
System.Net.NetworkCredential credentials = new System.Net.NetworkCredential(SmtpSendGridUsername, SmtpSendGridPassword);
client.Credentials = credentials;
}
// client.Port = Port;
......@@ -232,16 +232,16 @@ namespace Mobile.Search.Web.Controllers
{
client.Send(message);
return true;
}
catch (Exception ex)
{
Console.WriteLine("Exception caught in CreateTestMessage4(): {0}",
ex.ToString());
return false;
}
}
}
......@@ -289,10 +289,10 @@ namespace Mobile.Search.Web.Controllers
{
var jObj = JObject.Parse(x);
return new Dictionary<string, string>()
{
{"keyword", (string)jObj["keyword"]},
{"advertiserUrl", (string)jObj["advertiserUrl"]},
};
{
{"keyword", (string)jObj["keyword"]},
{"advertiserUrl", (string)jObj["advertiserUrl"]},
};
}).ToList();
return blacklist;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment