Merge branch 'candidate-5.4.6' into candidate-6.0.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

docs/ECLLanguageReference/ECLR_mods/BltInFunc-HTTPCALL.xml

@@ -143,6 +143,15 @@
             <entry>Specifies all trailing spaces are removed from strings
             before output.</entry>
           </row>
+
+          <row>
+            <entry><emphasis role="bold">HTTPHEADER<indexterm>
+                <primary>HTTPHEADER</primary>
+              </indexterm></emphasis></entry>
+
+            <entry>Specifies header information to be passed to the
+            service.</entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable></para>
@@ -157,7 +166,15 @@ OutRec1 := RECORD
   DATASET(worldBankSource) Fred{XPATH('/source')};
 END;
 
-raw := HTTPCALL('http://api.worldbank.org/sources', 'GET', 'text/xml', OutRec1);
+raw := HTTPCALL('http://api.worldbank.org/sources', 'GET', 'text/xml', OutRec1, );
+
+OUTPUT(raw);
+
+////Using HTTPHEADER to pass Authorization info
+raw2 := HTTPCALL('http://api.worldbank.org/sources', 'GET', 'text/xml', 
+                 OutRec1, HTTPHEADER('Authorization','Basic dXNlcm5hbWU6cGFzc3dvcmQ='));
+
+OUTPUT(raw2);
 
-OUTPUT(raw);</programlisting>
+</programlisting>
 </sect1>

docs/ECLLanguageReference/ECLR_mods/BltInFunc-SOAPCALL.xml

@@ -325,6 +325,15 @@
             different message format, where type information is embedded in
             the XML.</entry>
           </row>
+
+          <row>
+            <entry><emphasis role="bold">HTTPHEADER<indexterm>
+                <primary>HTTPHEADER</primary>
+              </indexterm></emphasis></entry>
+
+            <entry>Specifies header information to be passed to the
+            service.</entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable></para>
@@ -410,6 +419,11 @@ DATASET(outRecord), ONFAIL(genDefault1())));
 OUTPUT(SOAPCALL(ds, ip, svc, inRecord, t(LEFT),DATASET(outRecord), ONFAIL(genDefault2(LEFT))));
 
 OUTPUT(SOAPCALL(ds, ip, svc, inRecord, t(LEFT),DATASET(outRecord), ONFAIL(SKIP)));
+
+//Using HTTPHEADER to pass Authorization info
+OUTPUT(SOAPCALL(ds, ip, svc, inRecord, t(LEFT),DATASET(outRecord), ONFAIL(SKIP),
+                HTTPHEADER('Authorization','Basic dXNlcm5hbWU6cGFzc3dvcmQ=')))
+
 </programlisting>
   </sect2>
 

docs/ECLLanguageReference/ECLR_mods/Templ-OPTION.xml

@@ -964,6 +964,16 @@
 
               <entry>If true, enables ASSERT checking.</entry>
             </row>
+
+            <row>
+              <entry><emphasis>soapTraceLevel</emphasis></entry>
+
+              <entry>Default: 1</entry>
+
+              <entry>The level of detail in reporting SOAPCALL or HTTPCALL
+              information (set to 0 for none, 1 for normal, 2 - 8 for more
+              detail)</entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable></para>

docs/ECLStandardLibraryReference/SLR-Mods/Find.xml

@@ -78,7 +78,8 @@
   </emphasis>string. If the <emphasis>target</emphasis> is not found or the
   specified <emphasis>instance</emphasis> is greater than the number of
   occurrences of the <emphasis>target</emphasis> in the
-  <emphasis>source</emphasis>, StringFind returns zero (0).</para>
+  <emphasis>source</emphasis>, <emphasis role="bold">Find</emphasis> returns
+  zero (0).</para>
 
   <para>Example:</para>
 

esp/files/scripts/configmgr/navtree.js

@@ -2565,8 +2565,9 @@ function promptVerifyPwd(category, params, attrName, oldValue, newValue, recordI
       xmlArgs += "\" attrName=\"" + attrName;
       xmlArgs += "\" viewType=\"password";
       xmlArgs += "\" rowIndex=\"" + recordIndex;
-      xmlArgs += "\" oldValue=\"" + escape(oldValue);
-      xmlArgs += "\" newValue=\"" + escape(pwd) + "\"/></XmlArgs>";
+      xmlArgs += "\" oldValue=\"" + oldValue;
+      xmlArgs += "\" newValue=\"" + pwd + "\"/></XmlArgs>";
+      xmlArgs = encodeURIComponent(xmlArgs);
 
       YAHOO.util.Connect.asyncRequest('POST', '/WsDeploy/SaveSetting', {
         success: function(o) {