Enano CMS (1.1.x): comparison includes/clientside/static/login.js

Mercurial Mercurial > repos > enano-1.1 / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

includes/clientside/static/login.js

changeset 887	cb96d038baff
parent 883	ac2cef868fa9
child 899	df88cedf0995

equal deleted inserted replaced

-:041c86ff16d5
+:cb96d038baff
 var ajax_login_loadimg_path = false;
 if ( !ajax_login_successimg_path )
 var ajax_login_successimg_path = false;
+if ( !ajax_login_lockimg_path )
+var ajax_login_lockimg_path = false;
 /**
 * Status variables
 * @var int
 */
 * @var int
 */
 var AJAX_STATE_EARLY_INIT = 1;
 var AJAX_STATE_LOADING_KEY = 2;
+/**
+* Switch to decide if DiffieHellman shows a "browser incompatible" error
+* @var bool
+*/
+var ajax_login_prevent_dh = IE || is_iPhone;
 /**
 * Performs the AJAX request to get an encryption key and from there spawns the login form.
 * @param function The function that will be called once authentication completes successfully.
 * @param int The security level to authenticate at - see http://docs.enanocms.org/Help:Appendix_B
 // Append a br or two to space things properly
 div.appendChild(document.createElement('br'));
 div.appendChild(document.createElement('br'));
 var img = document.createElement('img');
-img.src = ( ajax_login_loadimg_path ) ? ajax_login_loadimg_path : scriptPath + '/images/loading-big.gif';
+img.src = ( ajax_login_lockimg_path ) ? ajax_login_lockimg_path : scriptPath + '/images/lock48.png';
 div.appendChild(img);
 // Another coupla brs
 div.appendChild(document.createElement('br'));
 div.appendChild(document.createElement('br'));
 */
 window.ajaxLoginBuildForm = function(data)
 {
 // let's hope this effectively preloads the image...
-var _ = document.createElement('img');
+var _1 = document.createElement('img');
-_.src = ( ajax_login_successimg_path ) ? ajax_login_successimg_path : scriptPath + '/images/check.png';
+_1.src = ( ajax_login_successimg_path ) ? ajax_login_successimg_path : scriptPath + '/images/check.png';
+var _2 = document.createElement('img');
+_2.src = ( ajax_login_lockimg_path ) ? ajax_login_lockimg_path : scriptPath + '/images/lock48.png';
 var div = document.createElement('div');
 div.id = 'ajax_login_form';
 var show_captcha = ( data.locked_out && data.lockout_info.lockout_policy == 'captcha' ) ? data.lockout_info.captcha : false;
 form.appendChild(lbl_remember);
 }
 // Field: enable Diffie Hellman
-if ( IE || is_iPhone )
+if ( ajax_login_prevent_dh )
 {
 var lbl_dh = document.createElement('span');
 lbl_dh.style.fontSize = 'smaller';
 lbl_dh.style.display = 'block';
 lbl_dh.style.textAlign = 'center';
 {
 alert('BUG: AES self-test failed');
 login_cache.mb_object.destroy();
 return false;
 }
+// Early submit hook
+eval(setHook('login_submit_early'));
 // Hide the error message and captcha
 if ( document.getElementById('ajax_login_error_box') )
 {
 document.getElementById('ajax_login_error_box').parentNode.removeChild(document.getElementById('ajax_login_error_box'));
 }
 {
 var do_dh = document.getElementById('ajax_login_field_dh').checked;
 }
 else
 {
-if ( IE || is_iPhone )
+if ( ajax_login_prevent_dh )
 {
 // IE/MobileSafari doesn't have this control, continue silently IF the rest
 // of the login form is there
 if ( !document.getElementById('ajax_login_field_username') )
 {
 {
 // Wait while the browser updates the login window
 setTimeout(function()
 {
 ajaxLoginSubmitForm(true, username, password, captcha, remember_session);
-}, 200);
+}, 20);
 return true;
 }
+var dh_start = (new Date()).getTime();
 // Perform Diffie Hellman stuff
 var dh_priv = dh_gen_private();
 var dh_pub = dh_gen_public(dh_priv);
 var secret = dh_gen_shared_secret(dh_priv, logindata.key_dh);
 // secret_hash is used to verify that the server guesses the correct secret
 var secret_hash = hex_sha1(secret);
 // crypt_key is the actual AES key
 var crypt_key = (hex_sha256(secret)).substr(0, (keySizeInBits / 4));
+var dh_time = (new Date()).getTime() - dh_start;
+console.debug("DH: complete, time = %dms", dh_time);
 }
 else
 {
 var crypt_key = logindata.key_aes;
 }
 switch ( response.error_code )
 {
 default:
 var ls = $lang.get('user_err_' + response.error_code);
 if ( ls == 'user_err_' + response.error_code )
-ls = $lang.get(response.error_code);
+// Adding response here allows language strings to utilize additional information passed from the error packet
+ls = $lang.get(response.error_code, response);
 return ls;
 break;
 case 'locked_out':
 if ( response.respawn_info.lockout_info.lockout_policy == 'lockout' )
 body.appendChild(mydiv);
 }
 window.ajaxInitLogout = function()
 {
-load_component(['messagebox', 'l10n', 'flyin', 'fadefilter']);
+load_component(['messagebox', 'l10n', 'flyin', 'fadefilter', 'jquery', 'jquery-ui']);
-var mb = new MessageBox(MB_YESNO|MB_ICONQUESTION, $lang.get('user_logout_confirm_title'), $lang.get('user_logout_confirm_body'));
-mb.onclick['Yes'] = function()
+var title = $lang.get('user_logout_confirm_title');
-{
+var message = ( auth_level > USER_LEVEL_MEMBER ) ? $lang.get('user_logout_confirm_body_nelev') : $lang.get('user_logout_confirm_body_normal');
-window.location = makeUrlNS('Special', 'Logout/' + csrf_token + '/' + title);
+var buttons = [];
-}
+buttons.push({
+text: $lang.get('user_logout_confirm_btn_logout'),
+color: 'red',
+style: {
+fontWeight: 'bold'
+},
+onclick: function()
+{
+miniPromptDestroy(this);
+window.location = makeUrlNS('Special', 'Logout/' + csrf_token + '/' + window.title);
+return false;
+}
+});
+if ( auth_level > USER_LEVEL_MEMBER )
+{
+buttons.push({
+text: $lang.get('user_logout_confirm_btn_deauth'),
+color: 'blue',
+onclick: function()
+{
+miniPromptDestroy(this);
+ajaxLoginPerformRequest({
+mode:  'logout',
+level: auth_level,
+csrf_token: csrf_token
+});
+return false;
+}
+});
+}
+buttons.push({
+text: $lang.get('etc_cancel'),
+onclick: function()
+{
+miniPromptDestroy(this);
+return false;
+}
+});
+miniPromptMessage({
+title: title,
+message: message,
+buttons: buttons
+});
 }
 window.mb_logout = function()
 {
 ajaxInitLogout();
 {
 ajaxPage(targetpage);
 }
 else if ( typeof(targetpage) == 'function' )
 {
-targetpage();
+targetpage(k);
 }
 }, level);
 if ( typeof(adminpage) == 'string' )
 {
 ajaxLoginShowFriendlyError({

Enano CMS (1.1.x)