14 files changed, 165 insertions, 262 deletions
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLogin.js b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLogin.js
index 8f8696d..507ee31 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLogin.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLogin.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -331,3 +329,3 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
-//console.log("PROCESS CONFIGURATION", aConfiguration);
+//Clipperz.log("PROCESS CONFIGURATION", aConfiguration);
                switch (aConfiguration['bookmarkletVersion']) {
@@ -483,6 +481,5 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
                bookmarkletConfiguration = Clipperz.PM.DataModel.DirectLogin.checkBookmarkletConfiguration(aValue);
-//console.log("BOOKMARKLET CONFIGURATION", bookmarkletConfiguration);
                return Clipperz.Async.callbacks("DirectLogin.setBookmarkletConfiguration", [
                        MochiKit.Base.method(this, 'setValue', 'formData', bookmarkletConfiguration['form']),
-//function (aValue) { console.log("SET VALUE - formData", aValue); return aValue; },
                        MochiKit.Base.method(this, 'setValue', 'bookmarkletVersion', bookmarkletConfiguration['version']),
@@ -538,6 +535,3 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
                return Clipperz.Async.callbacks("DirectLogin.updateInputsAfterChangingBookmarkletConfiguration", [
-        //              MochiKit.Base.method(this, 'getValue', ''),
-//function (aValue) { console.log("VALUE", aValue); return aValue },
                        MochiKit.Base.method(this, 'getValue', 'formData'),
-//function (aValue) { console.log("FORM DATA", aValue); return aValue },
                        MochiKit.Base.method(this, 'setInputWithFormDataConfiguration')
@@ -552,3 +546,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
                        MochiKit.Base.values,
-        //function (aValue) { console.log("INPUTS", aValue); return aValue; },          
                        MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.partial(MochiKit.Base.method(this, 'inputValue'))),
@@ -676,3 +669,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
                                }, this))
-//console.log("THIS._BINDINGS", this._bindings);
@@ -682,3 +674,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
                                this._bindings = {};
-//console.log("CONFIGURATION", aConfiguration);
@@ -688,3 +679,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
-//console.log("BINDING DATA", someValues['currentValues']['bindingData']);
                                                for (bindingKey in someValues['currentValues']['bindingData']) {
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginBinding.js b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginBinding.js
index 4377853..a8ebb97 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginBinding.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginBinding.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginFormValue.js b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginFormValue.js
index a461197..2429f88 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginFormValue.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginFormValue.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -89,3 +87,2 @@ Clipperz.PM.DataModel.DirectLoginFormValue.prototype = MochiKit.Base.update(null
        'setValue': function (aValue) {
-//console.log("DirectLoginFormValue.setValue", aValue);
                this._value = aValue;
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginInput.js b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginInput.js
index 8188389..d9995fc 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginInput.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginInput.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -78,3 +76,3 @@ Clipperz.PM.DataModel.DirectLoginInput.prototype = MochiKit.Base.update(null, {
                var result;
-//console.log("### DirectLoginInput.formConfiguration", someFields);
                if (this.shouldSetValue()) {
@@ -156,8 +154,2 @@ Clipperz.PM.DataModel.DirectLoginInput.prototype = MochiKit.Base.update(null, {
-//console.log("### binding", binding);
-//if (binding != null) {
-        ///console.log("    binding.field()", binding.field());
-        ///console.log("    binding.field().value()", binding.field().value());
-        //console.log("    someFields[binding.fieldKey()].value()", someFields[binding.fieldKey()].value());
-//}
                        result = MochiKit.DOM.INPUT({
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js b/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
index cdeec8b..1aa7a52 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -413,6 +411,2 @@ Clipperz.PM.DataModel.EncryptedRemoteObject.prototype = MochiKit.Base.update(nul
                        deferredResult.addCallback(function (someValues) {
-//if (someValues['decryptedData'] != someValues['objectData']) {
-        //console.log("ORIGINAL DATA", '[[[' + someValues['decryptedData'] + ']]]');
-        //console.log("CURRENT  DATA", '>>>' + someValues['objectData'] + '<<<');
-//}
                                return (someValues['decryptedData'] != someValues['objectData']);
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/OneTimePassword.js b/frontend/gamma/js/Clipperz/PM/DataModel/OneTimePassword.js
index 834e21b..fbca1ff 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/OneTimePassword.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/OneTimePassword.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -145,8 +143,8 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
                encodedPassphrase = new Clipperz.ByteArray(this.user().passphrase()).toBase64String();
-//MochiKit.Logging.logDebug("--- encodedPassphrase.length: " + encodedPassphrase.length);
+//Clipperz.logDebug("--- encodedPassphrase.length: " + encodedPassphrase.length);
                prefixPadding = getRandomBytes(getRandomBytes(1).byteAtIndex(0)).toBase64String();
-//MochiKit.Logging.logDebug("--- prefixPadding.length: " + prefixPadding.length);
+//Clipperz.logDebug("--- prefixPadding.length: " + prefixPadding.length);
                suffixPadding = getRandomBytes((500 - prefixPadding.length - encodedPassphrase.length) * 6 / 8).toBase64String();
-//MochiKit.Logging.logDebug("--- suffixPadding.length: " + suffixPadding.length);
+//Clipperz.logDebug("--- suffixPadding.length: " + suffixPadding.length);
-//MochiKit.Logging.logDebug("--- total.length: " + (prefixPadding.length + encodedPassphrase.length + suffixPadding.length));
+//Clipperz.logDebug("--- total.length: " + (prefixPadding.length + encodedPassphrase.length + suffixPadding.length));
        
@@ -160,4 +158,4 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
                result = packedPassphrase;
-//MochiKit.Logging.logDebug("===== OTP packedPassprase: [" + result.length + "]" + result);
+//Clipperz.logDebug("===== OTP packedPassprase: [" + result.length + "]" + result);
-//MochiKit.Logging.logDebug("<<< OneTimePassword.packedPassphrase");
+//Clipperz.logDebug("<<< OneTimePassword.packedPassphrase");
@@ -178,4 +176,4 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
-//MochiKit.Logging.logDebug(">>> OneTimePassword.encryptedData");
+//Clipperz.logDebug(">>> OneTimePassword.encryptedData");
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - id: " + this.reference());
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - id: " + this.reference());
                result = {
@@ -187,10 +185,10 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
                }
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 2: " + Clipperz.Base.serializeJSON(result));
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 2: " + Clipperz.Base.serializeJSON(result));
                deferredResult = new MochiKit.Async.Deferred();
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 3");
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 3");
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.encryptedData - 1: " + res); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.encryptedData - 1: " + res); return res;});
        //#     deferredResult.addCallback(Clipperz.PM.Crypto.deferredEncryptWithCurrentVersion, this.passwordValue(), this.packedPassphrase());
                deferredResult.addCallback(MochiKit.Base.method(this, 'encryptedPackedPassphrase'));
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 4");
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 4");
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.encryptedData - 2: [" + res.length + "]" + res); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.encryptedData - 2: [" + res.length + "]" + res); return res;});
                deferredResult.addCallback(function(aResult, res) {
@@ -199,6 +197,6 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
                }, result);
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 5");
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 5");
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.encryptedData - 3: " + Clipperz.Base.serializeJSON(res)); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.encryptedData - 3: " + Clipperz.Base.serializeJSON(res)); return res;});
                deferredResult.callback();
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 6");
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 6");
                
@@ -213,3 +211,3 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
-//MochiKit.Logging.logDebug(">>> OneTimePassword.saveChanges");
+//Clipperz.logDebug(">>> OneTimePassword.saveChanges");
                result = {};
@@ -232,3 +230,3 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveOTP_sendingData');
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.saveChanges - 1: " + Clipperz.Base.serializeJSON(res)); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.saveChanges - 1: " + Clipperz.Base.serializeJSON(res)); return res;});
                deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'addNewOneTimePassword');
@@ -236,8 +234,8 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveOTP_updatingInterface');
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.saveChanges - 2: " + res); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.saveChanges - 2: " + res); return res;});
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'notify', 'OTPUpdated');
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'oneTimePassword_saveChanges_done', null);
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.saveChanges - 2: " + res); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.saveChanges - 2: " + res); return res;});
                deferredResult.callback();
-//MochiKit.Logging.logDebug("<<< OneTimePassword.saveChanges");
+//Clipperz.logDebug("<<< OneTimePassword.saveChanges");
                
@@ -310,3 +308,2 @@ Clipperz.PM.DataModel.OneTimePassword.isValidOneTimePasswordValue = function(aPa
        //"yaxx k7ww - f8y6 tqz5 - 58b6 th44 - 9cwv q0fg"
-//console.log("Clipperz.PM.DataModel.OneTimePassword.isValidOneTimePasswordValue", aPassword);
        if (aPassword.replace(/[\s\-]/g, '').length == 32) {
@@ -349,3 +346,2 @@ Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword = function(aPass
-//console.log("Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword", aPassword, result);
        return result;
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.Field.js b/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.Field.js
index f51bbc2..986db40 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.Field.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.Field.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.js b/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.js
index dd35fc9..87b319c 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -30,3 +28,2 @@ try { if (typeof(Clipperz.PM.DataModel.Record) == 'undefined') { throw ""; }} ca
 Clipperz.PM.DataModel.Record.Version = function(args) {
-//console.log(">>> Record.new");
        Clipperz.PM.DataModel.Record.Version.superclass.constructor.apply(this, arguments);
@@ -101,3 +98,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record.Version, Clipperz.PM.DataModel
                
-//console.log("Record.Version - UNPACK DATA", this, someData);
                result = someData;
@@ -294,3 +290,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record.Version, Clipperz.PM.DataModel
-//console.log("prepareRemoteDataWithKey", aKey);
                deferredResult = new Clipperz.Async.Deferred("Record.Version.prepareRemoteDataWithKey", {trace:false});
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/Record.js b/frontend/gamma/js/Clipperz/PM/DataModel/Record.js
index b816f80..3fc1813 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/Record.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -31,3 +29,2 @@ if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {};
 Clipperz.PM.DataModel.Record = function(args) {
-//console.log(">>> new Clipperz.PM.DataModel.Record", args);
        Clipperz.PM.DataModel.Record.superclass.constructor.apply(this, arguments);
@@ -64,4 +61,2 @@ Clipperz.PM.DataModel.Record = function(args) {
-//console.log("<<< new Clipperz.PM.DataModel.Record", args);
        return this;
@@ -212,3 +207,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
-//console.log(">>> searchableContent");
                deferredResult = new Clipperz.Async.Deferred("Record.searchableContent", {trace:false});
@@ -226,3 +220,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                deferredResult.callback();
-//console.log("<<< searchableContent");
@@ -272,3 +265,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
        //              this.transientState().setValue('directLogins', this._directLogins)
-//console.log("SET TRANSIENT STATE", Clipperz.Base.serializeJSON(MochiKit.Base.keys(this.transientState().getValue('directLogins'))))
                        MochiKit.Iter.forEach(MochiKit.Base.keys(this._directLogins), MochiKit.Base.bind(function(aKey) {
@@ -331,3 +323,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
-//console.log("new Clipperz.PM.DataModel.Record.Version [2]");
 /*
@@ -342,3 +333,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                for (versionKey in someData['versions']) {
-//console.log("### versionKey", versionKey);
                        this._versions[versionKey] = new Clipperz.PM.DataModel.Record.Version({
@@ -353,3 +343,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                this._currentVersionReference = someData['currentVersion'];
-//console.log("=== currentVersionReference", this._currentVersionReference, someData);
@@ -538,3 +527,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
        'currentVersionReference': function () {
-//console.log("currentVersionReference");
                return this._currentVersionReference;
@@ -587,3 +575,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
        'getCurrentRecordVersionKey': function () {
-//console.log("getCurrentRecordVersionKey");
                return Clipperz.Async.callbacks("Record.getCurrentRecordVersionKey", [
@@ -608,6 +595,4 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
        'invokeCurrentRecordVersionMethod': function (aMethodName, someValues) {
-//console.log(">>> invokeCurrentRecordVersionMethod", aMethodName);
                return Clipperz.Async.callbacks("Record.invokeCurrentRecordVersionMethod", [
                        MochiKit.Base.method(this, 'getCurrentRecordVersion'),
-//function (aValue) { console.log("=== getCurrentRecordVersion", aValue); return aValue},
                        MochiKit.Base.methodcaller(aMethodName, someValues)
@@ -620,12 +605,7 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                        MochiKit.Base.method(this, 'currentVersionReference'),
-//function (aValue) { console.log("LAZY -> versions", aValue); return aValue; },
                        Clipperz.Async.deferredIf("versions has been loaded", [
-//function (aValue) { console.log("LAZY -> then"); return aValue; },
                                MochiKit.Base.method(this, 'getCurrentRecordVersion'),
                                MochiKit.Base.methodcaller(aMethodName, someValues),
-//function (aValue) { console.log("LAZY <- then"); return aValue; }
                        ], [
-//function (aValue) { console.log("LAZY -> else"); return aValue; },
                                MochiKit.Base.partial(MochiKit.Async.succeed, defaultResult),
-//function (aValue) { console.log("LAZY <- else"); return aValue; }
                        ])
@@ -650,3 +630,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                                        MochiKit.Base.method(this, 'directLogins'),
-//function (aValue) { console.log("Record.directLogins", aValue); return aValue; },
                                        MochiKit.Base.values,
@@ -660,3 +639,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                        });
-//deferredResult.addCallback(function (aValue) { console.log("Record.hasPendingResults", aValue); return aValue; });
                        deferredResult.addCallback(MochiKit.Base.values);
@@ -778,3 +756,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                        MochiKit.Base.method(this, 'directLogins'),
-//function (aValue) { console.log("resetTransientState - directLogins", aValue); return aValue; },
                        MochiKit.Base.values,
@@ -818,3 +795,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
        'retrieveDirectLoginIndexDataFunction': function () {
-//console.log("Record.retrieveDirectLoginIndexDataFunction", this._retrieveDirectLoginIndexDataFunction);
                return this._retrieveDirectLoginIndexDataFunction;
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Legacy.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Legacy.js
index d6202ff..cda5a41 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Legacy.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Legacy.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.OneTimePasswords.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.OneTimePasswords.js
index 3528db6..e82da47 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.OneTimePasswords.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.OneTimePasswords.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -53,5 +51,3 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.OneTimePasswords, Clipper
-console.log(">>> OneTimePasswords.packData", someData);
                result = Clipperz.PM.DataModel.User.Header.OneTimePasswords.superclass.packData.apply(this, arguments);
-console.log("<<< OneTimePasswords.packData");
@@ -65,5 +61,3 @@ console.log("<<< OneTimePasswords.packData");
-console.log(">>> OneTimePasswords.packRemoteData", someData);
                result = Clipperz.PM.DataModel.User.Header.OneTimePasswords.superclass.packRemoteData.apply(this, arguments);
-console.log("<<< OneTimePasswords.packRemoteData");
@@ -77,5 +71,3 @@ console.log("<<< OneTimePasswords.packRemoteData");
-console.log(">>> OneTimePasswords.prepareRemoteDataWithKey");
                result = Clipperz.PM.DataModel.User.Header.OneTimePasswords.superclass.prepareRemoteDataWithKey.apply(this, arguments);
-console.log("<<< OneTimePasswords.prepareRemoteDataWithKey");
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Preferences.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Preferences.js
index b164889..f1f95e8 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Preferences.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Preferences.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.RecordIndex.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.RecordIndex.js
index f77ea80..5681f70 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.RecordIndex.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.RecordIndex.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -34,3 +32,2 @@ Clipperz.PM.DataModel.User.Header.RecordIndex = function(args) {
-//console.log("NEW Clipperz.PM.DataModel.User.Header.RecordIndex", args);
        this._recordsData = new Clipperz.PM.DataModel.EncryptedRemoteObject({
@@ -120,3 +117,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.RecordIndex, Object, {
        'resetTransientState': function (isCommitting) {
-//console.log("######## UserHeaderRecordIndex - resetTransientState", Clipperz.Base.deepClone(this._transientState));
                if (this._transientState != null) {
@@ -160,3 +156,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.RecordIndex, Object, {
        'setDirectLoginIndexData': function (aDirectLoginReference, aKey, aValue) {
-//console.log("UserHeaderRecordIndex.setDirectLoginIndexData", aDirectLoginReference, this.directLoginsIndex()[aDirectLoginReference], aKey);
 //if (MochiKit.Base.isUndefinedOrNull(this.directLoginsIndex()[aDirectLoginReference])) {
@@ -168,3 +163,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.RecordIndex, Object, {
        'addDirectLoginIndexData': function (aDirectLoginReference) {
-//console.log("UserHeaderRecordIndex.addDirectLoginIndexData", aDirectLoginReference, this.directLoginsIndex()[aDirectLoginReference]);
                return this.directLoginsData().setValue(this.directLoginsIndex()[aDirectLoginReference], {});
@@ -263,8 +257,3 @@ Clipperz.log("SKIPPING record " + reference + " as there are no stas associated
                                                } else {
-Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
+                                                        Clipperz.logWarning("WARNING: DIRECT LOGIN without a matching RECORD!!");
-//console.log("direct login data", someData['directLogins']);
-//console.log("current direct login data", someData['directLogins'][indexReference])
-//console.log("reference", reference);
-//console.log("record index", this.recordsIndex());
-//console.log("record inverted index", recordsInvertedIndex);
                                                }
@@ -307,3 +296,2 @@ Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
-//console.log("#### new Clipperz.PM.DataModel.Record [4]");
                newRecord = new Clipperz.PM.DataModel.Record({
@@ -388,5 +376,3 @@ Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
-//console.log("UserHeaderRecordIndex.createNewDirectLogin [1]", newDirectLogin.reference(), newDirectLoginIndexValue);
                this.directLoginsIndex()[newDirectLogin.reference()] = newDirectLoginIndexValue;
-//console.log("UserHeaderRecordIndex.createNewDirectLogin [2]", newDirectLogin.reference(), this.directLoginsIndex()[newDirectLogin.reference()]);
                this.directLoginsData().setValue(this.directLoginsIndex()[newDirectLogin.reference()], {'record': this.recordsIndex()[aRecord.reference()]});
@@ -433,3 +419,2 @@ Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
                });
-//deferredResult.addCallback(function (aValue) { console.log("USER.Header.RecordIndex.hasAnyCleanTextData", aValue); return aValue});
@@ -463,3 +448,2 @@ Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
                });
-//deferredResult.addCallback(function (aValue) { console.log("UserHeaderIndex.hasPendingResults", aValue); return aValue; });
                deferredResult.addCallback(Clipperz.Async.or);
@@ -572,3 +556,2 @@ Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
-//console.log("recordsIndex", this.recordsIndex());
                result = {};
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
index 646ce21..fd18faf 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
@@ -2,6 +2,5 @@
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
@@ -9,10 +8,10 @@ refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
@@ -20,4 +19,3 @@ refer to http://www.clipperz.com.
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <http://www.gnu.org/licenses/>.
@@ -330,3 +328,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
-//console.log(">>> ***************** user.unpackServerData", someServerData);
        //      this.setServerLockValue(someServerData['lock']);
@@ -419,3 +416,2 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                this._serverData = unpackedData;
-//console.log("<<< ***************** user.unpackServerData", this._serverData);