fetch server location from a pref

git-svn-id: svn://10.0.0.236/trunk@45267 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/wallet/src/wallet.cpp

@@ -549,9 +549,11 @@ static const char *pref_captureForms = "wallet.captureForms";
 static const char *pref_WalletNotified = "wallet.Notified";
 static const char *pref_WalletKeyFileName = "wallet.KeyFileName";
 static const char *pref_WalletSchemaValueFileName = "wallet.SchemaValueFileName";
+static const char *pref_WalletServer = "wallet.Server";
 
 PRIVATE PRBool wallet_captureForms = PR_FALSE;
 PRIVATE PRBool wallet_Notified = PR_FALSE;
+PRIVATE char * wallet_Server = nsnull;
 
 PRIVATE void
 wallet_SetFormsCapturingPref(PRBool x)
@@ -3142,28 +3144,37 @@ WLLT_OnSubmit(nsIContent* formNode) {
 PUBLIC void
 WLLT_FetchFromNetCenter() {
 
-  /* temporary patch to avoid bug 11766 */
-  return;
-
   nsresult rv;
+  char * url = nsnull;
 
+  SI_GetCharPref(pref_WalletServer, &wallet_Server);
+  if (!wallet_Server || (*wallet_Server == '\0')) {
+    /* user does not want to download mapping tables */
+    return;
+  }
   nsFileSpec dirSpec;
   rv = Wallet_ResourceDirectory(dirSpec);
   if (NS_FAILED(rv)) {
     return;
   }
-  rv = NS_NewURItoFile("http://people.netscape.com/morse/wallet/URLFieldSchema.tbl",
-                       dirSpec, "URLFieldSchema.tbl");
+  StrAllocCopy(url, wallet_Server);
+  StrAllocCat(url, "URLFieldSchema.tbl");
+  rv = NS_NewURItoFile(url, dirSpec, "URLFieldSchema.tbl");
+  PR_FREEIF(url);
   if (NS_FAILED(rv)) {
     return;
   }
-  rv = NS_NewURItoFile("http://people.netscape.com/morse/wallet/SchemaConcat.tbl",
-                       dirSpec, "SchemaConcat.tbl");
+  StrAllocCopy(url, wallet_Server);
+  StrAllocCat(url, "SchemaConcat.tbl");
+  rv = NS_NewURItoFile(url, dirSpec, "SchemaConcat.tbl");
+  PR_FREEIF(url);
   if (NS_FAILED(rv)) {
     return;
   }
-  rv = NS_NewURItoFile("http://people.netscape.com/morse/wallet/FieldSchema.tbl",
-                       dirSpec, "FieldSchema.tbl");
+  StrAllocCopy(url, wallet_Server);
+  StrAllocCat(url, "FieldSchema.tbl");
+  rv = NS_NewURItoFile(url, dirSpec, "FieldSchema.tbl");
+  PR_FREEIF(url);
   if (NS_FAILED(rv)) {
     return;
   }

mozilla/modules/libpref/src/init/all.js

@@ -206,14 +206,14 @@ pref("network.accept_cookies",              0);     // 0 = Always, 1 = warn, 2 =
 pref("network.foreign_cookies",             0); // 0 = Accept, 1 = Don't accept
 pref("network.cookie.cookieBehavior",       0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
 pref("network.cookie.warnAboutCookies",     false);
-pref("network.signon.rememberSignons",      true);
-pref("network.cookie.filterName",			"");
+pref("signon.rememberSignons",              false);
+pref("signon.Notified",                     false);
 pref("network.sendRefererHeader",           true);
 pref("network.enablePad",                   false); // Allow client to do proxy autodiscovery
 pref("network.padPacURL",                   ""); // The proxy autodiscovery url
 pref("wallet.captureForms",                 true);
-pref("wallet.useDialogs",                   false);
-pref("privacy.warn_no_policy",              false); // Warn when submitting to site without policy
+pref("wallet.notified",                     false);
+pref("wallet.Server",                       "");
 
 pref("messages.new_window",                 true); // ML obsolete; use mailnews.message_in_thread_window
 pref("intl.accept_languages",               "en");

mozilla/suite/common/pref/pref-advanced.xul

@@ -103,6 +103,17 @@
 	</html:fieldset>
 	</box>
 
+	<box align="vertical" style="width: 100%;">
+	<html:fieldset width="100%">
+			<html:div>
+			<html:label for="pref:char:wallet.Server" accesskey="c" tabindex="0">
+				&server.label;
+			</html:label>
+			<html:input name="Wallet Server:" type="text"	id="pref:char:wallet.Server" size="25" /> 
+			</html:div>
+	</html:fieldset>
+	</box>
+
 
 	<box align="vertical" style="width: 100%;">
 	<html:fieldset width="100%">

mozilla/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd

@@ -16,4 +16,5 @@
 <!ENTITY remSignCheck.label "Automatically prefill usernames and passwords">
 <!ENTITY capFormsCheck.label "Enable prefilling of forms">
 <!ENTITY rHeader "Changing preferences that affect the entire product">
+<!ENTITY server.label "Server for wallet tables">
 

mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul

@@ -103,6 +103,17 @@
 	</html:fieldset>
 	</box>
 
+	<box align="vertical" style="width: 100%;">
+	<html:fieldset width="100%">
+			<html:div>
+			<html:label for="pref:char:wallet.Server" accesskey="c" tabindex="0">
+				&server.label;
+			</html:label>
+			<html:input name="Wallet Server:" type="text"	id="pref:char:wallet.Server" size="25" /> 
+			</html:div>
+	</html:fieldset>
+	</box>
+
 
 	<box align="vertical" style="width: 100%;">
 	<html:fieldset width="100%">

mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd

@@ -16,4 +16,5 @@
 <!ENTITY remSignCheck.label "Automatically prefill usernames and passwords">
 <!ENTITY capFormsCheck.label "Enable prefilling of forms">
 <!ENTITY rHeader "Changing preferences that affect the entire product">
+<!ENTITY server.label "Server for wallet tables">