1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/beta/js/Clipperz/PM/Proxy.js b/frontend/beta/js/Clipperz/PM/Proxy.js
index bec9195..cf5a237 100644
--- a/frontend/beta/js/Clipperz/PM/Proxy.js
+++ b/frontend/beta/js/Clipperz/PM/Proxy.js
@@ -1,169 +1,167 @@
 /*
 
-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.Proxy = function(args) {
         args = args || {};
 
         this._shouldPayTolls = args.shouldPayTolls || false;
 
         this._tolls = {
                         'CONNECT':[],
                         'REGISTER':[],
                         'MESSAGE':[]
         };
 
         if (args.isDefault === true) {
                 Clipperz.PM.Proxy.defaultProxy = this;
         }
 
         return this;
 }
 
 Clipperz.PM.Proxy.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Clipperz.PM.Proxy";
         },
 
         //=========================================================================
 
         'shouldPayTolls': function() {
                 return this._shouldPayTolls;
         },
 
         //-------------------------------------------------------------------------
 
         'tolls': function() {
                 return this._tolls;
         },
 
         //-------------------------------------------------------------------------
 
         'payToll': function(aRequestType, someParameters) {
                         vardeferredResult;
 
 //console.log(">>> Proxy.payToll", aRequestType, someParameters);
                 if (this.shouldPayTolls()) {
                         deferredResult = new MochiKit.Async.Deferred();
 
                         if (this.tolls()[aRequestType].length == 0) {
                                 deferredResult.addCallback(MochiKit.Base.method(this, 'sendMessage', 'knock', {requestType:aRequestType}));
                                 deferredResult.addCallback(MochiKit.Base.method(this, 'setTollCallback'));
                         }
                         deferredResult.addCallback(MochiKit.Base.method(this.tolls()[aRequestType], 'pop'));
                         deferredResult.addCallback(MochiKit.Base.methodcaller('deferredPay'));
                         deferredResult.addCallback(function(aToll) {
                                 var result;
                         
                                 result = {
                                         parameters: someParameters,
                                         toll: aToll
                                 }
                                 
                                 return result;
                         });
                 
                         deferredResult.callback();
                 } else {
                         deferredResult = MochiKit.Async.succeed({parameters:someParameters});
                 }
 //console.log("<<< Proxy.payToll");
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'addToll': function(aToll) {
 //console.log(">>> Proxy.addToll", aToll);
                 this.tolls()[aToll.requestType()].push(aToll);
 //console.log("<<< Proxy.addToll");
         },
 
         //=========================================================================
 
         'setTollCallback': function(someParameters) {
 //console.log(">>> Proxy.setTollCallback", someParameters);
                 if (typeof(someParameters['toll']) != 'undefined') {
 //console.log("added a new toll", someParameters['toll']);
                         this.addToll(new Clipperz.PM.Toll(someParameters['toll']));
                 }
 //console.log("<<< Proxy.setTallCallback", someParameters['result']);
                 return someParameters['result'];
         },
 
         //=========================================================================
 
         'registration': function (someParameters) {
                 return this.processMessage('registration', someParameters, 'REGISTER');
         },
 
         'handshake': function (someParameters) {
                 return this.processMessage('handshake', someParameters, 'CONNECT');
         },
 
         'message': function (someParameters) {
                 return this.processMessage('message', someParameters, 'MESSAGE');
         },
 
         'logout': function (someParameters) {
                 return this.processMessage('logout', someParameters, 'MESSAGE');
         },
 
         //=========================================================================
 
         'processMessage': function (aFunctionName, someParameters, aRequestType) {
                         vardeferredResult;
 
                 deferredResult = new MochiKit.Async.Deferred();
                 deferredResult.addCallback(MochiKit.Base.method(this, 'payToll', aRequestType));
                 deferredResult.addCallback(MochiKit.Base.method(this, 'sendMessage', aFunctionName));
                 deferredResult.addCallback(MochiKit.Base.method(this, 'setTollCallback'));
                 deferredResult.callback(someParameters);
                 
                         return deferredResult;  
         },
 
         //=========================================================================
 
         'sendMessage': function () {
                         throw Clipperz.Base.exception.AbstractMethod;   
         },
 
         //=========================================================================
 
         'isReadOnly': function () {
                 return false;
         },
 
         //=========================================================================
         __syntaxFix__: "syntax fix"
         
 });