1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/Toll.js b/frontend/gamma/js/Clipperz/PM/Toll.js
index bb31c43..e9c3092 100644
--- a/frontend/gamma/js/Clipperz/PM/Toll.js
+++ b/frontend/gamma/js/Clipperz/PM/Toll.js
@@ -1,118 +1,116 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 //=============================================================================
 
 Clipperz.PM.Toll = function(args) {
 	args = args || {};
 
 	this._requestType = args.requestType;
 	this._targetValue = args.targetValue;
 	this._cost = args.cost;
 	this._toll = null;
 
 	return this;
 }
 
 Clipperz.PM.Toll.prototype = MochiKit.Base.update(null, {
 
 	'toString': function() {
 		return "Clipperz.PM.Toll (" + this.requestType() + ": " + this.cost() + " - " + ((this.toll() == null)? 'UNPAID' : 'PAID') + ")";
 	},
 
 	//-------------------------------------------------------------------------
 
 	'requestType': function() {
 		return this._requestType;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'targetValue': function() {
 		return this._targetValue;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'cost': function() {
 		return this._cost;
 	},
 	
 	//-------------------------------------------------------------------------
 
 	'toll': function() {
 		return this._toll;
 	},
 
 	//-------------------------------------------------------------------------
 /*
 	'__pay': function() {
 		var	result;
 		var	targetData;
 		var	targetMatchSize;
 		var prefixMatchingBits;
 		var	payment;
 		var i;
 		
 		if (this.toll() == null) {
 			i = 0;
 			targetData = new Clipperz.ByteArray("0x" + this.targetValue());
 			targetMatchSize = this.cost();
 		
 			payment = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(32);
 		
 			do {
 				var	paymentData;
 
 				//payment = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(32);
 				payment.increment();
 				paymentData = Clipperz.Crypto.SHA.sha256(payment);
 //				prefixMatchingBits = this.prefixMatchingBits(targetData, paymentData);
 				prefixMatchingBits = Clipperz.ByteArray.prefixMatchingBits(targetData, paymentData);
 				i++;
 			} while (prefixMatchingBits < targetMatchSize);
 
 			this._toll = payment.toHexString().substring(2)
 		}
 
 		return this;
 	},
 */	
 	//-------------------------------------------------------------------------
 
 	'innerDeferredPay': function (aTargetValue, aCost, aPayment) {
 		var deferredResult;
 		var result;
 		var payment;
 		var i;
 
 		result = null;
 		payment = aPayment;
 		i = 0;
 
 		while ((result == null) && (i < Clipperz.PM.Toll.numberOfCloseLoopIterations)) {