case 4180

source/WinFormApp/AssemblyInfo.cs

@@ -62,4 +62,4 @@ using System.Runtime.InteropServices;
 [assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
 //[assembly: log4net.Config.XmlConfigurator(Watch=true)]
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyFileVersionAttribute("7.6.15.0")]
+[assembly: AssemblyFileVersionAttribute("7.6.16.0")]

source/bizobjects/AyaLib/AssemblyInfo.cs

@@ -64,4 +64,4 @@ using System.Security.Permissions;
 // Configure log4net using the .config file
 //[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
 //[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )] 
-[assembly: AssemblyFileVersionAttribute("7.6.15.0")]
+[assembly: AssemblyFileVersionAttribute("7.6.16.0")]

source/bizobjects/AyaLib/GZTW.AyaNova.BLL/AyaBizUtils.cs

@@ -840,7 +840,7 @@ namespace GZTW.AyaNova.BLL
                 //sent key then asked to cancel
                 case "1496793532":
                 #endregion
-                    
+
                 #region Case 3517
                 // "RegisteredTo": "The Underground Sprinkler Co"
                 //sent key then asked to cancel - VERY SKETCHY CUSTOMER
@@ -969,7 +969,7 @@ namespace GZTW.AyaNova.BLL
                 //SHA256 shaM = new SHA256Managed();
                 //UTF8Encoding enc = new UTF8Encoding();
                 //string shash = BitConverter.ToString(shaM.ComputeHash(enc.GetBytes(schema))).Replace("-", "");
-                if (nSchemaCount != 1406) 
+                if (nSchemaCount != 1406)
                 {
 
                     //case 1142, apparently if it's sql2000 they can get this as well so adjusting error message
@@ -1013,7 +1013,7 @@ namespace GZTW.AyaNova.BLL
             #endregion
 
             #region Validate subscription allows this build date of biz object library
-            
+
             // if the subscription has expired and it was built after the subsription expired
             //then throw the exception
             if ((GlobalX.SubscriptionExpired && (Timestamp.BuildAt > ExpiryDate)))
@@ -1345,7 +1345,7 @@ namespace GZTW.AyaNova.BLL
 
         }
 
-       
+
 
         /// <summary>
         /// downloaded trial expired
@@ -1579,7 +1579,7 @@ namespace GZTW.AyaNova.BLL
         //    return "";
         //}
 
-       
+
         //case 2094
         /// <summary>
         /// Get subscription expiry date for plugin
@@ -2565,8 +2565,8 @@ namespace GZTW.AyaNova.BLL
 #if(DEBUG)
                             throw new System.ArgumentException("AyaBizUtils->GetSearchResultFor: " + RootObjectType.ToString() + " IS NOT IMPLEMENTED");
 #else
-                     //case 1116
+                            //case 1116
-                    return new SearchResult();
+                            return new SearchResult();
 #endif
 
                         }
@@ -2639,7 +2639,7 @@ namespace GZTW.AyaNova.BLL
 #else
                     //In a release build only order by first 4 columns for performance
                     //anything more is pretty much redundant 99.9% of the time
-                    if(nSortColumnsAddedToCriteria>4) break;
+                    if (nSortColumnsAddedToCriteria > 4) break;
 #endif
 
                     sCurrentColumnName = TabRow["CM"].ToString();
@@ -2686,7 +2686,7 @@ namespace GZTW.AyaNova.BLL
                 //case 3603
 #if (DEBUG)
                 throw;
-#else          
+#else
                 return "";
 #endif
             }
@@ -2816,7 +2816,7 @@ namespace GZTW.AyaNova.BLL
                 //case 3603
 #if (DEBUG)
                 throw;
-#else          
+#else
                 return "";
 #endif
             }
@@ -4497,13 +4497,30 @@ namespace GZTW.AyaNova.BLL
             int startIndex = s.IndexOf(openTag);
             if (startIndex == -1)
                 throw new System.IndexOutOfRangeException("ExtractString->Error: open tag not found");
-            startIndex+=openTag.Length;
+            startIndex += openTag.Length;
 
             int endIndex = s.IndexOf(closeTag, startIndex);
-            if(endIndex==-1)
+            if (endIndex == -1)
                 throw new System.IndexOutOfRangeException("ExtractString->Error: closing tag not found");
             return s.Substring(startIndex, endIndex - startIndex);
         }
+
+
+
+
+
+
+        /// <summary>
+        /// Replace bare linefeeds issue case 4180
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns>string with any bare \n replaced with \r\n</returns>
+        public static string ReplaceBareLineFeeds(string s)
+        {
+            //the string may and probably does already have \r\n in addition to bare line feeds
+            //so replace those with bare linefeeds so it's *all* bare linefeeds then fix up
+            return s.Replace("\r\n", "\n").Replace("\n", "\r\n");
+        }
         #endregion misc string helpers
 
         #region Regular expressions

source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessClientNotifications.cs

@@ -89,7 +89,7 @@ namespace GZTW.AyaNova.BLL
 
                     //email.SetFromMimeText(n.GetContentAsString);
                     email.Mailer = "AyaNova service management software licensed to " + AyaBizUtils.REGTO;
-                    email.Body = sMessageFields[1];
+                    email.Body = AyaBizUtils.ReplaceBareLineFeeds(sMessageFields[1]);//case 4180
                     email.Subject = sMessageFields[2];
 
                     //case 1601

source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenProcessDeliveries.cs

@@ -85,7 +85,8 @@ namespace GZTW.AyaNova.BLL
 
 						sms.Login=GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPAccount;
 						sms.Password=GZTW.AyaNova.BLL.AyaBizUtils.GlobalSettings.NotifySMTPPassword;
-						sms.Message=info.Message;
+
+						sms.Message=AyaBizUtils.ReplaceBareLineFeeds(info.Message);//case 4180
 						sms.Subject="";//info.Subject;
 						sms.ToAddress=info.Address;
 						sms.Deliver();

source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenSMSMessageDelivery.cs

@@ -47,7 +47,7 @@ namespace GZTW.AyaNova.BLL
 				// Create a simple email.
 				Chilkat.Email email = new Chilkat.Email();
 
-				email.Body = Message;
+				email.Body = AyaBizUtils.ReplaceBareLineFeeds(Message);//case 4180
 				email.Subject = Subject;
                 
                 //case 1601

source/bizobjects/AyaLib/GZTW.AyaNova.BLL/GenSMTPMessageDelivery.cs

@@ -43,7 +43,7 @@ namespace GZTW.AyaNova.BLL
 				// Create a simple email.
 				Chilkat.Email email = new Chilkat.Email();
 
-				email.Body = Message;
+				email.Body = AyaBizUtils.ReplaceBareLineFeeds(Message);//case 4180
 				email.Subject = Subject;
 
                 //case 1601