Update reply subject function

dev/Common/Utils.js

@@ -439,22 +439,106 @@ Utils.removeSelection = function ()
  */
 Utils.replySubjectAdd = function (sPrefix, sSubject)
 {
+	sPrefix = Utils.trim(sPrefix.toUpperCase());
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
 	var
-		oMatch = null,
+		iIndex = 0,
-		sResult = Utils.trim(sSubject)
+		sResult = '',
+		bDrop = false,
+		sTrimmedPart = '',
+		aSubject = [],
+		aParts = [],
+		bRe = 'RE' === sPrefix,
+		bFwd = 'FWD' === sPrefix,
+		bPrefixIsRe = !bFwd
 	;
 
-	if (null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]) ||
+	if ('' !== sSubject)
-		null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?[\\[\\(][\\d]+[\\]\\)][\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]))
 	{
-		sResult = sPrefix + ': ' + Utils.trim(oMatch[1]);
+		bDrop = false;
+
+		aParts = sSubject.split(':');
+		for (iIndex = 0; iIndex < aParts.length; iIndex++)
+		{
+			sTrimmedPart = Utils.trim(aParts[iIndex]);
+			if (!bDrop && 
+					(/^(RE|FWD)$/i.test(sTrimmedPart) || /^(RE|FWD)[\[\(][\d]+[\]\)]$/i.test(sTrimmedPart))
+				)
+			{
+				if (!bRe)
+				{
+					bRe = !!(/^RE/i.test(sTrimmedPart));
+				}
+				
+				if (!bFwd)
+				{
+					bFwd = !!(/^FWD/i.test(sTrimmedPart));
+				}
+			}
+			else
+			{
+				aSubject.push(aParts[iIndex]);
+				bDrop = true;
+			}
+		}
+
+		if (0 < aSubject.length)
+		{
+			sResult = Utils.trim(aSubject.join(':'));
+		}
+	}
+
+	if (bPrefixIsRe)
+	{
+		bRe = false;
 	}
 	else
 	{
-		sResult = sPrefix + ': ' + sSubject;
+		bFwd = false;
 	}
 
-	return sResult.replace(/[\s]+/g, ' ');
+	return Utils.trim(
+		(bPrefixIsRe ? 'Re: ' : 'Fwd: ') +
+		(bRe ? 'Re: ' : '') +
+		(bFwd ? 'Fwd: ' : '') +
+		sResult
+	);
+};
+
+
+/**
+ * @param {string} sSubject
+ * @return {string}
+ */
+Utils.fixLongSubject = function (sSubject)
+{
+	var
+		iLimit = 30,
+		mReg = /^Re([\[\(]([\d]+)[\]\)]|):[\s]{0,3}Re([\[\(]([\d]+)[\]\)]|):/ig,
+		oMatch = null
+	;
+
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
+	do
+	{
+		iLimit--;
+
+		oMatch = mReg.exec(sSubject);
+		if (!oMatch || Utils.isUnd(oMatch[0]))
+		{
+			oMatch = null;
+		}
+
+		if (oMatch)
+		{
+			sSubject = sSubject.replace(mReg, 'Re:');
+		}
+	}
+	while (oMatch || 0 < iLimit);
+
+	return sSubject.replace(/[\s]+/, ' ');
 };
 
 /**
@@ -492,10 +576,11 @@ Utils._replySubjectAdd_ = function (sPrefix, sSubject, bFixLongSubject)
 };
 
 /**
+ * @deprecated
  * @param {string} sSubject
  * @return {string}
  */
-Utils.fixLongSubject = function (sSubject)
+Utils._fixLongSubject_ = function (sSubject)
 {
 	var
 		iCounter = 0,

rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -6954,14 +6954,14 @@ class Actions
 		$aResult = array('', '');
 		if (0 < \strlen($sSubject))
 		{
-			$sDrop = false;
+			$bDrop = false;
 			$aPrefix = array();
 			$aSuffix = array();
 
 			$aParts = \explode(':', $sSubject);
 			foreach ($aParts as $sPart)
 			{
-				if (!$sDrop &&
+				if (!$bDrop &&
 					(\preg_match('/^(RE|FWD)$/i', \trim($sPart)) || \preg_match('/^(RE|FWD)[\[\(][\d]+[\]\)]$/i', \trim($sPart))))
 				{
 					$aPrefix[] = $sPart;
@@ -6969,7 +6969,7 @@ class Actions
 				else
 				{
 					$aSuffix[] = $sPart;
-					$sDrop = true;
+					$bDrop = true;
 				}
 			}
 

rainloop/v/0.0.0/static/js/admin.js

@@ -1236,22 +1236,106 @@ Utils.removeSelection = function ()
  */
 Utils.replySubjectAdd = function (sPrefix, sSubject)
 {
+	sPrefix = Utils.trim(sPrefix.toUpperCase());
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
 	var
-		oMatch = null,
+		iIndex = 0,
-		sResult = Utils.trim(sSubject)
+		sResult = '',
+		bDrop = false,
+		sTrimmedPart = '',
+		aSubject = [],
+		aParts = [],
+		bRe = 'RE' === sPrefix,
+		bFwd = 'FWD' === sPrefix,
+		bPrefixIsRe = !bFwd
 	;
 
-	if (null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]) ||
+	if ('' !== sSubject)
-		null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?[\\[\\(][\\d]+[\\]\\)][\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]))
 	{
-		sResult = sPrefix + ': ' + Utils.trim(oMatch[1]);
+		bDrop = false;
+
+		aParts = sSubject.split(':');
+		for (iIndex = 0; iIndex < aParts.length; iIndex++)
+		{
+			sTrimmedPart = Utils.trim(aParts[iIndex]);
+			if (!bDrop && 
+					(/^(RE|FWD)$/i.test(sTrimmedPart) || /^(RE|FWD)[\[\(][\d]+[\]\)]$/i.test(sTrimmedPart))
+				)
+			{
+				if (!bRe)
+				{
+					bRe = !!(/^RE/i.test(sTrimmedPart));
+				}
+				
+				if (!bFwd)
+				{
+					bFwd = !!(/^FWD/i.test(sTrimmedPart));
+				}
+			}
+			else
+			{
+				aSubject.push(aParts[iIndex]);
+				bDrop = true;
+			}
+		}
+
+		if (0 < aSubject.length)
+		{
+			sResult = Utils.trim(aSubject.join(':'));
+		}
+	}
+
+	if (bPrefixIsRe)
+	{
+		bRe = false;
 	}
 	else
 	{
-		sResult = sPrefix + ': ' + sSubject;
+		bFwd = false;
 	}
 
-	return sResult.replace(/[\s]+/g, ' ');
+	return Utils.trim(
+		(bPrefixIsRe ? 'Re: ' : 'Fwd: ') +
+		(bRe ? 'Re: ' : '') +
+		(bFwd ? 'Fwd: ' : '') +
+		sResult
+	);
+};
+
+
+/**
+ * @param {string} sSubject
+ * @return {string}
+ */
+Utils.fixLongSubject = function (sSubject)
+{
+	var
+		iLimit = 30,
+		mReg = /^Re([\[\(]([\d]+)[\]\)]|):[\s]{0,3}Re([\[\(]([\d]+)[\]\)]|):/ig,
+		oMatch = null
+	;
+
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
+	do
+	{
+		iLimit--;
+
+		oMatch = mReg.exec(sSubject);
+		if (!oMatch || Utils.isUnd(oMatch[0]))
+		{
+			oMatch = null;
+		}
+
+		if (oMatch)
+		{
+			sSubject = sSubject.replace(mReg, 'Re:');
+		}
+	}
+	while (oMatch || 0 < iLimit);
+
+	return sSubject.replace(/[\s]+/, ' ');
 };
 
 /**
@@ -1289,10 +1373,11 @@ Utils._replySubjectAdd_ = function (sPrefix, sSubject, bFixLongSubject)
 };
 
 /**
+ * @deprecated
  * @param {string} sSubject
  * @return {string}
  */
-Utils.fixLongSubject = function (sSubject)
+Utils._fixLongSubject_ = function (sSubject)
 {
 	var
 		iCounter = 0,

rainloop/v/0.0.0/static/js/app.js

@@ -1239,22 +1239,106 @@ Utils.removeSelection = function ()
  */
 Utils.replySubjectAdd = function (sPrefix, sSubject)
 {
+	sPrefix = Utils.trim(sPrefix.toUpperCase());
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
 	var
-		oMatch = null,
+		iIndex = 0,
-		sResult = Utils.trim(sSubject)
+		sResult = '',
+		bDrop = false,
+		sTrimmedPart = '',
+		aSubject = [],
+		aParts = [],
+		bRe = 'RE' === sPrefix,
+		bFwd = 'FWD' === sPrefix,
+		bPrefixIsRe = !bFwd
 	;
 
-	if (null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]) ||
+	if ('' !== sSubject)
-		null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?[\\[\\(][\\d]+[\\]\\)][\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]))
 	{
-		sResult = sPrefix + ': ' + Utils.trim(oMatch[1]);
+		bDrop = false;
+
+		aParts = sSubject.split(':');
+		for (iIndex = 0; iIndex < aParts.length; iIndex++)
+		{
+			sTrimmedPart = Utils.trim(aParts[iIndex]);
+			if (!bDrop && 
+					(/^(RE|FWD)$/i.test(sTrimmedPart) || /^(RE|FWD)[\[\(][\d]+[\]\)]$/i.test(sTrimmedPart))
+				)
+			{
+				if (!bRe)
+				{
+					bRe = !!(/^RE/i.test(sTrimmedPart));
+				}
+				
+				if (!bFwd)
+				{
+					bFwd = !!(/^FWD/i.test(sTrimmedPart));
+				}
+			}
+			else
+			{
+				aSubject.push(aParts[iIndex]);
+				bDrop = true;
+			}
+		}
+
+		if (0 < aSubject.length)
+		{
+			sResult = Utils.trim(aSubject.join(':'));
+		}
+	}
+
+	if (bPrefixIsRe)
+	{
+		bRe = false;
 	}
 	else
 	{
-		sResult = sPrefix + ': ' + sSubject;
+		bFwd = false;
 	}
 
-	return sResult.replace(/[\s]+/g, ' ');
+	return Utils.trim(
+		(bPrefixIsRe ? 'Re: ' : 'Fwd: ') +
+		(bRe ? 'Re: ' : '') +
+		(bFwd ? 'Fwd: ' : '') +
+		sResult
+	);
+};
+
+
+/**
+ * @param {string} sSubject
+ * @return {string}
+ */
+Utils.fixLongSubject = function (sSubject)
+{
+	var
+		iLimit = 30,
+		mReg = /^Re([\[\(]([\d]+)[\]\)]|):[\s]{0,3}Re([\[\(]([\d]+)[\]\)]|):/ig,
+		oMatch = null
+	;
+
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
+	do
+	{
+		iLimit--;
+
+		oMatch = mReg.exec(sSubject);
+		if (!oMatch || Utils.isUnd(oMatch[0]))
+		{
+			oMatch = null;
+		}
+
+		if (oMatch)
+		{
+			sSubject = sSubject.replace(mReg, 'Re:');
+		}
+	}
+	while (oMatch || 0 < iLimit);
+
+	return sSubject.replace(/[\s]+/, ' ');
 };
 
 /**
@@ -1292,10 +1376,11 @@ Utils._replySubjectAdd_ = function (sPrefix, sSubject, bFixLongSubject)
 };
 
 /**
+ * @deprecated
  * @param {string} sSubject
  * @return {string}
  */
-Utils.fixLongSubject = function (sSubject)
+Utils._fixLongSubject_ = function (sSubject)
 {
 	var
 		iCounter = 0,