1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/beta/js/Clipperz/PM/Components/OTP/MainComponent.js b/frontend/beta/js/Clipperz/PM/Components/OTP/MainComponent.js
index 7b0b12b..1e94c4b 100644
--- a/frontend/beta/js/Clipperz/PM/Components/OTP/MainComponent.js
+++ b/frontend/beta/js/Clipperz/PM/Components/OTP/MainComponent.js
@@ -1,214 +1,212 @@
 /*
 
-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 = {}; }
 if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; }
 if (typeof(Clipperz.PM.Components.OTP) == 'undefined') { Clipperz.PM.Components.OTP = {}; }
 
 //#############################################################################
 
 Clipperz.PM.Components.OTP.MainComponent = function(anElement, args) {
         args = args || {};
 
 //MochiKit.Logging.logDebug("new OTP.MainComponent");
     Clipperz.PM.Components.OTP.MainComponent.superclass.constructor.call(this, anElement, args);
 
         this._user = args.user;
         this._shouldRender = true;
 
         this._deleteButton = null;
         this._printButton = null;
 
         Clipperz.NotificationCenter.register(null, 'tabSelected', this, 'tabSelectedHandler');
         //Clipperz.NotificationCenter.register(null, 'oneTimePasswordAdded', this, 'render');
         
         return this;
 }
 
 //=============================================================================
 
 YAHOO.extendX(Clipperz.PM.Components.OTP.MainComponent, Clipperz.PM.Components.BaseComponent, {
 
         'toString': function() {
                 return "Clipperz.PM.Components.OTP.MainComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'render': function() {
 //MochiKit.Logging.logDebug("### OTP.MainComponent.render");
                 Clipperz.NotificationCenter.unregister(this);
                 MochiKit.Signal.disconnectAllTo(this);
 
                 if (Clipperz.PM.Proxy.defaultProxy.isReadOnly()) {
                         this.element().update("");
                         this.domHelper().append(this.element(), {tag:'div', cls:'oneTimePasswordReadOnlyMessage', htmlString:Clipperz.PM.Strings['oneTimePasswordReadOnlyMessage']});
                 } else {
                         var deferredResult;
 
                         deferredResult = new MochiKit.Async.Deferred();
 
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 1: " + res); return res;});
                         deferredResult.addCallback(MochiKit.Base.bind(function() {
                                 this.element().update("");
                                 Clipperz.YUI.DomHelper.append(this.element(), {tag:'div', htmlString:Clipperz.PM.Strings['oneTimePasswordLoadingMessage']});
                         }, this));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 2: " + res); return res;});
                         deferredResult.addCallback(MochiKit.Base.method(this.user(), 'loadOneTimePasswords'));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 3: " + res); return res;});
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OTP.MainComponent.render - 3.1: " + Clipperz.Base.serializeJSON(res.serializedData())); return res;});
                         deferredResult.addCallback(MochiKit.Base.bind(function(aResult) {
                                         vartbodyElement;
                                         varoneTimePasswordReferenceKeys;
                                 var imageExtension;
                                 var isThereAnyActiveOneTimePassword;
 
                                 isThereAnyActiveOneTimePassword = false;
                                 
                                 this.element().update("");
                                 Clipperz.YUI.DomHelper.append(this.element(), {tag:'div', id:'oneTimePasswordList', children:[
                                         {tag:'div', id:'oneTimePasswords_header', children:[
                                                 {tag:'table', width:'100%', children:[
                                                         {tag:'tbody', children:[
                                                                 {tag:'tr', children:[
                                                                         {tag:'td', width:'10%', children:[
                                                                                 {tag:'div', id:this.getId('createNewOneTimePasswordButton')}
                                                                         ]},
                                                                         {tag:'td', width:'40%', children:[
                                                                                 {tag:'div', id:this.getId('deleteSelectedOneTimePasswordButton')}
                                                                         ]},
                                                                         {tag:'td', width:'50%', align:'right', children:[
                                                                                 {tag:'div', id:this.getId('printOneTimePasswordButton')}
                                                                         ]}
                                                                 ]}
                                                         ]}
                                                 ]},
                                                 {tag:'div', children:[
                                                         {tag:'ul', children:[
                                                                 {tag:'li', children:[
                                                                         {tag:'span', htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_selectLabel']}
                                                                 ]},
                                                                 {tag:'li', children:[
                                                                         {tag:'a', href:'#', id:this.getId('selectAllOneTimePasswords_link'), htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_all']}
                                                                 ]},
                                                                 {tag:'li', children:[
                                                                         {tag:'a', href:'#', id:this.getId('selectNoneOneTimePasswords_link'), htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_none']}
                                                                 ]},
                                                                 {tag:'li', children:[
                                                                         {tag:'a', href:'#', id:this.getId('selectUsedOneTimePasswords_link'), htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_used']}
                                                                 ]},
                                                                 {tag:'li', children:[
                                                                         {tag:'a', href:'#', id:this.getId('selectUnusedOneTimePasswords_link'), htmlString:Clipperz.PM.Strings['oneTimePasswordSelectionLink_unused']}
                                                                 ]}
                                                         ]}
                                                 ]}
                                         ]},
                                         {tag:'form', id:this.getId('oneTimePasswords_form'), children:[
                                                 {tag:'table', cls:'oneTimePassword', cellspacing:'0', cellpadding:'2', children:[
                                                         {tag:'tbody', id:this.getId('oneTimePasswords_tbody'), children:[
                                                         ]}
                                                 ]}
                                         ]}
                                 ]});
 
                                 imageExtension = (Clipperz_IEisBroken == true) ? 'gif': 'png';
 
                                 tbodyElement = this.getElement('oneTimePasswords_tbody');
                                 oneTimePasswordReferenceKeys = MochiKit.Base.keys(this.user().oneTimePasswordManager().oneTimePasswords()).reverse();
                                 c = oneTimePasswordReferenceKeys.length;
                                 if (c>0) {
                                         for (i=0; i<c; i++) {
                                                 var otpReference;
                                                 var currentOTP;
                                                 var loginSessionInfoConfig;
 
                                                 imageExtension = (Clipperz_IEisBroken == true) ? 'gif': 'png';
 
                                                 otpReference = oneTimePasswordReferenceKeys[i];
                                                 currentOTP = this.user().oneTimePasswordManager().oneTimePasswords()[otpReference];
 
                                                 switch (currentOTP.status()) {
                                                         case 'USED':
                                                                 var loginSessionInfo;
 
                                                                 loginSessionInfo = currentOTP.connectionInfo();
                                                                 try {
                                                                         var ip;
 
                                                                         ip = (currentOTP.connectionInfo()['ip'].match(/^\d{1,3}(.\d{1,3}){3}$/)) ? currentOTP.connectionInfo()['ip'] : Clipperz.PM.Strings['unknown_ip'];
 
                                                                         loginSessionInfoConfig = [
                                                                                 {tag:'div', cls:'oneTimePassword_usageDateDescription', children:[
                                                                                         {tag:'span', cls:'value', html:Clipperz.PM.Date.getElapsedTimeDescription(currentOTP.usageDate())}
                                                                                 ]},
                                                                                 {tag:'div', cls:'oneTimePassword_usageDetails', children:[
                                                                                         {tag:'img', cls:'flag', title:Clipperz.PM.Strings['countries'][ loginSessionInfo['country']], src:Clipperz.PM.Strings['icons_baseUrl'] + "/flags/" + loginSessionInfo['country'].toLowerCase() + "." +  imageExtension, width:'32', height:'32'},
                                                                                         {tag:'img', cls:'browser', title:Clipperz.PM.Strings['browsers'][ loginSessionInfo['browser']], src:Clipperz.PM.Strings['icons_baseUrl'] + "/browsers/" + loginSessionInfo['browser'].toLowerCase() + "." + imageExtension, width:'32', height:'32'},
                                                                                         {tag:'img', cls:'operatingSystem', title:Clipperz.PM.Strings['operatingSystems'][loginSessionInfo['operatingSystem']], src:Clipperz.PM.Strings['icons_baseUrl'] + "/operatingSystems/" + loginSessionInfo['operatingSystem'].toLowerCase() + "." + imageExtension, width:'32', height:'32'}
                                                                                 ]},
                                                                                 {tag:'div', cls:'oneTimePassword_usageDate', html:Clipperz.PM.Date.formatDateWithTemplate(currentOTP.usageDate(), Clipperz.PM.Strings['fullDate_format'])},
                                                                                 {tag:'div', cls:'oneTimePassword_IP', children:[
                                                                                         {tag:'span', cls:'oneTimePassword_IPLabel', htmlString:Clipperz.PM.Strings['loginHistoryIPLabel']},
                                                                                         {tag:'span', cls:'oneTimePassword_IPValue', html:ip}
                                                                                 ]}
                                                                         ];
                                                                 } catch(exception) {
                                                                         MochiKit.Logging.logWarning("an error occured while showing the One Time Password session details");
                                                                         loginSessionInfoConfig = [];
                                                                 }
                                                                 break;
                                                         case 'DISABLED':
                                                                 loginSessionInfoConfig = [
                                                                         {tag:'span', cls:'disabledOneTimePassword', htmlString:Clipperz.PM.Strings['disabledOneTimePassword_warning']}
                                                                 ];
                                                                 break;
                                                         case 'ACTIVE':
                                                         default:
                                                                 loginSessionInfoConfig = [];
                                                                 break;
                                                 }
 
 
                                                 if (currentOTP.isExpired() == false) {
                                                         isThereAnyActiveOneTimePassword = true;
                                                 };
 
                                                 
                                                 this.domHelper().append(tbodyElement, {tag:'tr', cls:(currentOTP.isExpired() ? 'oneTimePassword_used': 'oneTimePassword_new'), children:[
                                                         {tag:'td', valign:'top', children:[
                                                                 {tag:'input', type:'checkbox', cls:'otpCheckbox', name:currentOTP.reference()}
                                                         ]},
                                                         {tag:'td', valign:'top', children:[
                                                                 {tag:'span', cls:'oneTimePassword_value', html:currentOTP.password()}
                                                         ]},
                                                         {tag:'td', valign:'top', children:[
                                                                 {tag:'div', cls:'oneTimePassword_usageStats', children:loginSessionInfoConfig}
                                                         ]}
                                                 ]});
                                         }
                                 } else {
                                         this.domHelper().append(tbodyElement, {tag:'tr', children:[
                                                 {tag:'td', children:[