Index: MANIFEST
===================================================================
RCS file: /var/cvs/interchange/MANIFEST,v
retrieving revision 2.237
diff -u -r2.237 MANIFEST
--- MANIFEST	13 Mar 2009 18:57:37 -0000	2.237
+++ MANIFEST	14 Mar 2009 04:19:41 -0000
@@ -1133,7 +1133,6 @@
 lib/Vend/Payment.pm
 lib/Vend/Payment/AuthorizeNet.pm
 lib/Vend/Payment/BusinessOnlinePayment.pm
-lib/Vend/Payment/CyberCash.pm
 lib/Vend/Payment/ECHO.pm
 lib/Vend/Payment/EFSNet.pm
 lib/Vend/Payment/Ezic.pm
Index: WHATSNEW-5.7
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.7,v
retrieving revision 2.30
diff -u -r2.30 WHATSNEW-5.7
--- WHATSNEW-5.7	13 Mar 2009 18:57:37 -0000	2.30
+++ WHATSNEW-5.7	14 Mar 2009 04:19:41 -0000
@@ -51,6 +51,8 @@
   is a reseller for CyberSource so its module applies:
   http://www.bankofamerica.com/small_business/merchant_card_processing/index.cfm?template=internet_e_commerce
 
+* Removed long-defunct CyberCash payment module.
+
 UserTag
 -------
 
@@ -70,6 +72,7 @@
 
 * Allow custom error messages for email_only check.
 
+
 ------------------------------------------------------------------------------
 
 
Index: dist/lib/UI/ichelp.txt
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/ichelp.txt,v
retrieving revision 2.7
diff -u -r2.7 ichelp.txt
--- dist/lib/UI/ichelp.txt	10 Apr 2003 18:04:24 -0000	2.7
+++ dist/lib/UI/ichelp.txt	14 Mar 2009 04:19:42 -0000
@@ -80,14 +80,13 @@
 wizard.authorizenet	Wizard : Authorize.net Payment Preferences	Enter the values you recieved when you registered for payment processing through Authorize.net. If you haven't recieved these values or you haven't signed up for this payment option yet leave these fields blank. Remember that you will not be able to launch your site without a secure payment processing solution. The required fields are displayed in <b>Bold</b>.
 wizard.batchupload	Upload Products	<p><font size=2>This page allows you to enter your products into the Interchange e-commerce platform using the Wizard spreadsheet. The spreadsheet has been created with all the necessary product descriptor fields and is the recommended method for entering products. <p>To use the Wizard spreadsheet, download it to your hard drive. Then, add your products and categories, save it, and upload it again using the <b>Browse...</b> button to locate the file. Five sample field categories are displayed in the spreadsheet for your reference. Once the file has been uploaded your product information is entered into Interchange and populated into the Administration Tool.<p>If you have not yet established your product line, or you would rather use sample product information to test how the products will be displayed, you can use one of the sample sets of data. The sample sets of data are:<p><ul><li>Hardware and Construction Tool Store-contains construction products.<li>Computer Store-contains computer hardware products.<li>Marketing Report Store-contains digital products.</ul><p>To use these sample data sets, click the set you want to use and save it to your hard drive. Then upload it again by using the <b>Browse...</b> button to locate the file. <p><b>Note:</b> It is recommended that you have a few products in the system before you launch to see how they are displayed.
 wizard.companyinfo	Wizard : Your Company Info	Enter your company information in the fields provided. This information will be entered into Interchange and populated into the Administration tool. The required fields are displayed in bold.<p>The following are descriptions of the fields displayed on the page:<p><table border=1 cellspacing=0 cellpadding=2 width=425><tr><td bgcolor="E0DCE0"><b>Field</b></td><td bgcolor="E0DCE0"><b>Definition</b></td></tr><tr><td>Your Company Name</td><td>The legal name of your company, used in correspondence.</td></tr><tr><td>Main Domain Name</td><td>The URL of your company's web site. For example, www.yourdomain.com.</tr><tr><td>Street Address</td><td>The postal address of your company's headquarters.</td></tr><tr><td>City</td><td>The city of your company's headquarters.</td></tr><tr><td>State</td><td>The state of your company's headquarters.</td></tr><tr><td>ZIP/Postal Code</td><td>The ZIP or postal code of your company's headquarters.</td></tr><tr><td>Country</td><td>The country of your company's headquarters. Select from the drop-down list.</td></tr><tr><td>Telephone Number</td><td>The telephone number where a representative of your company can be reached.</td></tr><tr><td>Fax Number</td><td>The number to which a fax can be sent.</td></tr><tr><td>Toll Free Number</td><td>The toll free telephone number where a representative of your company can be reached.</td></tr></table> 
-wizard.cybercash	Wizard : CyberCash Payment Preferences	Enter the values you recieved when you registered for payment processing through CyberCash. If you haven't recieved these values or you haven't signed up for this payment option yet leave these fields blank. Remember that you will not be able to launch your site without a secure payment processing solution. The required fields are displayed in <b>Bold. </b>
 wizard.email	Wizard : Company E-mail Information	Enter the email addresses to be used for information routing in the fields provided. This information will be entered into Interchange and populated in the Administration tool. The required fields are displayed in bold.<p>The following are descriptions of the fields displayed on the page:<p><table border=1 cellspacing=0 cellpadding=2 width=425><tr><td bgcolor="E0DCE0"><b>Field</b></td><td bgcolor="E0DCE0"><b>Definition</b></td></tr><tr><td>Orders sent to</td><td>The email address where customer orders will be sent. This field has been pre-populated for your convenience. If the email address displayed is not correct, type the correct email address in the field.</td></tr><tr><td>Info requests sent to</td><td>The email address where visitors to your site can send inquiries for more information. This field has been pre-populated for your convenience. If the email address displayed is not correct, type the correct email address in the field. The sales organization is typically the recipient of requests for more information.</td></tr><tr><td>Service requests sent to</td><td>The email address where visitors to your site can send customer service inquiries. This field has been pre-populated for your convenience. If the email address displayed is not correct, type the correct email address in the field. The customer service organization is typically the recipient of service requests.</td></tr></table><p>The Wizard <b>Checklist</b> is displayed on the left. From the checklist you can access any of the Wizard screens. Click <b>Save current settings</b> to save your work to this point.
 wizard.fedex	Wizard : Shipping Configuration for Federal Express 	This screen allows you to choose the Federal Express shipping options that you want to offer. If you are unsure of what a shipping option means, contact Federal Express for further explaination. The <b>Handling fee</b> allows you to enter a fee for handling the delivery for the customer. Most e-commerce sites charge a handling fee depending on how big or how fragile a product is. This value should be entered in decimal format. For example, if you are charging a handling fee of $3.00, enter 3.00 in the <b>Handling fee</b> field.<p> The Wizard <b>Checklist</b> is displayed on the left. From the checklist you can access any of the Wizard screens. Click <b>Save current settings</b> to save your work to this point.
 wizard.index	Wizard : Welcome 	<font size=-1>The Catalog Wizard gets you started with the Interchange e-commerce platform. It will lead you through the process of configuring the fundamentals of your store. When you finish you will have a fully functioning e-commerce site!  <br><br>The checklist at the left side of the page shows your progress in the Catalog Wizard. You can complete the sections in any order and you can go back to any section at any time. At any point in the Catalog Wizard process you can choose to stop, save your settings, and continue later.
 wizard.indexpage	Wizard : Index Page	<p><font size=2>This page allows you to create an index page. The index page is the first page of your site, and is ususally the first page that your customers see.<p><font size=2>In the <b>Page Title</b> field, enter the title for your index page. Typically the index page title contains the name of your store. The <b>Content</b> field has been pre-populated with sample information that has been formatted in HTML. If you are unfamiliar with HTML, it is recommended that you leave the HTML coding in place and simply replace the existing text with text relating to your store. If you are familiar with using HTML, you can choose to delete the prepopulated text and construct this page using your own text and HTML coding.
 wizard.itransact	Wizard : iTransact Payment Preferences	Enter the values you recieved when you registered for payment processing through Authorize.net. If you haven't recieved these values or you haven't signed up for this payment option yet leave these fields blank. Remember that you will not be able to launch your site without a secure payment processing solution. The required fields are displayed in <b>Bold</b>.
 wizard.launch	Wizard : Launch	<p><font size=2>Set your preferences for taking your site live. This is the final step before your site is publicly accessible. The required fields are displayed in bold.</p><p>The table below describes the options displayed on the Launch page.<p><table border=1 cellspacing=0 cellpadding=2 width=425><tr><td bgcolor="E0DCE0"><font size=2><b>Field</b></td><td bgcolor="E0DCE0"><font size=2><b>Description</b></td></tr><tr><td><font size=2>Delete sample order data</td><td><font size=2>Choose <b>Yes</b> to purge the database of sample order data. It is strongly recommended that you do this before going live.</td></tr><tr><td><font size=2>Deletesample user data</td><td><font size=2>Choose <b>Yes</b> to purge the database of sample user data. It is strongly recommended that you do this before going live.</td></tr><tr><td><font size=2>Starting order number</td><td><font size=2>Enter the order number that should be used in taking the first customer order. The default is 01000.</td></tr><tr><td><font size=2>Enable Secure (SSL)</td><td><font size=2>Choose <b>Yes</b> to enable your SSL certificate. This is strongly recommended if you are processing payment online.</td></tr><tr><td><font size=2>Launch</td><td><font size=2>Click to launch your site.</td></tr></table>
-wizard.payment	Wizard : Setting Up Payment Information	This section helps you to set up your payment acceptance and processing information and is intended only to get you started. It offers a choice of processing options and payment methods. This information will be entered into Interchange and populated into the Administration tool. The required fields are displayed in bold.<p>The following are descriptions of the fields displayed on the page:<p><table border=1 cellspacing=0 cellpadding=2 width=425><tr><td bgcolor="E0DCE0"><b>Field</b></td><td bgcolor="E0DCE0"><b>Definition</b></td></tr><td>Payment gateway</td><td>The payment gateway that is processing your payments. Choose your payment processor from the drop-down list. If you don't have a payment processor, you can choose one now, or choose no credit cards. Your choices are:<br><ul><li><b>no credit cards</b>-select if you are not processing payment information, or if you are processing payments manually (over the phone or using a Magnetic Stripe Reader). You can also select this if you are unsure of how you will process your payments.</li><li>PGP sent credit cards-select if you are using Pretty Good Protection (PGP) to process your payments. For more information on PGP, see <a href="http://www.pgpi.org">www.pgpi.org</a>.</li><li><b>CyberCash</b>-select if you are using CyberCash to process your payments. For more information on CyberCash, see <a href="http://www.cybercash.com">www.cybercash.com</a>.</li><li><b>Verisign</b>-select if you are using Verisign to process your payments. For more information on Verisign, see <a href="http://www.verisign.com">www.verisign.com</a>.</li></ul></td></tr></table>
+wizard.payment	Wizard : Setting Up Payment Information	This section helps you to set up your payment acceptance and processing information and is intended only to get you started. It offers a choice of processing options and payment methods. This information will be entered into Interchange and populated into the Administration tool. The required fields are displayed in bold.<p>The following are descriptions of the fields displayed on the page:<p><table border=1 cellspacing=0 cellpadding=2 width=425><tr><td bgcolor="E0DCE0"><b>Field</b></td><td bgcolor="E0DCE0"><b>Definition</b></td></tr><td>Payment gateway</td><td>The payment gateway that is processing your payments. Choose your payment processor from the drop-down list. If you don't have a payment processor, you can choose one now, or choose no credit cards. Your choices are:<br><ul><li><b>no credit cards</b>-select if you are not processing payment information, or if you are processing payments manually (over the phone or using a Magnetic Stripe Reader). You can also select this if you are unsure of how you will process your payments.</li><li>PGP sent credit cards-select if you are using Pretty Good Protection (PGP) to process your payments. For more information on PGP, see <a href="http://www.pgpi.org">www.pgpi.org</a>.</li><li><b>Verisign</b>-select if you are using Verisign to process your payments. For more information on Verisign, see <a href="http://www.verisign.com">www.verisign.com</a>.</li></ul></td></tr></table>
 wizard.pgp	Wizard : PGP Payment Preferences	Enter the values you recieved when you registered for payment processing through Pretty Good Protection (PGP). If you haven't recieved these values or you haven't signed up for this payment option yet leave these fields blank. Remember that you will not be able to launch your site without a secure payment processing solution. The required fields are displayed in <b>Bold</b>. 
 wizard.preview	Wizard : Preview	<p><font size=2>The preview page allows you to view and test your newly created site before launch. After you preview your site you can go back to any point in the Wizard and make changes to your settings. You can preview and make changes as many times as necessary. <p>The following table describes the options displayed on this page.<p><table border=1 cellspacing=0 cellpadding=2 width=425><tr><td bgcolor="E0DCE0"><font size=2><b>Field</b></td><td bgcolor="E0DCE0"><font size=2><b>Description</b></td></tr><tr><td><font size=2>Insert products data</td><td><font size=2>Enters into Interchange the product spreadsheet you uploaded. Choose <b>Yes</b> if you already uploaded sample product information or your own product information and want to enter it into Interchange. <br>Choose <b>No</b> if you entered products using the Manual Product Entry page.</td></tr><tr><td><font size=2>Insert sample order data</td><td><font size=2>Choose <b>Yes</b> to insert sample order and user data. This will help you to see how the Administration Tool works by providing sample orders and customers for view. You can purge this information before launch.</td></tr><tr><td><font size=2>Enable Secure (SSL)</td><td><font size=2>Choose <b>Yes</b> to enable your SSL certificate. This is not necessary to preview your site, but is strongly recommended for launch if you are processing payments online.</td></tr><tr><td><font size=2>Finish</td><td><font size=2>Click to preview your site.</td></tr></table>
 wizard.security	Wizard : Security Preferences	This section allows you to enter the security preferences for your site. It is important that you keep all user names and passwords in a safe place to ensure the safety of your site and sensitive customer information. The following table describes the fields displayed on this page.<table><tr><td>Administrator user name</td><td>Enter the user name for the administrator of your site. The administrator has access to all aspects of the website including customer, product, administration, and merchandising information. The administrator sets and oversees all <b>shop user</b> access preferences.</td></tr><tr><td>Administrator password</td><td>Enter the password for the administrator of your site. This password should be kept in a safe place.</td></tr><tr><td>Shop user name</td><td>Enter the user name for the shop associate for your site. The shop associate has limited access to sections of the Administration Tool as established by the administrator. You can use the Administration Tool to set up more than one shop associate.</td></tr><tr><td>Shop user password</td><td>Enter the password for the shop associate for your site. This password should be kept in a safe place.</td></tr><tr><td>Enable Web Security</td><td>Click this if you have your Secure Socket Layer (SSL) web server enabled. This is needed to establish a secure internet connection for processing payment information. This is required for launching your site.</td></tr></table><p>The Wizard <b>Checklist</b> is displayed on the left. From the checklist you can access any of the Wizard screens. Click <b>Save current settings</b> to save your work to this point.</td></tr></table>
Index: dist/lib/UI/locales/da_DK.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/locales/da_DK.cfg,v
retrieving revision 2.12
diff -u -r2.12 da_DK.cfg
--- dist/lib/UI/locales/da_DK.cfg	23 Feb 2002 16:29:46 -0000	2.12
+++ dist/lib/UI/locales/da_DK.cfg	14 Mar 2009 04:19:42 -0000
@@ -504,9 +504,6 @@
 "Customers %s of %s",
 "Kunder %s of %s",
 
-"CyberCash configuration file",
-"CyberCash konfigurationsfil",
-
 "DBI enabled (v%s), available drivers:",
 "DBI aktiveret (v%s), installerede drivere:",
 
@@ -1525,9 +1522,6 @@
 "Payment Preferences - iTransact",
 undef,
 
-"Payment Preferences : CyberCash",
-undef,
-
 "Payment editor",
 undef,
 
@@ -2328,20 +2322,6 @@
 "WIZARD_STEP_INDEX_PAR_2",
 undef,
 
-# Sorry, this machine does not have the CyberCash libraries
-# 	installed. Please contact your system administrator and
-# 	have them install CyberCash. If you need assistance with
-# 	this, Red Hat can install them for a fee. Contact
-# 	<A HREF="mailto:support@interchange.redhat.com">support@interchange.redhat.com</A> for more information.
-"WIZARD_STEP_PAY_CYBER_1",
-undef,
-
-# CyberCash only requires a configuration file that we will upload
-# now. Upload the merchant_conf file created during your installation
-# process.
-"WIZARD_STEP_PAY_CYBER_2",
-undef,
-
 # The payment gateway you choose determines how
 # your site will securely process credit card information. 
 # If you have not obtained your payment gateway information yet,
Index: dist/lib/UI/locales/es_ES.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/locales/es_ES.cfg,v
retrieving revision 1.3
diff -u -r1.3 es_ES.cfg
--- dist/lib/UI/locales/es_ES.cfg	12 Aug 2002 16:16:18 -0000	1.3
+++ dist/lib/UI/locales/es_ES.cfg	14 Mar 2009 04:19:42 -0000
@@ -670,9 +670,6 @@
 "Customers %s of %s",
 "Clientes %s de %s",
 
-"CyberCash configuration file",
-"Fichero de configuracion de CyberCash",
-
 "DBI enabled (v%s), available drivers:",
 "DBI disponible (v%s), dispositivos disponibles:",
 
@@ -1918,9 +1915,6 @@
 "Payment Preferences - iTransact",
 "Preferencias de pago - iTransact",
 
-"Payment Preferences : CyberCash",
-"Preferencias de pago : CyberCash",
-
 "Payment gateway",
 "Pasarela de pago",
 
@@ -2806,20 +2800,6 @@
 "WIZARD_STEP_INDEX_PAR_2",
 undef,
 
-# Sorry, this machine does not have the CyberCash libraries
-# 	installed. Please contact your system administrator and
-# 	have them install CyberCash. If you need assistance with
-# 	this, Red Hat can install them for a fee. Contact
-# 	<A HREF="mailto:support@interchange.redhat.com">support@interchange.redhat.com</A> for more information.
-"WIZARD_STEP_PAY_CYBER_1",
-undef,
-
-# CyberCash only requires a configuration file that we will upload
-# now. Upload the merchant_conf file created during your installation
-# process.
-"WIZARD_STEP_PAY_CYBER_2",
-undef,
-
 # The payment gateway you choose determines how
 # your site will securely process credit card information. 
 # If you have not obtained your payment gateway information yet,
Index: dist/lib/UI/locales/he_IL.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/locales/he_IL.cfg,v
retrieving revision 1.4
diff -u -r1.4 he_IL.cfg
--- dist/lib/UI/locales/he_IL.cfg	21 Nov 2001 23:28:12 -0000	1.4
+++ dist/lib/UI/locales/he_IL.cfg	14 Mar 2009 04:19:43 -0000
@@ -441,9 +441,6 @@
 "Customers %s of %s",
 undef,
 
-"CyberCash configuration file",
-undef,
-
 "DBI enabled (v%s), available drivers:",
 "DBI enabled (v%s), available drivers:",
 
@@ -1357,9 +1354,6 @@
 "Payment Preferences - iTransact",
 undef,
 
-"Payment Preferences : CyberCash",
-undef,
-
 "Payment gateway",
 undef,
 
@@ -2058,20 +2052,6 @@
 "WIZARD_STEP_INDEX_PAR_2",
 undef,
 
-# Sorry, this machine does not have the CyberCash libraries
-# 	installed. Please contact your system administrator and
-# 	have them install CyberCash. If you need assistance with
-# 	this, Red Hat can install them for a fee. Contact
-# 	<A HREF="mailto:support@interchange.redhat.com">support@interchange.redhat.com</A> for more information.
-"WIZARD_STEP_PAY_CYBER_1",
-undef,
-
-# CyberCash only requires a configuration file that we will upload
-# now. Upload the merchant_conf file created during your installation
-# process.
-"WIZARD_STEP_PAY_CYBER_2",
-undef,
-
 # The payment gateway you choose determines how
 # your site will securely process credit card information. 
 # If you have not obtained your payment gateway information yet,
Index: dist/lib/UI/locales/it_IT.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/locales/it_IT.cfg,v
retrieving revision 1.5
diff -u -r1.5 it_IT.cfg
--- dist/lib/UI/locales/it_IT.cfg	21 Sep 2004 15:07:28 -0000	1.5
+++ dist/lib/UI/locales/it_IT.cfg	14 Mar 2009 04:19:43 -0000
@@ -599,9 +599,6 @@
 "Customers %s of %s",
 "%s clienti su %s",
 
-"CyberCash configuration file",
-"File di configurazione CyberCash",
-
 "DBI enabled (v%s), available drivers:",
 "DBI abilitati (v%s), drivers disponibili:",
 
@@ -1744,9 +1741,6 @@
 "Payment Preferences - iTransact",
 undef,
 
-"Payment Preferences : CyberCash",
-undef,
-
 "Payment editor",
 "Editor dei pagamenti",
 
@@ -2648,20 +2642,6 @@
 "WIZARD_STEP_INDEX_PAR_2",
 undef,
 
-# Sorry, this machine does not have the CyberCash libraries
-# 	installed. Please contact your system administrator and
-# 	have them install CyberCash. If you need assistance with
-# 	this, Red Hat can install them for a fee. Contact
-# 	<A HREF="mailto:support@interchange.redhat.com">support@interchange.redhat.com</A> for more information.
-"WIZARD_STEP_PAY_CYBER_1",
-undef,
-
-# CyberCash only requires a configuration file that we will upload
-# now. Upload the merchant_conf file created during your installation
-# process.
-"WIZARD_STEP_PAY_CYBER_2",
-undef,
-
 # The payment gateway you choose determines how
 # your site will securely process credit card information. 
 # If you have not obtained your payment gateway information yet,
Index: dist/lib/UI/locales/ja_JP.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/locales/ja_JP.cfg,v
retrieving revision 1.4
diff -u -r1.4 ja_JP.cfg
--- dist/lib/UI/locales/ja_JP.cfg	4 Feb 2004 22:40:57 -0000	1.4
+++ dist/lib/UI/locales/ja_JP.cfg	14 Mar 2009 04:19:44 -0000
@@ -865,9 +865,6 @@
 "Customers %s of %s",
 "顧客 %s / %s",
 
-"CyberCash configuration file",
-"CyberCash設定ファイル",
-
 "DBI enabled (v%s), available drivers:",
 "DBI 有効 (v%s), ドライバ:",
 
@@ -2324,9 +2321,6 @@
 "Payment Preferences - iTransact",
 "支払い方法の属性 - iTransact",
 
-"Payment Preferences : CyberCash",
-"支払い方法の属性 - CyberCash",
-
 "Payment editor",
 "ペイメントエディタ",
 
@@ -3527,20 +3521,6 @@
 "WIZARD_STEP_INDEX_PAR_2",
 undef,
 
-# Sorry, this machine does not have the CyberCash libraries
-# 	installed. Please contact your system administrator and
-# 	have them install CyberCash. If you need assistance with
-# 	this, Red Hat can install them for a fee. Contact
-# 	<A HREF="mailto:support@interchange.redhat.com">support@interchange.redhat.com</A> for more information.
-"WIZARD_STEP_PAY_CYBER_1",
-undef,
-
-# CyberCash only requires a configuration file that we will upload
-# now. Upload the merchant_conf file created during your installation
-# process.
-"WIZARD_STEP_PAY_CYBER_2",
-undef,
-
 # The payment gateway you choose determines how
 # your site will securely process credit card information. 
 # If you have not obtained your payment gateway information yet,
Index: dist/lib/UI/locales/pt_BR.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/locales/pt_BR.cfg,v
retrieving revision 1.4
diff -u -r1.4 pt_BR.cfg
--- dist/lib/UI/locales/pt_BR.cfg	12 Aug 2002 16:16:18 -0000	1.4
+++ dist/lib/UI/locales/pt_BR.cfg	14 Mar 2009 04:19:44 -0000
@@ -657,9 +657,6 @@
 "Customers",
 "Clientes",
 
-"CyberCash configuration file",
-"arquivo de configura鈬o de CyberCash",
-
 "DBI enabled (v%s), available drivers:",
 "DBI habilitado (v%s), drivers disponveis:",
 
@@ -1871,9 +1868,6 @@
 "Payment Preferences - iTransact",
 "Prefer麩cias de Pagamento - iTransact",
 
-"Payment Preferences : CyberCash",
-"Prefer麩cias de Pagamento: CyberCash",
-
 "Payment gateway",
 "Gateway de pagamento",
 
@@ -2720,12 +2714,6 @@
 "WIZARD_STEP_INDEX_PAR_2",
 undef,
 
-"WIZARD_STEP_PAY_CYBER_1",
-undef,
-
-"WIZARD_STEP_PAY_CYBER_2",
-undef,
-
 "WIZARD_STEP_PAY_PAR_1",
 undef,
 
Index: dist/lib/UI/locales/sv_SE.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/locales/sv_SE.cfg,v
retrieving revision 1.12
diff -u -r1.12 sv_SE.cfg
--- dist/lib/UI/locales/sv_SE.cfg	12 Aug 2002 16:16:18 -0000	1.12
+++ dist/lib/UI/locales/sv_SE.cfg	14 Mar 2009 04:19:44 -0000
@@ -504,9 +504,6 @@
 "Customers %s of %s",
 undef,
 
-"CyberCash configuration file",
-undef,
-
 "DBI enabled (v%s), available drivers:",
 "DBI aktiverad (v%s), tillg&auml;ngliga drivare:",
 
@@ -1525,9 +1522,6 @@
 "Payment Preferences - iTransact",
 undef,
 
-"Payment Preferences : CyberCash",
-undef,
-
 "Payment editor",
 undef,
 
@@ -2331,20 +2325,6 @@
 "WIZARD_STEP_INDEX_PAR_2",
 undef,
 
-# Sorry, this machine does not have the CyberCash libraries
-# 	installed. Please contact your system administrator and
-# 	have them install CyberCash. If you need assistance with
-# 	this, Red Hat can install them for a fee. Contact
-# 	<A HREF="mailto:support@interchange.redhat.com">support@interchange.redhat.com</A> for more information.
-"WIZARD_STEP_PAY_CYBER_1",
-undef,
-
-# CyberCash only requires a configuration file that we will upload
-# now. Upload the merchant_conf file created during your installation
-# process.
-"WIZARD_STEP_PAY_CYBER_2",
-undef,
-
 # The payment gateway you choose determines how
 # your site will securely process credit card information. 
 # If you have not obtained your payment gateway information yet,
Index: dist/standard/catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/standard/catalog.cfg,v
retrieving revision 1.24
diff -u -r1.24 catalog.cfg
--- dist/standard/catalog.cfg	1 Oct 2008 18:28:57 -0000	1.24
+++ dist/standard/catalog.cfg	14 Mar 2009 04:19:44 -0000
@@ -326,8 +326,6 @@
 Route  authorizenet  host         "__MV_PAYMENT_HOST__"
 Route  authorizenet  referer      "__MV_PAYMENT_REFERER__"
 
-Route  cybercash     configfile   "__CYBER_CONFIGFILE__"
-
 Route  itransact     id           "__MV_PAYMENT_ID__"
 
 Route  netbilling    id           "__MV_PAYMENT_ID__"
Index: lib/Vend/Order.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Order.pm,v
retrieving revision 2.106
diff -u -r2.106 Order.pm
--- lib/Vend/Order.pm	29 Jan 2009 23:32:30 -0000	2.106
+++ lib/Vend/Order.pm	14 Mar 2009 04:19:45 -0000
@@ -2,15 +2,12 @@
 #
 # $Id: Order.pm,v 2.106 2009-01-29 23:32:30 danb Exp $
 #
-# Copyright (C) 2002-2008 Interchange Development Group
+# Copyright (C) 2002-2009 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
 #
 # This program was originally based on Vend 0.2 and 0.3
 # Copyright 1995 by Andrew M. Wilcox <amw@wilcoxsolutions.com>
 #
-# CyberCash 3 native mode enhancements made by and
-# Copyright 1998 by Michael C. McCune <mmccune@ibm.net>
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
Index: lib/Vend/Payment.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Payment.pm,v
retrieving revision 2.20
diff -u -r2.20 Payment.pm
--- lib/Vend/Payment.pm	16 Jul 2008 00:37:32 -0000	2.20
+++ lib/Vend/Payment.pm	14 Mar 2009 04:19:45 -0000
@@ -2,7 +2,7 @@
 #
 # $Id: Payment.pm,v 2.20 2008-07-16 00:37:32 mheins Exp $
 #
-# Copyright (C) 2002-2007 Interchange Development Group
+# Copyright (C) 2002-2009 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,14 +34,13 @@
 
 @EXPORT_OK = qw(
 				map_actual
-				);
+		);
 
 use Vend::Util;
 use Vend::Interpolate;
 use Vend::Order;
 use strict;
 
-use vars qw/%order_id_check/;
 use vars qw/$Have_LWP $Have_Net_SSLeay/;
 
 my $pay_opt;
@@ -166,7 +165,7 @@
 	);
 
 	my %map = qw(
-		cyber_mode                  mv_cyber_mode
+		cyber_mode               mv_cyber_mode
 		comment                  giftnote
 	);
 	@map{@map} = @map;
@@ -268,16 +267,6 @@
 	return %actual;
 }
 
-%order_id_check = (
-	cybercash => sub {
-					my $val = shift;
-					# The following characters are illegal in a CyberCash order ID:
-					#    : < > = + @ " % = &
-					$val =~ tr/:<>=+\@\"\%\&/_/d;
-					return $val;
-				},
-);
-
 sub gen_order_id {
 	my $opt = shift || {};
 	if( $opt->{order_id}) {
@@ -298,10 +287,6 @@
 
 	}
 
-	if (my $check = $order_id_check{$opt->{gateway}}) {
-		$opt->{order_id} = $check->($opt->{order_id});
-	}
-
 	return $opt->{order_id};
 }
 
@@ -342,7 +327,7 @@
 	my $orderID = gen_order_id($pay_opt);
 
 	### Set up the amounts. The {amount} key will have the currency prepended,
-	### ala CyberCash (i.e. "usd 19.95"). {total_cost} has just the cost.
+	### e.g. "usd 19.95". {total_cost} has just the cost.
 
 	# Uses the {currency} -> MV_PAYMENT_CURRENCY options if set
 	my $currency =  charge_param('currency')
@@ -469,18 +454,6 @@
 		);
 		$result{MStatus} = $status if defined $status;
 	}
-	elsif ($Vend::CC3) {
-#::logDebug("Charge legacy cybercash");
-		### Deprecated
-		eval {
-			%result = cybercash($pay_opt);
-		};
-		if($@) {
-			my $msg = errmsg( "CyberCash died: %s", $@ );
-			::logError($msg);
-			$result{MStatus} = $msg;
-		}
-	}
 	else {
 #::logDebug("Unknown charge type");
 		my $msg = errmsg("Unknown charge type: %s", $charge_type);
Index: scripts/interchange.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/interchange.PL,v
retrieving revision 2.110
diff -u -r2.110 interchange.PL
--- scripts/interchange.PL	12 Nov 2008 04:15:22 -0000	2.110
+++ scripts/interchange.PL	14 Mar 2009 04:19:46 -0000
@@ -784,13 +784,6 @@
 			unless $ENV{MINIVEND_ROOT} =~ m{/blib$};
 	}
 
-# LEGACY
-	# Kept here for compatibility
-	eval {
-		require Vend::Payment::CyberCash;
-	};
-# END LEGACY
-
 	# These modules no longer necessary, why take up memory?
 	delete $INC{'Getopt/Long.pm'};
 

