mirror of
https://github.com/e107inc/e107.git
synced 2025-08-14 02:24:08 +02:00
Password options for logon, email login option, random user name/PW generation, Bugtracker #4393 and possibly others previously added to 0.7
This commit is contained in:
e107steved
408
e107_files/chap_script.js
Normal file
408
e107_files/chap_script.js
Normal file
@@ -0,0 +1,408 @@
|
||||
<!--
|
||||
/*
|
||||
JS for logon.
|
||||
*/
|
||||
|
||||
var challenge;
|
||||
|
||||
function getChallenge()
|
||||
{
|
||||
temp = document.getElementById('hashchallenge');
|
||||
if (temp)
|
||||
{
|
||||
challenge = temp.value;
|
||||
temp.value = '';
|
||||
}
|
||||
}
|
||||
|
||||
// Called on form submit entered into password field
|
||||
// Passed current form
|
||||
function hashLoginPassword(doForm)
|
||||
{
|
||||
if (typeof(hex_md5) == "undefined") return;
|
||||
if (typeof(challenge) == "undefined") return;
|
||||
|
||||
doForm.hashchallenge.value = hex_md5(hex_md5(hex_md5(doForm.userpass.value) + doForm.username.value) + challenge);
|
||||
doForm.userpass.value = ""; // Don't send plaintext password back
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
|
||||
* Digest Algorithm, as defined in RFC 1321.
|
||||
* Version 2.2-alpha Copyright (C) Paul Johnston 1999 - 2005
|
||||
* Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
|
||||
* Distributed under the BSD License
|
||||
* See http://pajhome.org.uk/crypt/md5 for more info.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Configurable variables. You may need to tweak these to be compatible with
|
||||
* the server-side, but the defaults work in most cases.
|
||||
*/
|
||||
var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */
|
||||
var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */
|
||||
|
||||
/*
|
||||
* These are the functions you'll usually want to call
|
||||
* They take string arguments and return either hex or base-64 encoded strings
|
||||
*/
|
||||
function hex_md5(s) { return rstr2hex(rstr_md5(str2rstr_utf8(s))); }
|
||||
function b64_md5(s) { return rstr2b64(rstr_md5(str2rstr_utf8(s))); }
|
||||
function any_md5(s, e) { return rstr2any(rstr_md5(str2rstr_utf8(s)), e); }
|
||||
function hex_hmac_md5(k, d)
|
||||
{ return rstr2hex(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
|
||||
function b64_hmac_md5(k, d)
|
||||
{ return rstr2b64(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
|
||||
function any_hmac_md5(k, d, e)
|
||||
{ return rstr2any(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)), e); }
|
||||
|
||||
/*
|
||||
* Perform a simple self-test to see if the VM is working
|
||||
*/
|
||||
function md5_vm_test()
|
||||
{
|
||||
return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72";
|
||||
}
|
||||
|
||||
/*
|
||||
* Calculate the MD5 of a raw string
|
||||
*/
|
||||
function rstr_md5(s)
|
||||
{
|
||||
return binl2rstr(binl_md5(rstr2binl(s), s.length * 8));
|
||||
}
|
||||
|
||||
/*
|
||||
* Calculate the HMAC-MD5, of a key and some data (raw strings)
|
||||
*/
|
||||
function rstr_hmac_md5(key, data)
|
||||
{
|
||||
var bkey = rstr2binl(key);
|
||||
if(bkey.length > 16) bkey = binl_md5(bkey, key.length * 8);
|
||||
|
||||
var ipad = Array(16), opad = Array(16);
|
||||
for(var i = 0; i < 16; i++)
|
||||
{
|
||||
ipad[i] = bkey[i] ^ 0x36363636;
|
||||
opad[i] = bkey[i] ^ 0x5C5C5C5C;
|
||||
}
|
||||
|
||||
var hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8);
|
||||
return binl2rstr(binl_md5(opad.concat(hash), 512 + 128));
|
||||
}
|
||||
|
||||
/*
|
||||
* Convert a raw string to a hex string
|
||||
*/
|
||||
function rstr2hex(input)
|
||||
{
|
||||
var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
|
||||
var output = "";
|
||||
var x;
|
||||
for(var i = 0; i < input.length; i++)
|
||||
{
|
||||
x = input.charCodeAt(i);
|
||||
output += hex_tab.charAt((x >>> 4) & 0x0F)
|
||||
+ hex_tab.charAt( x & 0x0F);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/*
|
||||
* Convert a raw string to a base-64 string
|
||||
*/
|
||||
function rstr2b64(input)
|
||||
{
|
||||
var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
var output = "";
|
||||
var len = input.length;
|
||||
for(var i = 0; i < len; i += 3)
|
||||
{
|
||||
var triplet = (input.charCodeAt(i) << 16)
|
||||
| (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
|
||||
| (i + 2 < len ? input.charCodeAt(i+2) : 0);
|
||||
for(var j = 0; j < 4; j++)
|
||||
{
|
||||
if(i * 8 + j * 6 > input.length * 8) output += b64pad;
|
||||
else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/*
|
||||
* Convert a raw string to an arbitrary string encoding
|
||||
*/
|
||||
function rstr2any(input, encoding)
|
||||
{
|
||||
var divisor = encoding.length;
|
||||
var i, j, q, x, quotient;
|
||||
|
||||
/* Convert to an array of 16-bit big-endian values, forming the dividend */
|
||||
var dividend = Array(Math.ceil(input.length / 2));
|
||||
for(i = 0; i < dividend.length; i++)
|
||||
{
|
||||
dividend[i] = (input.charCodeAt(i * 2) << 8) | input.charCodeAt(i * 2 + 1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Repeatedly perform a long division. The binary array forms the dividend,
|
||||
* the length of the encoding is the divisor. Once computed, the quotient
|
||||
* forms the dividend for the next step. All remainders are stored for later
|
||||
* use.
|
||||
*/
|
||||
var full_length = Math.ceil(input.length * 8 /
|
||||
(Math.log(encoding.length) / Math.log(2)));
|
||||
var remainders = Array(full_length);
|
||||
for(j = 0; j < full_length; j++)
|
||||
{
|
||||
quotient = Array();
|
||||
x = 0;
|
||||
for(i = 0; i < dividend.length; i++)
|
||||
{
|
||||
x = (x << 16) + dividend[i];
|
||||
q = Math.floor(x / divisor);
|
||||
x -= q * divisor;
|
||||
if(quotient.length > 0 || q > 0)
|
||||
quotient[quotient.length] = q;
|
||||
}
|
||||
remainders[j] = x;
|
||||
dividend = quotient;
|
||||
}
|
||||
|
||||
/* Convert the remainders to the output string */
|
||||
var output = "";
|
||||
for(i = remainders.length - 1; i >= 0; i--)
|
||||
output += encoding.charAt(remainders[i]);
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
/*
|
||||
* Encode a string as utf-8.
|
||||
* For efficiency, this assumes the input is valid utf-16.
|
||||
*/
|
||||
function str2rstr_utf8(input)
|
||||
{
|
||||
var output = "";
|
||||
var i = -1;
|
||||
var x, y;
|
||||
|
||||
while(++i < input.length)
|
||||
{
|
||||
/* Decode utf-16 surrogate pairs */
|
||||
x = input.charCodeAt(i);
|
||||
y = i + 1 < input.length ? input.charCodeAt(i + 1) : 0;
|
||||
if(0xD800 <= x && x <= 0xDBFF && 0xDC00 <= y && y <= 0xDFFF)
|
||||
{
|
||||
x = 0x10000 + ((x & 0x03FF) << 10) + (y & 0x03FF);
|
||||
i++;
|
||||
}
|
||||
|
||||
/* Encode output as utf-8 */
|
||||
if(x <= 0x7F)
|
||||
output += String.fromCharCode(x);
|
||||
else if(x <= 0x7FF)
|
||||
output += String.fromCharCode(0xC0 | ((x >>> 6 ) & 0x1F),
|
||||
0x80 | ( x & 0x3F));
|
||||
else if(x <= 0xFFFF)
|
||||
output += String.fromCharCode(0xE0 | ((x >>> 12) & 0x0F),
|
||||
0x80 | ((x >>> 6 ) & 0x3F),
|
||||
0x80 | ( x & 0x3F));
|
||||
else if(x <= 0x1FFFFF)
|
||||
output += String.fromCharCode(0xF0 | ((x >>> 18) & 0x07),
|
||||
0x80 | ((x >>> 12) & 0x3F),
|
||||
0x80 | ((x >>> 6 ) & 0x3F),
|
||||
0x80 | ( x & 0x3F));
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/*
|
||||
* Encode a string as utf-16
|
||||
*/
|
||||
function str2rstr_utf16le(input)
|
||||
{
|
||||
var output = "";
|
||||
for(var i = 0; i < input.length; i++)
|
||||
output += String.fromCharCode( input.charCodeAt(i) & 0xFF,
|
||||
(input.charCodeAt(i) >>> 8) & 0xFF);
|
||||
return output;
|
||||
}
|
||||
|
||||
function str2rstr_utf16be(input)
|
||||
{
|
||||
var output = "";
|
||||
for(var i = 0; i < input.length; i++)
|
||||
output += String.fromCharCode((input.charCodeAt(i) >>> 8) & 0xFF,
|
||||
input.charCodeAt(i) & 0xFF);
|
||||
return output;
|
||||
}
|
||||
|
||||
/*
|
||||
* Convert a raw string to an array of little-endian words
|
||||
* Characters >255 have their high-byte silently ignored.
|
||||
*/
|
||||
function rstr2binl(input)
|
||||
{
|
||||
var output = Array(input.length >> 2);
|
||||
for(var i = 0; i < output.length; i++)
|
||||
output[i] = 0;
|
||||
for(var i = 0; i < input.length * 8; i += 8)
|
||||
output[i>>5] |= (input.charCodeAt(i / 8) & 0xFF) << (i%32);
|
||||
return output;
|
||||
}
|
||||
|
||||
/*
|
||||
* Convert an array of little-endian words to a string
|
||||
*/
|
||||
function binl2rstr(input)
|
||||
{
|
||||
var output = "";
|
||||
for(var i = 0; i < input.length * 32; i += 8)
|
||||
output += String.fromCharCode((input[i>>5] >>> (i % 32)) & 0xFF);
|
||||
return output;
|
||||
}
|
||||
|
||||
/*
|
||||
* Calculate the MD5 of an array of little-endian words, and a bit length.
|
||||
*/
|
||||
function binl_md5(x, len)
|
||||
{
|
||||
/* append padding */
|
||||
x[len >> 5] |= 0x80 << ((len) % 32);
|
||||
x[(((len + 64) >>> 9) << 4) + 14] = len;
|
||||
|
||||
var a = 1732584193;
|
||||
var b = -271733879;
|
||||
var c = -1732584194;
|
||||
var d = 271733878;
|
||||
|
||||
for(var i = 0; i < x.length; i += 16)
|
||||
{
|
||||
var olda = a;
|
||||
var oldb = b;
|
||||
var oldc = c;
|
||||
var oldd = d;
|
||||
|
||||
a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
|
||||
d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
|
||||
c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819);
|
||||
b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
|
||||
a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
|
||||
d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426);
|
||||
c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
|
||||
b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
|
||||
a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
|
||||
d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
|
||||
c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
|
||||
b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
|
||||
a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682);
|
||||
d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
|
||||
c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
|
||||
b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329);
|
||||
|
||||
a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
|
||||
d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
|
||||
c = md5_gg(c, d, a, b, x[i+11], 14, 643717713);
|
||||
b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
|
||||
a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
|
||||
d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083);
|
||||
c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
|
||||
b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
|
||||
a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438);
|
||||
d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
|
||||
c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
|
||||
b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501);
|
||||
a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
|
||||
d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
|
||||
c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473);
|
||||
b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
|
||||
|
||||
a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
|
||||
d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
|
||||
c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562);
|
||||
b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
|
||||
a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
|
||||
d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353);
|
||||
c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
|
||||
b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
|
||||
a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174);
|
||||
d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
|
||||
c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
|
||||
b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189);
|
||||
a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
|
||||
d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
|
||||
c = md5_hh(c, d, a, b, x[i+15], 16, 530742520);
|
||||
b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
|
||||
|
||||
a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
|
||||
d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415);
|
||||
c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
|
||||
b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
|
||||
a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571);
|
||||
d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
|
||||
c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
|
||||
b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
|
||||
a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
|
||||
d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
|
||||
c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
|
||||
b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649);
|
||||
a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
|
||||
d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
|
||||
c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259);
|
||||
b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
|
||||
|
||||
a = safe_add(a, olda);
|
||||
b = safe_add(b, oldb);
|
||||
c = safe_add(c, oldc);
|
||||
d = safe_add(d, oldd);
|
||||
}
|
||||
return Array(a, b, c, d);
|
||||
}
|
||||
|
||||
/*
|
||||
* These functions implement the four basic operations the algorithm uses.
|
||||
*/
|
||||
function md5_cmn(q, a, b, x, s, t)
|
||||
{
|
||||
return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
|
||||
}
|
||||
function md5_ff(a, b, c, d, x, s, t)
|
||||
{
|
||||
return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
|
||||
}
|
||||
function md5_gg(a, b, c, d, x, s, t)
|
||||
{
|
||||
return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
|
||||
}
|
||||
function md5_hh(a, b, c, d, x, s, t)
|
||||
{
|
||||
return md5_cmn(b ^ c ^ d, a, b, x, s, t);
|
||||
}
|
||||
function md5_ii(a, b, c, d, x, s, t)
|
||||
{
|
||||
return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
|
||||
}
|
||||
|
||||
/*
|
||||
* Add integers, wrapping at 2^32. This uses 16-bit operations internally
|
||||
* to work around bugs in some JS interpreters.
|
||||
*/
|
||||
function safe_add(x, y)
|
||||
{
|
||||
var lsw = (x & 0xFFFF) + (y & 0xFFFF);
|
||||
var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
|
||||
return (msw << 16) | (lsw & 0xFFFF);
|
||||
}
|
||||
|
||||
/*
|
||||
* Bitwise rotate a 32-bit number to the left.
|
||||
*/
|
||||
function bit_rol(num, cnt)
|
||||
{
|
||||
return (num << cnt) | (num >>> (32 - cnt));
|
||||
}
|
||||
//-->
|
||||
@@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_files/def_e107_prefs.php,v $
|
||||
| $Revision: 1.10 $
|
||||
| $Date: 2008-03-17 20:48:48 $
|
||||
| $Revision: 1.11 $
|
||||
| $Date: 2008-06-13 20:20:20 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@@ -41,10 +41,12 @@ City, State, Country
|
||||
'adminstyle' => 'classis',
|
||||
'sitedisclaimer' => LAN_PREF_3,
|
||||
'newsposts' => '10',
|
||||
|
||||
'flood_protect' => '1',
|
||||
'flood_timeout' => '5',
|
||||
'flood_time' => '30',
|
||||
'flood_hits' => '100',
|
||||
|
||||
'anon_post' => '0',
|
||||
'user_reg' => '1',
|
||||
'use_coppa' => '1',
|
||||
@@ -68,8 +70,6 @@ City, State, Country
|
||||
'meta_tag' => '',
|
||||
'user_reg_veri' => '1',
|
||||
'email_notify' => '0',
|
||||
'user_tracking' => 'cookie',
|
||||
'cookie_name' => 'e107cookie',
|
||||
'resize_method' => 'gd2',
|
||||
'im_path' => '/usr/X11R6/bin/',
|
||||
'im_width' => '120',
|
||||
@@ -156,10 +156,18 @@ City, State, Country
|
||||
'comments_disabled' => '0',
|
||||
'memberlist_access' => '253',
|
||||
'check_updates' => '0',
|
||||
|
||||
'enable_rdns' => '0',
|
||||
'enable_rdns_on_ban' => '0',
|
||||
'ban_max_online_access' => '100,200',
|
||||
'ban_retrigger' => '0'
|
||||
'ban_retrigger' => '0',
|
||||
|
||||
'user_tracking' => 'cookie',
|
||||
'cookie_name' => 'e107cookie',
|
||||
'passwordEncoding' => 0, // Legacy encoding
|
||||
'allowEmailLogin' => 0, // Disabled by default
|
||||
'password_CHAP' => '0', // Disabled by default
|
||||
'predefinedLoginName' => '' // Allow user to define own login name by default
|
||||
|
||||
);
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/signup_shortcodes.php,v $
|
||||
| $Revision: 1.10 $
|
||||
| $Date: 2008-01-15 21:57:31 $
|
||||
| $Revision: 1.11 $
|
||||
| $Date: 2008-06-13 20:20:21 $
|
||||
| $Author: e107steved $
|
||||
|
|
||||
| Mods to show extended field categories
|
||||
@@ -90,7 +90,11 @@ SC_END
|
||||
|
||||
|
||||
SC_BEGIN SIGNUP_LOGINNAME
|
||||
global $rs;
|
||||
global $rs, $pref;
|
||||
if (varsettrue($pref['predefinedLoginName']))
|
||||
{
|
||||
return LAN_SIGNUP_67;
|
||||
}
|
||||
$log_name_length = varset($pref['loginname_maxlength'],30);
|
||||
return $rs->form_text("loginname", $log_name_length+5, ($_POST['loginname'] ? $_POST['loginname'] : $loginname), $log_name_length);
|
||||
SC_END
|
||||
|
||||
126
e107_files/utilities/passcalc.php
Normal file
126
e107_files/utilities/passcalc.php
Normal file
@@ -0,0 +1,126 @@
|
||||
<?php
|
||||
|
||||
require('..\..\class2.php');
|
||||
require_once(e_HANDLER.'user_handler.php');
|
||||
$user_info = new userHandler;
|
||||
|
||||
define('LAN_PCALC_01','E107 Password Calculation Utility');
|
||||
define('LAN_PCALC_02','Login Name');
|
||||
define('LAN_PCALC_03','Desired password');
|
||||
define('LAN_PCALC_04','Calculate');
|
||||
define('LAN_PCALC_05','Invalid login name');
|
||||
define('LAN_PCALC_06','Errors Found!!!');
|
||||
define('LAN_PCALC_07','Calculated hash:');
|
||||
define('LAN_PCALC_08','Password invalid');
|
||||
define('LAN_PCALC_09','Confirm password');
|
||||
define('LAN_PCALC_10','Passwords don\'t match!');
|
||||
define('LAN_PCALC_11', 'Password Calculation');
|
||||
|
||||
|
||||
$loginName = varset($_POST['calc_loginname'],'');
|
||||
|
||||
require(HEADERF);
|
||||
$text =
|
||||
"<div style='text-align:center'>
|
||||
<form method='post' action='".e_SELF."'>
|
||||
<table style='width:95%' class='fborder'>
|
||||
<colgroup>
|
||||
<col style='width:60%' />
|
||||
<col style='width:40%' />
|
||||
</colgroup>
|
||||
|
||||
<tr>
|
||||
<td colspan='2' class='forumheader3' style='text-align:center'>".LAN_PCALC_01."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='forumheader3'>".LAN_PCALC_02."</td>
|
||||
<td class='forumheader3'>
|
||||
<input class='tbox' type='text' size='60' maxlength='100' name='calc_loginname' value='{$loginName}' />
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='forumheader3'>".LAN_PCALC_03."</td>
|
||||
<td class='forumheader3'>
|
||||
<input class='tbox' type='password' size='60' maxlength='100' name='calc_password' value='' />
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='forumheader3'>".LAN_PCALC_09."</td>
|
||||
<td class='forumheader3'>
|
||||
<input class='tbox' type='password' size='60' maxlength='100' name='calc_password1' value='' />
|
||||
</td>
|
||||
</tr>";
|
||||
|
||||
|
||||
$errorString = '';
|
||||
if (isset($_POST['show_password']))
|
||||
{
|
||||
if ($_POST['calc_password'] != $_POST['calc_password1'])
|
||||
{
|
||||
$errorString = LAN_PCALC_10;
|
||||
}
|
||||
|
||||
if (!$errorString)
|
||||
{
|
||||
$loginResult = $user_info->validateField('user_loginname',$loginName,FALSE);
|
||||
$passwordResult = $user_info->validateField('user_password',trim($_POST['calc_password']),FALSE);
|
||||
|
||||
if ($passwordResult !== TRUE)
|
||||
{
|
||||
$errorString = LAN_PCALC_08;
|
||||
}
|
||||
elseif ($loginResult === TRUE)
|
||||
{
|
||||
$passwordHash = $user_info->HashPassword($_POST['calc_password'],$loginName);
|
||||
}
|
||||
else
|
||||
{
|
||||
$errorString = LAN_PCALC_05;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$errorString)
|
||||
{
|
||||
$text .= "
|
||||
<tr>
|
||||
<td class='forumheader3'>".LAN_PCALC_07."</td>
|
||||
<td class='forumheader3'>".$passwordHash."</td>
|
||||
</tr>";
|
||||
}
|
||||
|
||||
|
||||
if ($errorString)
|
||||
{
|
||||
$text .= "
|
||||
<tr>
|
||||
<td class='forumheader3'>".LAN_PCALC_06."</td>
|
||||
<td class='forumheader3'>".$errorString."</td>
|
||||
</tr>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$text .= "
|
||||
<tr>
|
||||
<td class='forumheader3' colspan='3' style='text-align:center'>
|
||||
<input class='button' type='submit' name='show_password' value='".LAN_PCALC_04."' />
|
||||
</td>
|
||||
</tr>";
|
||||
|
||||
|
||||
|
||||
|
||||
$text .= "
|
||||
</table>\n
|
||||
</form>
|
||||
</div><br />";
|
||||
$ns->tablerender(LAN_PCALC_11, $text);
|
||||
|
||||
require(FOOTERF);
|
||||
|
||||
|
||||
?>
|
||||
296
e107_files/utilities/passconv.php
Normal file
296
e107_files/utilities/passconv.php
Normal file
@@ -0,0 +1,296 @@
|
||||
<?php
|
||||
|
||||
require('..\..\class2.php');
|
||||
require_once(e_HANDLER.'user_handler.php');
|
||||
if (!check_class(e_UC_MAINADMIN))
|
||||
{
|
||||
exit;
|
||||
}
|
||||
|
||||
$user_info = new userHandler;
|
||||
|
||||
define('LAN_PCONV_01','E107 Password Conversion Utility');
|
||||
define('LAN_PCONV_02','This utility converts all the passwords in your user database to current formats');
|
||||
define('LAN_PCONV_03','Caution!!!! Back up your database first!!!!!');
|
||||
define('LAN_PCONV_04','Proceed');
|
||||
define('LAN_PCONV_05','Convert md5 passwords to salted passwords');
|
||||
define('LAN_PCONV_06','Passwords for email address login');
|
||||
define('LAN_PCONV_07','Create');
|
||||
define('LAN_PCONV_08','Delete');
|
||||
define('LAN_PCONV_09','Do nothing');
|
||||
define('LAN_PCONV_10','Back up user database');
|
||||
define('LAN_PCONV_11', 'Yes');
|
||||
define('LAN_PCONV_12', 'Have you backed up your database?');
|
||||
define('LAN_PCONV_13', 'Backing up database');
|
||||
define('LAN_PCONV_14', 'Done');
|
||||
define('LAN_PCONV_15', 'Creating email passwords');
|
||||
define('LAN_PCONV_16', 'Deleting email passwords');
|
||||
define('LAN_PCONV_17', 'Scanning database...');
|
||||
define('LAN_PCONV_18', 'Cannot open user table');
|
||||
define('LAN_PCONV_19', 'Creates a table called \'user_backup\' with the information about to be changed. If the table already exists, it is emptied first');
|
||||
define('LAN_PCONV_20', 'Error creating backup table');
|
||||
define('LAN_PCONV_21', 'Error copying to backup table');
|
||||
define('LAN_PCONV_22', 'Total --TOTAL-- users checked');
|
||||
define('LAN_PCONV_23', 'Total --TOTAL-- email passwords calculated');
|
||||
define('LAN_PCONV_24', 'Total --TOTAL-- user passwords updated');
|
||||
define('LAN_PCONV_25', 'Total --TOTAL-- users could not be updated');
|
||||
define('LAN_PCONV_26', 'Create Backup');
|
||||
define('LAN_PCONV_27', 'Restore backup');
|
||||
define('LAN_PCONV_28', 'Restoring from backup....');
|
||||
define('LAN_PCONV_29', 'Backup database table not found!');
|
||||
define('LAN_PCONV_30', 'Cannot access backup table');
|
||||
define('LAN_PCONV_31', '');
|
||||
define('LAN_PCONV_32', '');
|
||||
define('LAN_PCONV_33', '');
|
||||
define('LAN_PCONV_34', '');
|
||||
define('LAN_PCONV_35', '');
|
||||
|
||||
|
||||
function multi_radio($name, $textsVals, $currentval = '')
|
||||
{
|
||||
$ret = '';
|
||||
$gap = '';
|
||||
foreach ($textsVals as $v => $t)
|
||||
{
|
||||
$sel = ($v == $currentval) ? " checked='checked'" : "";
|
||||
$ret .= $gap."<input type='radio' name='{$name}' value='{$v}'{$sel} /> ".$t."\n";
|
||||
// $gap = " ";
|
||||
$gap = "<br />";
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
|
||||
$recordCount = 0;
|
||||
$emailProcess = 0;
|
||||
$saltProcess = 0;
|
||||
$cantProcess = 0;
|
||||
$cookieChange = '';
|
||||
|
||||
require(HEADERF);
|
||||
$pc_db = new db;
|
||||
if (isset($_POST['GetOnWithIt']))
|
||||
{
|
||||
$doBackup = varset($_POST['doDBBackup'],0);
|
||||
$saltConvert = varset($_POST['convertToSalt'],0);
|
||||
$emailGen = varset($_POST['EmailPasswords'],0);
|
||||
if ($doBackup == 2)
|
||||
{
|
||||
$saltConvert = 0; // Don't do conversions if restoring database
|
||||
$emailGen = 0;
|
||||
}
|
||||
|
||||
$error = '';
|
||||
if ($emailGen == 1)
|
||||
{ // Scan DB for salted passwords
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------
|
||||
// Backup user DB (selected fields)
|
||||
//-----------------------------------------
|
||||
if (!$error && ($doBackup == 1))
|
||||
{
|
||||
echo LAN_PCONV_13;
|
||||
if ($pc_db->db_Table_exists('user_backup'))
|
||||
{ // Completely delete table - avoids problems with incorrect structure
|
||||
$pc_db->db_Select_gen('DROP TABLE `#user_backup` ');
|
||||
}
|
||||
|
||||
$qry = "CREATE TABLE `#user_backup` (
|
||||
user_id int(10) unsigned NOT NULL,
|
||||
user_name varchar(100) NOT NULL default '',
|
||||
user_loginname varchar(100) NOT NULL default '',
|
||||
user_password varchar(50) NOT NULL default '',
|
||||
user_email varchar(100) NOT NULL default '',
|
||||
user_prefs text NOT NULL,
|
||||
PRIMARY KEY (user_id),
|
||||
UNIQUE KEY user_name (user_name)
|
||||
) TYPE=MyISAM;"; // If not exists, of course
|
||||
|
||||
if (!$pc_db->db_Select_gen($qry))
|
||||
{
|
||||
$error = LAN_PCONV_20;
|
||||
}
|
||||
|
||||
if (!$error)
|
||||
{
|
||||
$qry = "INSERT INTO `#user_backup` SELECT user_id, user_name, user_loginname, user_password, user_email, user_prefs FROM `#user` ";
|
||||
if ($pc_db->db_Select_gen($qry) === FALSE)
|
||||
{
|
||||
$error = LAN_PCONV_21;
|
||||
}
|
||||
}
|
||||
if (!$error) echo '...'.LAN_PCONV_14.'<br /><br />';
|
||||
}
|
||||
|
||||
|
||||
|
||||
//--------------------------------------
|
||||
// Restore from backup
|
||||
//--------------------------------------
|
||||
if (!$error && ($doBackup == 2))
|
||||
{
|
||||
echo LAN_PCONV_28;
|
||||
if (!$pc_db->db_Table_exists('user_backup'))
|
||||
{
|
||||
$error = LAN_PCONV_28;
|
||||
}
|
||||
if (!$error && $pc_db->db_Select('user_backup','*'))
|
||||
{
|
||||
while ($row = $pc_db->db_Fetch(MYSQL_ASSOC))
|
||||
{
|
||||
$uid = $row['user_id'];
|
||||
unset($row['user_id']);
|
||||
$sql->db_UpdateArray('user',$row," WHERE `user_id`={$uid}"); // Intentionally use $sql here
|
||||
if (USERID == $uid)
|
||||
{
|
||||
$cookieChange = $row['user_password'];
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$error = LAN_PCONV_30;
|
||||
}
|
||||
|
||||
if (!$error) echo '...'.LAN_PCONV_14.'<br /><br />';
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//--------------------------------------
|
||||
// Change passwords
|
||||
//--------------------------------------
|
||||
if (!$error && $emailGen || $saltConvert)
|
||||
{ // Run through the DB doing conversions.
|
||||
echo LAN_PCONV_17;
|
||||
if ($pc_db->db_Select('user', 'user_id, user_name, user_loginname, user_password, user_email, user_prefs', '') === FALSE)
|
||||
{
|
||||
$error = LAN_PCONV_18;
|
||||
}
|
||||
if (!$error)
|
||||
{
|
||||
while ($row = $pc_db->db_Fetch())
|
||||
{ // Do conversions
|
||||
$recordCount++;
|
||||
$newData = array();
|
||||
$newPrefs = '';
|
||||
$user_prefs = unserialize($row['user_prefs']);
|
||||
if ($saltConvert)
|
||||
{
|
||||
if ($user_info->canConvert($row['user_password']))
|
||||
{
|
||||
$newData['user_password'] = $user_info->ConvertPassword($row['user_password'], $row['user_loginname']);
|
||||
$saltProcess++;
|
||||
if (USERID == $row['user_id'])
|
||||
{
|
||||
$cookieChange = $newData['user_password'];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$cantProcess++;
|
||||
}
|
||||
}
|
||||
if (($emailGen == 1) && $user_info->canConvert($row['user_password']))
|
||||
{
|
||||
$user_prefs['email_password'] = $user_info->ConvertPassword($row['user_password'], $row['user_email']);
|
||||
$emailProcess++;
|
||||
}
|
||||
elseif ($emailGen == 2)
|
||||
{
|
||||
unset($user_prefs['email_password']);
|
||||
$emailProcess++;
|
||||
}
|
||||
if (count($user_prefs)) $newPrefs = serialize($user_prefs); else $newPrefs = '';
|
||||
if($newPrefs != $user_prefs)
|
||||
{
|
||||
$newData['user_prefs'] = $newPrefs;
|
||||
}
|
||||
|
||||
if (count($newData)) $sql->db_UpdateArray('user',$newData, " WHERE `user_id`={$row['user_id']}");
|
||||
}
|
||||
}
|
||||
echo str_replace('--TOTAL--',$recordCount, LAN_PCONV_22).'<br />';
|
||||
echo str_replace('--TOTAL--',$saltProcess, LAN_PCONV_24).'<br />';
|
||||
echo str_replace('--TOTAL--',$emailProcess, LAN_PCONV_23).'<br />';
|
||||
echo str_replace('--TOTAL--',$cantProcess, LAN_PCONV_25).'<br />';
|
||||
echo '<br />';
|
||||
}
|
||||
|
||||
if ($error)
|
||||
{
|
||||
echo '<br />'.$error.'<br /><br />';
|
||||
require_once(FOOTERF);
|
||||
exit;
|
||||
}
|
||||
|
||||
|
||||
if ($cookieChange)
|
||||
{
|
||||
// echo "Cookie Updated.<br /><br />";
|
||||
$cookieval = USERID.".".md5($cookieChange); // Just changed admin password, and hence cookie
|
||||
cookie($pref['cookie_name'], $cookieval);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$text =
|
||||
"<div style='text-align:center'>
|
||||
<form method='post' action='".e_SELF."' onsubmit=\"return jsconfirm('".LAN_PCONV_12."')\">
|
||||
<table style='width:95%' class='fborder'>
|
||||
<colgroup>
|
||||
<col style='width:60%' />
|
||||
<col style='width:40%' />
|
||||
</colgroup>
|
||||
|
||||
<tr>
|
||||
<td colspan='2' class='forumheader3' style='text-align:center'>".LAN_PCONV_01."
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan='2' class='forumheader3' style='text-align:center'>".LAN_PCONV_02."<br />".LAN_PCONV_03."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='forumheader3'>".LAN_PCONV_10."<br /><span class='smalltext'>".LAN_PCONV_19."</span></td>
|
||||
<td class='forumheader3'>".multi_radio('doDBBackup',array('0' => LAN_PCONV_09, '1' => LAN_PCONV_26, '2' => LAN_PCONV_27),'')."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='forumheader3'>".LAN_PCONV_05."</td>
|
||||
<td class='forumheader3'>".multi_radio('convertToSalt',array('0' => LAN_PCONV_09, '1' => LAN_PCONV_11),'')."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='forumheader3'>".LAN_PCONV_06."</td>
|
||||
<td class='forumheader3'>".multi_radio('EmailPasswords',array('0' => LAN_PCONV_09, '1' => LAN_PCONV_07, '2' => LAN_PCONV_08),'')."
|
||||
</td>
|
||||
</tr>";
|
||||
|
||||
$text .= "
|
||||
<tr>
|
||||
<td class='forumheader3' colspan='3' style='text-align:center'>
|
||||
<input class='button' type='submit' name='GetOnWithIt' value='".LAN_PCONV_04."' />
|
||||
</td>
|
||||
</tr>";
|
||||
|
||||
|
||||
|
||||
|
||||
$text .= "
|
||||
</table>\n
|
||||
</form>
|
||||
</div><br />";
|
||||
$ns->tablerender(LAN_PCONV_01, $text);
|
||||
|
||||
require_once(FOOTERF);
|
||||
|
||||
|
||||
|
||||
?>
|
||||
Reference in New Issue
Block a user