Diffstat (limited to 'frontend/gamma/js/Clipperz/PM/Connection.js') (more/less context) (ignore whitespace changes)
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/Connection.js | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/frontend/gamma/js/Clipperz/PM/Connection.js b/frontend/gamma/js/Clipperz/PM/Connection.js index a05a310..6a8f15e 100644 --- a/frontend/gamma/js/Clipperz/PM/Connection.js +++ b/frontend/gamma/js/Clipperz/PM/Connection.js | |||
@@ -1,25 +1,23 @@ | |||
1 | /* | 1 | /* |
2 | 2 | ||
3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
4 | 4 | ||
5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
6 | Clipperz Community Edition is an online password manager. | ||
7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
9 | 8 | ||
10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
14 | 13 | ||
15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
19 | 18 | ||
20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
22 | <http://www.gnu.org/licenses/>. | ||
23 | 21 | ||
24 | */ | 22 | */ |
25 | 23 | ||
@@ -86,7 +84,8 @@ Clipperz.PM.Connection.prototype = MochiKit.Base.update(null, { | |||
86 | //------------------------------------------------------------------------- | 84 | //------------------------------------------------------------------------- |
87 | 85 | ||
88 | 'defaultErrorHandler': function(anErrorString, anException) { | 86 | 'defaultErrorHandler': function(anErrorString, anException) { |
89 | MochiKit.Logging.logError("### Connection.defaultErrorHandler: " + anErrorString + " (" + anException + ")"); | 87 | // Clipperz.logError("### Connection.defaultErrorHandler: " + anErrorString, anException); |
88 | Clipperz.logError("### Connection.defaultErrorHandler: " + anErrorString + " (" + anException + ")"); | ||
90 | }, | 89 | }, |
91 | 90 | ||
92 | //------------------------------------------------------------------------- | 91 | //------------------------------------------------------------------------- |
@@ -273,7 +272,6 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz. | |||
273 | //========================================================================= | 272 | //========================================================================= |
274 | 273 | ||
275 | 'redeemOneTimePassword': function (someParameters) { | 274 | 'redeemOneTimePassword': function (someParameters) { |
276 | //console.log("Connections.redeemOneTimePassword", someParameters['username'], someParameters['password']); | ||
277 | /* | 275 | /* |
278 | //========================================================================= | 276 | //========================================================================= |
279 | //LOGIN WITH PASSPHRASE, extracted from the TRUNK version (LoginPanel.js) | 277 | //LOGIN WITH PASSPHRASE, extracted from the TRUNK version (LoginPanel.js) |
@@ -453,7 +451,6 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz. | |||
453 | parameters['user']['lock'] = this.serverLockValue(); | 451 | parameters['user']['lock'] = this.serverLockValue(); |
454 | } | 452 | } |
455 | 453 | ||
456 | //console.log(">>> Connection.message", aMessageName, someParameters); | ||
457 | args = { | 454 | args = { |
458 | message: aMessageName, | 455 | message: aMessageName, |
459 | srpSharedSecret: this.sharedSecret(), | 456 | srpSharedSecret: this.sharedSecret(), |
@@ -489,7 +486,7 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz. | |||
489 | 'messageExceptionHandler': function(anOriginalMessageArguments, anError) { | 486 | 'messageExceptionHandler': function(anOriginalMessageArguments, anError) { |
490 | var result; | 487 | var result; |
491 | 488 | ||
492 | console.log(">>> Connection.messageExceptionHandler", anError, anError.message); | 489 | Clipperz.log(">>> Connection.messageExceptionHandler: " + anError.message, anError); |
493 | if (anError instanceof MochiKit.Async.CancelledError) { | 490 | if (anError instanceof MochiKit.Async.CancelledError) { |
494 | result = anError; | 491 | result = anError; |
495 | } else { | 492 | } else { |
@@ -503,8 +500,8 @@ console.log(">>> Connection.messageExceptionHandler", anError, anError.message); | |||
503 | result = anError; | 500 | result = anError; |
504 | } | 501 | } |
505 | } | 502 | } |
506 | console.log("<<< Connection.messageExceptionHandler", anError) | 503 | Clipperz.log("<<< Connection.messageExceptionHandler") |
507 | 504 | ||
508 | return result;; | 505 | return result;; |
509 | }, | 506 | }, |
510 | 507 | ||