Enano CMS (1.1.x): comparison includes/sessions.php

equal deleted inserted replaced

-:dc8741857bde
+:4d87aad3c4c0
 $code = $plugins->setHook('login_success');
 foreach ( $code as $cmd )
 {
 eval($cmd);
 }
 return 'success';
 }
 else
 return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.';
 }
 * @return bool
 */
 function register_session($user_id, $username, $password, $level = USER_LEVEL_MEMBER)
 {
+// Random key identifier
 $salt = md5(microtime() . mt_rand());
+// SHA1 hash of password, stored in the key
 $passha1 = sha1($password);
+// Unencrypted session key
 $session_key = "u=$username;p=$passha1;s=$salt";
+// Encrypt the key
 $aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
 $session_key = $aes->encrypt($session_key, $this->private_key, ENC_HEX);
+// If we're registering an elevated-privilege key, it needs to be on GET
 if($level > USER_LEVEL_MEMBER)
 {
+// Reverse it - cosmetic only ;-)
 $hexkey = strrev($session_key);
 $this->sid_super = $hexkey;
 $_GET['auth'] = $hexkey;
 }
 else
 {
+// Stash it in a cookie
+// For now, make the cookie last forever, we can change this in 1.1.x
 setcookie( 'sid', $session_key, time()+315360000, scriptPath.'/' );
 $_COOKIE['sid'] = $session_key;
 }
+// $keyhash is stored in the database, this is for compatibility with the older DB structure
 $keyhash = md5($session_key);
+// Record the user's IP
 $ip = ip2hex($_SERVER['REMOTE_ADDR']);
 if(!$ip)
 die('$session->register_session: Remote-Addr was spoofed');
+// The time needs to be stashed to enforce the 15-minute limit on elevated session keys
 $time = time();
+// Sanity check
 if(!is_int($user_id))
 die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
 if(!is_int($level))
 die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+// All done!
 $query = $this->sql('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time) VALUES(\''.$keyhash.'\', \''.$salt.'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.');');
 return true;
 }
 /**
 {
 $q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE user_id='.$user.';'); // This is SAFE! This is only called if $user is an integer
 }
 elseif(is_string($user))
 {
-$q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($user).'\';');
+$q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE lcase(username)=lcase(\''.$db->escape($user).'\');');
 }
 else
 {
 return false;
 }
 }
 /**
 * For a given user level identifier (USER_LEVEL_*), returns a string describing that user level.
 * @param int User level
+* @param bool If true, returns a shorter string. Optional.
 * @return string
 */
-function userlevel_to_string($user_level)
+function userlevel_to_string($user_level, $short = false)
 {
-switch ( $user_level )
+if ( $short )
 {
-case USER_LEVEL_GUEST:
+switch ( $user_level )
-return 'Low - guest privileges';
+{
-case USER_LEVEL_MEMBER:
+case USER_LEVEL_GUEST:
-return 'Standard - normal member level';
+return 'Guest';
-case USER_LEVEL_CHPREF:
+case USER_LEVEL_MEMBER:
-return 'Medium - user can change his/her own e-mail address and password';
+return 'Member';
-case USER_LEVEL_MOD:
+case USER_LEVEL_CHPREF:
-return 'High - moderator privileges';
+return 'Sensitive preferences changeable';
-case USER_LEVEL_ADMIN:
+case USER_LEVEL_MOD:
-return 'Highest - administrative privileges';
+return 'Moderator';
-default:
+case USER_LEVEL_ADMIN:
-return "Unknown ($user_level)";
+return 'Administrative';
+default:
+return "Level $user_level";
+}
+}
+else
+{
+switch ( $user_level )
+{
+case USER_LEVEL_GUEST:
+return 'Low - guest privileges';
+case USER_LEVEL_MEMBER:
+return 'Standard - normal member level';
+case USER_LEVEL_CHPREF:
+return 'Medium - user can change his/her own e-mail address and password';
+case USER_LEVEL_MOD:
+return 'High - moderator privileges';
+case USER_LEVEL_ADMIN:
+return 'Highest - administrative privileges';
+default:
+return "Unknown ($user_level)";
+}
 }
 }
 /**
 * Updates a user's information in the database. Note that any of the values except $user_id can be false if you want to preserve the old values.
 }
 // E-mail addy
 if(is_string($email))
 {
 // I didn't write this regex.
-if(!preg_match('/^(?:[\w\d]+\.?)+@(?:(?:[\w\d]\-?)+\.)+\w{2,4}$/', $email))
+if(!preg_match('/^(?:[\w\d]+\.?)+@((?:(?:[\w\d]\-?)+\.)+\w{2,4}|localhost)$/', $email))
 $errors[] = 'The e-mail address you entered is invalid.';
 $strs[] = 'email=\''.$db->escape($email).'\'';
 }
 }
 // Real name
 if ( frm._login ) frm._login.disabled = true;
 len = ( typeof cryptkey == \'string\' || typeof cryptkey == \'object\' ) ? \'\\nLen: \'+cryptkey.length : \'\';
 alert(\'The key is messed up\\nType: \'+typeof(cryptkey)+len);
 }
 }
-if(frm.username) frm.username.focus();
 function runEncryption()
 {
 if(testpassed)
 {
 pass = frm.'.$pw_field.'.value;

changeset 32	4d87aad3c4c0
parent 31	dc8741857bde
child 42	45ebe475ff75