1 files changed, 11 insertions, 30 deletions

diff --git a/frontend/gamma/js/Clipperz/Base.js b/frontend/gamma/js/Clipperz/Base.js
index 9d399d9..84b2172 100644
--- a/frontend/gamma/js/Clipperz/Base.js
+++ b/frontend/gamma/js/Clipperz/Base.js
@@ -1,70 +1,68 @@
 /*
 
-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.Base) == 'undefined') { Clipperz.Base = {}; }
 
 Clipperz.Base.VERSION = "0.2";
 Clipperz.Base.NAME = "Clipperz.Base";
 
 MochiKit.Base.update(Clipperz.Base, {
 
         //-------------------------------------------------------------------------
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
 
         'itemgetter': function (aKeyPath) {
         //      return MochiKit.Base.compose.apply(null, [MochiKit.Base.itemgetter('key3')]);
                 return MochiKit.Base.compose.apply(null,
                                         MochiKit.Base.map(
                                                 MochiKit.Base.itemgetter,
                                                 MochiKit.Iter.reversed(
                                                         aKeyPath.split('.')
                                                 )
                                         )
                                 );
         },
 
         //-------------------------------------------------------------------------
 
         'isUrl': function (aValue) {
                 return (MochiKit.Base.urlRegExp.test(aValue));
         },
 
         'isEmail': function (aValue) {
                 return (MochiKit.Base.emailRegExp.test(aValue));
         },
 
         //-------------------------------------------------------------------------
@@ -396,138 +394,121 @@ MochiKit.Base.update(Clipperz.Base, {
 
         //-------------------------------------------------------------------------
 
         'map': function (fn, lstObj/*, lst... */) {
                 var result;
                 
                 if (MochiKit.Base.isArrayLike(lstObj)) {
                         result = MochiKit.Base.map.apply(this, arguments);
                 } else {
                                 varkeys;
                         var values;
                         var computedValues;
                         
                         keys = MochiKit.Base.keys(lstObj);
                         values = MochiKit.Base.values(lstObj);
                         computedValues = MochiKit.Base.map(fn, values);
                         
                         result = Clipperz.Base.mergeItems(MochiKit.Base.zip(keys, computedValues));
                 }
                 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'sanitizeString': function(aValue) {
                 var result;
                 
                 if (Clipperz.Base.objectType(aValue) == 'string') {
                         result = aValue;
                         result = result.replace(/</img,"&lt;");
                         result = result.replace(/>/img,"&gt;");
                 } else {
                         result = aValue;
                 }
                 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'module': function(aValue) {
         //      aValue = 'Clipperz.PM.Compact'
 //
         //      if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
         //      if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
         //      if (typeof(Clipperz.PM.UI.Common.Components) == 'undefined') { Clipperz.PM.UI.Common.Components = {}; }
 
-//console.log(">>> module: " + aValue);
                 var currentScope;
                 var pathElements;
                 var i,c;
                 
                 currentScope = window;
                 pathElements = aValue.split('.');
                 c = pathElements.length;
                 for (i=0; i<c; i++) {
-//console.log("--- current path element: " + pathElements[i]);
-//console.log("--- current scope", currentScope);
                         if (typeof(currentScope[pathElements[i]]) == 'undefined') {
                                 currentScope[pathElements[i]] = {};
                         }
                         
                         currentScope = currentScope[pathElements[i]];
                 }
         },
         
         //-------------------------------------------------------------------------
 
         'exception': {
                         'AbstractMethod':       new MochiKit.Base.NamedError("Clipperz.Base.exception.AbstractMethod"),
                         'UnknownType':          new MochiKit.Base.NamedError("Clipperz.Base.exception.UnknownType"),
                         'VulnerabilityIssue':new MochiKit.Base.NamedError("Clipperz.Base.exception.VulnerabilityIssue"),
                         'MandatoryParameter':new MochiKit.Base.NamedError("Clipperz.Base.exception.MandatoryParameter"),
                         'ObjectNotFound':       new MochiKit.Base.NamedError("Clipperz.Base.exception.ObjectNotFound"),
                 'raise': function (aName) {
                         throw Clipperz.Base.exception[aName];
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'extend': YAHOO.extendX,
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 
 });
 
         //Original regExp courtesy of John Gruber: http://daringfireball.net/2009/11/liberal_regex_for_matching_urls
         //Updated to match Clipperz usage pattern.
 //MochiKit.Base.urlRegExp = new RegExp(/\b(([\w-]+:\/\/?|www[.])[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/)))/);
 MochiKit.Base.urlRegExp = new RegExp(/^((([\w-]+:\/\/?)|(www\.))[^\s()<>]+((?:\([\w\d]+\)|([^[:punct:]\s]|\/)))?)/);
 
         //RegExp found here: http://www.tipsntracks.com/117/validate-an-email-address-using-regular-expressions.html
 MochiKit.Base.emailRegExp = new RegExp(/^([a-zA-Z0-9_\-\.]+)@(([a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3}))|(([01]?\d\d?|2[0-4]\d|25[0-5])\.){3}([01]?\d\d?|25[0-5]|2[0-4]\d))$/);
 
 
 MochiKit.Base.registerComparator('Object dummy comparator',
         function(a, b) {
                 return ((a.constructor == Object) && (b.constructor == Object));
         },
         function(a, b) {
                 var result;
                 var aKeys;
                 var bKeys;
                 
-//MochiKit.Logging.logDebug(">>> comparator");
-//MochiKit.Logging.logDebug("- a: " + Clipperz.Base.serializeJSON(a));
-//MochiKit.Logging.logDebug("- b: " + Clipperz.Base.serializeJSON(a));
                 aKeys = MochiKit.Base.keys(a).sort();
                 bKeys = MochiKit.Base.keys(b).sort();
-                
                 result = MochiKit.Base.compare(aKeys, bKeys);
-//if (result != 0) {
-        //MochiKit.Logging.logDebug("- comparator 'keys':");
-        //MochiKit.Logging.logDebug("- comparator aKeys: " + Clipperz.Base.serializeJSON(aKeys));
-        //MochiKit.Logging.logDebug("- comparator bKeys: " + Clipperz.Base.serializeJSON(bKeys));
-//}
+
                 if (result == 0) {
                                 vari, c;
                         
                         c = aKeys.length;
                         for (i=0; (i<c) && (result == 0); i++) {
                                 result = MochiKit.Base.compare(a[aKeys[i]], b[bKeys[i]]);
-//if (result != 0) {
-        //MochiKit.Logging.logDebug("- comparator 'values':");
-        //MochiKit.Logging.logDebug("- comparator a[aKeys[i]]: " + Clipperz.Base.serializeJSON(a[aKeys[i]]));
-        //MochiKit.Logging.logDebug("- comparator b[bKeys[i]]: " + Clipperz.Base.serializeJSON(b[bKeys[i]]));
-//}
                         }
                         }       
                 
-//MochiKit.Logging.logDebug("<<< comparator - result: " + result);
                 return result;
         },
         true
 );