From 220334e70af8b72def7d55c896f6a5f91c09fb0a Mon Sep 17 00:00:00 2001
From: "varada%netscape.com"
 <varada%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 30 Aug 2000 01:26:39 +0000
Subject: [PATCH] Adding customized UserAgent String to the Browser all-ns.js

git-svn-id: svn://10.0.0.236/trunk@77544 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/cck/ib/ib.cpp    | 50 ++++++++++++++++++++++++++++++++++++++--
 mozilla/cck/ib/script.ib |  1 +
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/mozilla/cck/ib/ib.cpp b/mozilla/cck/ib/ib.cpp
index 131443c4613..7c4007421e2 100644
--- a/mozilla/cck/ib/ib.cpp
+++ b/mozilla/cck/ib/ib.cpp
@@ -37,7 +37,7 @@ CString Setup0Short = "&Typical";
 CString Setup1Short = "C&ustom";
 CString quotes = "\"";
 CString spaces = " ";
-
+BOOL prefDoesntExist = TRUE;
 COMPONENT Components[100];
 int		numComponents;
 int		componentOrder;
@@ -163,6 +163,7 @@ void ModifyPref(char *buffer, CString entity, CString newvalue)
 	buf.Insert(i, newvalue);
 
 	strcpy(buffer, (char *)(LPCTSTR) buf);
+	prefDoesntExist = FALSE;
 }
 
 int ModifyProperties(CString xpifile, CString entity, CString newvalue)
@@ -202,6 +203,43 @@ int ModifyProperties(CString xpifile, CString entity, CString newvalue)
 	rename(tempFile, xpifile);
 	return rv;
 }
+void AddPref(CString xpifile, CString entity, CString newvalue)
+{
+
+	int rv = TRUE;
+	CString prefFile = xpifile;
+	CString tempFile = xpifile + ".temp";
+	char properties[400];
+
+	ofstream tf(tempFile);
+	if(!tf) 
+	{
+		rv = FALSE;
+		cout <<"Cannot open: "<<tempFile<<"\n";
+		return;
+	}
+
+	tf<< "pref("<< entity <<", \""<< newvalue <<"\");\n";
+
+	ifstream pf(prefFile);
+	if (!pf)
+	{
+		rv = FALSE;
+		cout <<"Cannot open: "<<prefFile<<"\n";
+		return;
+	}
+	
+	while (!pf.eof()) 
+	{
+		pf.getline(properties,400);
+		tf <<properties<<"\n";
+	}
+	pf.close();
+	tf.close();
+	remove(xpifile);
+	rename(tempFile, xpifile);
+	return;
+}
 
 int ModifyJS(CString xpifile, CString entity, CString newvalue)
 {
@@ -240,9 +278,10 @@ int ModifyJS(CString xpifile, CString entity, CString newvalue)
 		fclose(srcf);
 		fclose(dstf);
 	}
-
 	remove(xpifile);
 	rename(newfile, xpifile);
+	if (prefDoesntExist)
+		AddPref(xpifile,entity,newvalue);
 
 	return TRUE;
 }
@@ -710,6 +749,13 @@ int StartIB(CString parms, WIDGET *curWidget)
 //checking to see if the AnimatedLogoURL has a http:// appended in front of it 
 //if not then we have to append it;
 
+//Check to see if the User Agent string exists and if so then append -CCK to it ;
+	CString userAgent = GetGlobal("OrganizationName");
+	CString tempAgent ="CCK -";
+	if (userAgent)
+		tempAgent += userAgent;
+	SetGlobal("OrganizationName",tempAgent);
+
 // check to see if the bmp for rshell background is bigger than 302KB;
 	HANDLE hFile;
 	DWORD dwFileSize;
diff --git a/mozilla/cck/ib/script.ib b/mozilla/cck/ib/script.ib
index bfd78d41449..ea5c4a188f4 100644
--- a/mozilla/cck/ib/script.ib
+++ b/mozilla/cck/ib/script.ib
@@ -13,3 +13,4 @@ replaceXPI(deflenus.xpi,bin/defaults/profile/panels.rdf,%SidebarPath%)
 modifyDTD(langenus.xpi,bin/chrome/locales/en-US/navigator/locale/navigator.dtd,mainWindow.titlemodifier,%CompanyName%)
 modifyProperties(langenus.xpi,bin/chrome/locales/en-US/navigator/locale/navigator.properties,browser.startup.homepage,%HomePageURL%)
 modifyProperties(langenus.xpi,bin/chrome/locales/en-US/navigator/locale/navigator.properties,browser.throbber.url,%AnimatedLogoURL%)
+modifyJS(browser.xpi,bin/defaults/pref/all-ns.js,general.useragent.vendorComment,%OrganizationName%)