Only quote User object parms, not other Raw properties

nwsw · Jan 19, 2016 · a7aa3ab · a7aa3ab
1 parent e645777
commit a7aa3ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/obj_NWC2ClipItem.inc b/lib/obj_NWC2ClipItem.inc
@@ -101,7 +101,10 @@ function ReconstructClipText()
 		if (is_string($v)) {
 			// First encode all but '|' as cslashes, then convert \ and | to special combinations
 			$v2 = str_replace(array('\\\\','|'), array('\]','\}'),addcslashes($v,"\r\n\t\\\"\'"));
-			if (($c == NWC2OPT_TEXT) || (($c == NWC2OPT_RAW) && preg_match('/[\s"\'\|\\\\]/',$v2)))
+			if ($c == NWC2OPT_TEXT)
+				$s .= "\"$v2\"";
+			else if (!empty($this->UserType) && preg_match('/[\s"\'\|\\\\]/',$v2))
+				// this is not really necessary, but is done to match NWC behaviour
 				$s .= "\"$v2\"";
 			else
 				$s .= $v2;

diff --git a/nwsw_TestLib.php b/nwsw_TestLib.php
@@ -5,9 +5,13 @@
 
 foreach ($clip->Items as $item) {
 	$o = new NWC2ClipItem($item);
-	echo "Ref: $item";
+
-	echo "New: ".$o->ReconstructClipText()."\n";
+	if ($o->IsContextInfo()) continue;
-	unset($o);
+
+	$origLine = trim($item);
+	$newLine = $o->ReconstructClipText();
+
+	if ($newLine != $origLine) echo "Ref: $origLine\nNew: $newLine\n\n";
 	}
 
 $usermsg = <<<__EOMSG