1
+ − 1
<?php
+ − 2
+ − 3
/*
+ − 4
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
142
ca9118d9c0f2
Rebrand as 1.0.2 (Coblynau); internal links are now parsed by RenderMan::parse_internal_links()
Dan
diff
changeset
+ − 5
* Version 1.0.2 (Coblynau)
1
+ − 6
* Copyright (C) 2006-2007 Dan Fuhry
+ − 7
* sessions.php - everything related to security and user management
+ − 8
*
+ − 9
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
+ − 10
* as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ − 11
*
+ − 12
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ − 13
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
+ − 14
*/
+ − 15
+ − 16
// Prepare a string for insertion into a MySQL database
+ − 17
function filter($str) { return $db->escape($str); }
+ − 18
+ − 19
/**
+ − 20
* Anything and everything related to security and user management. This includes AES encryption, which is illegal in some countries.
+ − 21
* Documenting the API was not easy - I hope you folks enjoy it.
+ − 22
* @package Enano
+ − 23
* @subpackage Session manager
+ − 24
* @category security, user management, logins, etc.
+ − 25
*/
+ − 26
+ − 27
class sessionManager {
+ − 28
+ − 29
# Variables
+ − 30
+ − 31
/**
+ − 32
* Whether we're logged in or not
+ − 33
* @var bool
+ − 34
*/
+ − 35
+ − 36
var $user_logged_in = false;
+ − 37
+ − 38
/**
+ − 39
* Our current low-privilege session key
+ − 40
* @var string
+ − 41
*/
+ − 42
+ − 43
var $sid;
+ − 44
+ − 45
/**
+ − 46
* Username of currently logged-in user, or IP address if not logged in
+ − 47
* @var string
+ − 48
*/
+ − 49
+ − 50
var $username;
+ − 51
+ − 52
/**
+ − 53
* User ID of currently logged-in user, or -1 if not logged in
+ − 54
* @var int
+ − 55
*/
+ − 56
+ − 57
var $user_id;
+ − 58
+ − 59
/**
+ − 60
* Real name of currently logged-in user, or blank if not logged in
+ − 61
* @var string
+ − 62
*/
+ − 63
+ − 64
var $real_name;
+ − 65
+ − 66
/**
+ − 67
* E-mail address of currently logged-in user, or blank if not logged in
+ − 68
* @var string
+ − 69
*/
+ − 70
+ − 71
var $email;
+ − 72
+ − 73
/**
31
+ − 74
* List of "extra" user information fields (IM handles, etc.)
+ − 75
* @var array (associative)
+ − 76
*/
+ − 77
+ − 78
var $user_extra;
+ − 79
+ − 80
/**
1
+ − 81
* User level of current user
+ − 82
* USER_LEVEL_GUEST: guest
+ − 83
* USER_LEVEL_MEMBER: regular user
+ − 84
* USER_LEVEL_CHPREF: default - pseudo-level that allows changing password and e-mail address (requires re-authentication)
+ − 85
* USER_LEVEL_MOD: moderator
+ − 86
* USER_LEVEL_ADMIN: administrator
+ − 87
* @var int
+ − 88
*/
+ − 89
+ − 90
var $user_level;
+ − 91
+ − 92
/**
+ − 93
* High-privilege session key
+ − 94
* @var string or false if not running on high-level authentication
+ − 95
*/
+ − 96
+ − 97
var $sid_super;
+ − 98
+ − 99
/**
+ − 100
* The user's theme preference, defaults to $template->default_theme
+ − 101
* @var string
+ − 102
*/
+ − 103
+ − 104
var $theme;
+ − 105
+ − 106
/**
+ − 107
* The user's style preference, or style auto-detected based on theme if not logged in
+ − 108
* @var string
+ − 109
*/
+ − 110
+ − 111
var $style;
+ − 112
+ − 113
/**
+ − 114
* Signature of current user - appended to comments, etc.
+ − 115
* @var string
+ − 116
*/
+ − 117
+ − 118
var $signature;
+ − 119
+ − 120
/**
+ − 121
* UNIX timestamp of when we were registered, or 0 if not logged in
+ − 122
* @var int
+ − 123
*/
+ − 124
+ − 125
var $reg_time;
+ − 126
+ − 127
/**
+ − 128
* MD5 hash of the current user's password, if applicable
+ − 129
* @var string OR bool false
+ − 130
*/
+ − 131
+ − 132
var $password_hash;
+ − 133
+ − 134
/**
+ − 135
* The number of unread private messages this user has.
+ − 136
* @var int
+ − 137
*/
+ − 138
+ − 139
var $unread_pms = 0;
+ − 140
+ − 141
/**
+ − 142
* AES key used to encrypt passwords and session key info - irreversibly destroyed when disallow_password_grab() is called
+ − 143
* @var string
+ − 144
*/
+ − 145
+ − 146
var $private_key;
+ − 147
+ − 148
/**
+ − 149
* Regex that defines a valid username, minus the ^ and $, these are added later
+ − 150
* @var string
+ − 151
*/
+ − 152
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 153
//var $valid_username = '([A-Za-z0-9 \!\@\(\)-]+)';
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 154
var $valid_username = '([^<>_&\?\'"%\n\r\t\a\/]+)';
1
+ − 155
+ − 156
/**
+ − 157
* What we're allowed to do as far as permissions go. This changes based on the value of the "auth" URI param.
+ − 158
* @var string
+ − 159
*/
+ − 160
+ − 161
var $auth_level = -1;
+ − 162
+ − 163
/**
+ − 164
* State variable to track if a session timed out
+ − 165
* @var bool
+ − 166
*/
+ − 167
+ − 168
var $sw_timed_out = false;
+ − 169
+ − 170
/**
+ − 171
* Switch to track if we're started or not.
+ − 172
* @access private
+ − 173
* @var bool
+ − 174
*/
+ − 175
+ − 176
var $started = false;
+ − 177
+ − 178
/**
+ − 179
* Switch to control compatibility mode (for older Enano websites being upgraded)
+ − 180
* @access private
+ − 181
* @var bool
+ − 182
*/
+ − 183
+ − 184
var $compat = false;
+ − 185
+ − 186
/**
+ − 187
* Our list of permission types.
+ − 188
* @access private
+ − 189
* @var array
+ − 190
*/
+ − 191
+ − 192
var $acl_types = Array();
+ − 193
+ − 194
/**
+ − 195
* The list of descriptions for the permission types
+ − 196
* @var array
+ − 197
*/
+ − 198
+ − 199
var $acl_descs = Array();
+ − 200
+ − 201
/**
+ − 202
* A list of dependencies for ACL types.
+ − 203
* @var array
+ − 204
*/
+ − 205
+ − 206
var $acl_deps = Array();
+ − 207
+ − 208
/**
+ − 209
* Our tell-all list of permissions.
+ − 210
* @access private - or, preferably, protected
+ − 211
* @var array
+ − 212
*/
+ − 213
+ − 214
var $perms = Array();
+ − 215
+ − 216
/**
+ − 217
* A cache variable - saved after sitewide permissions are checked but before page-specific permissions.
+ − 218
* @var array
+ − 219
* @access private
+ − 220
*/
+ − 221
+ − 222
var $acl_base_cache = Array();
+ − 223
+ − 224
/**
+ − 225
* Stores the scope information for ACL types.
+ − 226
* @var array
+ − 227
* @access private
+ − 228
*/
+ − 229
+ − 230
var $acl_scope = Array();
+ − 231
+ − 232
/**
+ − 233
* Array to track which default permissions are being used
+ − 234
* @var array
+ − 235
* @access private
+ − 236
*/
+ − 237
+ − 238
var $acl_defaults_used = Array();
+ − 239
+ − 240
/**
+ − 241
* Array to track group membership.
+ − 242
* @var array
+ − 243
*/
+ − 244
+ − 245
var $groups = Array();
+ − 246
+ − 247
/**
+ − 248
* Associative array to track group modship.
+ − 249
* @var array
+ − 250
*/
+ − 251
+ − 252
var $group_mod = Array();
+ − 253
+ − 254
# Basic functions
+ − 255
+ − 256
/**
+ − 257
* Constructor.
+ − 258
*/
+ − 259
+ − 260
function __construct()
+ − 261
{
+ − 262
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 263
include(ENANO_ROOT.'/config.php');
+ − 264
unset($dbhost, $dbname, $dbuser, $dbpasswd);
+ − 265
if(isset($crypto_key))
+ − 266
{
+ − 267
$this->private_key = $crypto_key;
+ − 268
$this->private_key = hexdecode($this->private_key);
+ − 269
}
+ − 270
else
+ − 271
{
+ − 272
if(is_writable(ENANO_ROOT.'/config.php'))
+ − 273
{
+ − 274
// Generate and stash a private key
+ − 275
// This should only happen during an automated silent gradual migration to the new encryption platform.
+ − 276
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
+ − 277
$this->private_key = $aes->gen_readymade_key();
+ − 278
+ − 279
$config = file_get_contents(ENANO_ROOT.'/config.php');
+ − 280
if(!$config)
+ − 281
{
+ − 282
die('$session->__construct(): can\'t get the contents of config.php');
+ − 283
}
+ − 284
+ − 285
$config = str_replace("?>", "\$crypto_key = '{$this->private_key}';\n?>", $config);
+ − 286
// And while we're at it...
+ − 287
$config = str_replace('MIDGET_INSTALLED', 'ENANO_INSTALLED', $config);
+ − 288
$fh = @fopen(ENANO_ROOT.'/config.php', 'w');
+ − 289
if ( !$fh )
+ − 290
{
+ − 291
die('$session->__construct(): Couldn\'t open config file for writing to store the private key, I tried to avoid something like this...');
+ − 292
}
+ − 293
+ − 294
fwrite($fh, $config);
+ − 295
fclose($fh);
+ − 296
}
+ − 297
else
+ − 298
{
+ − 299
die_semicritical('Crypto error', '<p>No private key was found in the config file, and we can\'t generate one because we don\'t have write access to the config file. Please CHMOD config.php to 666 or 777 and reload this page.</p>');
+ − 300
}
+ − 301
}
+ − 302
// Check for compatibility mode
+ − 303
if(defined('IN_ENANO_INSTALL'))
+ − 304
{
+ − 305
$q = $db->sql_query('SELECT old_encryption FROM '.table_prefix.'users LIMIT 1;');
+ − 306
if(!$q)
+ − 307
{
+ − 308
$error = mysql_error();
+ − 309
if(strstr($error, "Unknown column 'old_encryption'"))
+ − 310
$this->compat = true;
+ − 311
else
+ − 312
$db->_die('This should never happen and is a bug - the only error that was supposed to happen here didn\'t happen. (sessions.php in constructor, during compat mode check)');
+ − 313
}
+ − 314
$db->free_result();
+ − 315
}
+ − 316
}
+ − 317
+ − 318
/**
+ − 319
* PHP 4 compatible constructor.
+ − 320
*/
+ − 321
+ − 322
function sessionManager()
+ − 323
{
+ − 324
$this->__construct();
+ − 325
}
+ − 326
+ − 327
/**
+ − 328
* Wrapper function to sanitize strings for MySQL and HTML
+ − 329
* @param string $text The text to sanitize
+ − 330
* @return string
+ − 331
*/
+ − 332
+ − 333
function prepare_text($text)
+ − 334
{
+ − 335
global $db;
+ − 336
return $db->escape(htmlspecialchars($text));
+ − 337
}
+ − 338
+ − 339
/**
+ − 340
* Makes a SQL query and handles error checking
+ − 341
* @param string $query The SQL query to make
+ − 342
* @return resource
+ − 343
*/
+ − 344
+ − 345
function sql($query)
+ − 346
{
+ − 347
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 348
$result = $db->sql_query($query);
+ − 349
if(!$result)
+ − 350
{
+ − 351
$db->_die('The error seems to have occurred somewhere in the session management code.');
+ − 352
}
+ − 353
return $result;
+ − 354
}
+ − 355
+ − 356
# Session restoration and permissions
+ − 357
+ − 358
/**
+ − 359
* Initializes the basic state of things, including most user prefs, login data, cookie stuff
+ − 360
*/
+ − 361
+ − 362
function start()
+ − 363
{
+ − 364
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 365
if($this->started) return;
+ − 366
$this->started = true;
+ − 367
$user = false;
+ − 368
if(isset($_COOKIE['sid']))
+ − 369
{
+ − 370
if($this->compat)
+ − 371
{
+ − 372
$userdata = $this->compat_validate_session($_COOKIE['sid']);
+ − 373
}
+ − 374
else
+ − 375
{
+ − 376
$userdata = $this->validate_session($_COOKIE['sid']);
+ − 377
}
+ − 378
if(is_array($userdata))
+ − 379
{
+ − 380
$data = RenderMan::strToPageID($paths->get_pageid_from_url());
+ − 381
+ − 382
if(!$this->compat && $userdata['account_active'] != 1 && $data[1] != 'Special' && $data[1] != 'Admin')
+ − 383
{
+ − 384
$this->logout();
+ − 385
$a = getConfig('account_activation');
+ − 386
switch($a)
+ − 387
{
+ − 388
case 'none':
+ − 389
default:
+ − 390
$solution = 'Your account was most likely deactivated by an administrator. Please contact the site administration for further assistance.';
+ − 391
break;
+ − 392
case 'user':
+ − 393
$solution = 'Please check your e-mail; you should have been sent a message with instructions on how to activate your account. If you do not receive an e-mail from this site within 24 hours, please contact the site administration for further assistance.';
+ − 394
break;
+ − 395
case 'admin':
127
+ − 396
$solution = 'This website has been configured so that all user accounts must be activated by the administrator before they can be used, so your account will most likely be activated the next time an administrator visits the site.';
1
+ − 397
break;
+ − 398
}
127
+ − 399
+ − 400
// admin activation request opportunity
+ − 401
$q = $db->sql_query('SELECT 1 FROM '.table_prefix.'logs WHERE log_type=\'admin\' AND action=\'activ_req\' AND edit_summary=\'' . $db->escape($userdata['username']) . '\';');
+ − 402
if ( !$q )
+ − 403
$db->_die();
+ − 404
+ − 405
$can_request = ( $db->numrows() < 1 );
+ − 406
$db->free_result();
+ − 407
+ − 408
if ( isset($_POST['logout']) )
+ − 409
{
+ − 410
$this->sid = $_COOKIE['sid'];
+ − 411
$this->user_logged_in = true;
+ − 412
$this->user_id = intval($userdata['user_id']);
+ − 413
$this->username = $userdata['username'];
+ − 414
$this->auth_level = USER_LEVEL_MEMBER;
+ − 415
$this->user_level = USER_LEVEL_MEMBER;
+ − 416
$this->logout();
+ − 417
redirect(scriptPath . '/', 'Logged out', 'You have successfully been logged out. All cookies cleared.', 4);
+ − 418
}
+ − 419
+ − 420
if ( $can_request && !isset($_POST['activation_request']) )
+ − 421
{
+ − 422
$form = '<p>If you are having trouble or did not receive the e-mail, you can request account activation from the administrators of this site.</p>
+ − 423
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
+ − 424
<p><input type="submit" name="activation_request" value="Request account activation" /> <input type="submit" name="logout" value="Log out" /></p>
+ − 425
</form>';
+ − 426
}
+ − 427
else
+ − 428
{
+ − 429
if ( $can_request && isset($_POST['activation_request']) )
+ − 430
{
+ − 431
$this->admin_activation_request($userdata['username']);
+ − 432
$form = '<p>A request has just been sent to the administrators of this site. They will be able to activate your account or send you another activation e-mail if needed.</p>
+ − 433
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
+ − 434
<p><input type="submit" name="logout" value="Log out" /></p>
+ − 435
</form>';
+ − 436
}
+ − 437
else
+ − 438
{
+ − 439
$form = '<p>There is an active request in the administrators\' control panel for your account to be activated.</p>
+ − 440
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
+ − 441
<p><input type="submit" name="logout" value="Log out" /></p>
+ − 442
</form>';
+ − 443
}
+ − 444
}
+ − 445
+ − 446
die_semicritical('Account error', '<p>It appears that your user account has not yet been activated. '.$solution.'</p>' . $form);
1
+ − 447
}
+ − 448
+ − 449
$this->sid = $_COOKIE['sid'];
+ − 450
$this->user_logged_in = true;
+ − 451
$this->user_id = intval($userdata['user_id']);
+ − 452
$this->username = $userdata['username'];
+ − 453
$this->password_hash = $userdata['password'];
+ − 454
$this->user_level = intval($userdata['user_level']);
+ − 455
$this->real_name = $userdata['real_name'];
+ − 456
$this->email = $userdata['email'];
+ − 457
$this->unread_pms = $userdata['num_pms'];
+ − 458
if(!$this->compat)
+ − 459
{
+ − 460
$this->theme = $userdata['theme'];
+ − 461
$this->style = $userdata['style'];
+ − 462
$this->signature = $userdata['signature'];
+ − 463
$this->reg_time = $userdata['reg_time'];
+ − 464
}
+ − 465
// Small security risk here - it allows someone who has already authenticated as an administrator to store the "super" key in
+ − 466
// the cookie. Change this to USER_LEVEL_MEMBER to override that. The same 15-minute restriction applies to this "exploit".
+ − 467
$this->auth_level = $userdata['auth_level'];
+ − 468
if(!isset($template->named_theme_list[$this->theme]))
+ − 469
{
+ − 470
if($this->compat || !is_object($template))
+ − 471
{
+ − 472
$this->theme = 'oxygen';
+ − 473
$this->style = 'bleu';
+ − 474
}
+ − 475
else
+ − 476
{
+ − 477
$this->theme = $template->default_theme;
+ − 478
$this->style = $template->default_style;
+ − 479
}
+ − 480
}
+ − 481
$user = true;
+ − 482
+ − 483
if(isset($_REQUEST['auth']) && !$this->sid_super)
+ − 484
{
+ − 485
// Now he thinks he's a moderator. Or maybe even an administrator. Let's find out if he's telling the truth.
+ − 486
if($this->compat)
+ − 487
{
+ − 488
$key = $_REQUEST['auth'];
+ − 489
$super = $this->compat_validate_session($key);
+ − 490
}
+ − 491
else
+ − 492
{
+ − 493
$key = strrev($_REQUEST['auth']);
+ − 494
$super = $this->validate_session($key);
+ − 495
}
+ − 496
if(is_array($super))
+ − 497
{
+ − 498
$this->auth_level = intval($super['auth_level']);
+ − 499
$this->sid_super = $_REQUEST['auth'];
+ − 500
}
+ − 501
}
+ − 502
}
+ − 503
}
+ − 504
if(!$user)
+ − 505
{
+ − 506
//exit;
+ − 507
$this->register_guest_session();
+ − 508
}
+ − 509
if(!$this->compat)
+ − 510
{
+ − 511
// init groups
+ − 512
$q = $this->sql('SELECT g.group_name,g.group_id,m.is_mod FROM '.table_prefix.'groups AS g
+ − 513
LEFT JOIN '.table_prefix.'group_members AS m
+ − 514
ON g.group_id=m.group_id
+ − 515
WHERE ( m.user_id='.$this->user_id.'
+ − 516
OR g.group_name=\'Everyone\')
+ − 517
' . ( enano_version() == '1.0RC1' ? '' : 'AND ( m.pending != 1 OR m.pending IS NULL )' ) . '
+ − 518
ORDER BY group_id ASC;'); // Make sure "Everyone" comes first so the permissions can be overridden
+ − 519
if($row = $db->fetchrow())
+ − 520
{
+ − 521
do {
+ − 522
$this->groups[$row['group_id']] = $row['group_name'];
+ − 523
$this->group_mod[$row['group_id']] = ( intval($row['is_mod']) == 1 );
+ − 524
} while($row = $db->fetchrow());
+ − 525
}
+ − 526
else
+ − 527
{
+ − 528
die('No group info');
+ − 529
}
+ − 530
}
+ − 531
$this->check_banlist();
+ − 532
+ − 533
if ( isset ( $_GET['printable'] ) )
+ − 534
{
+ − 535
$this->theme = 'printable';
+ − 536
$this->style = 'default';
+ − 537
}
+ − 538
+ − 539
}
+ − 540
+ − 541
# Logins
+ − 542
+ − 543
/**
+ − 544
* Attempts to perform a login using crypto functions
+ − 545
* @param string $username The username
+ − 546
* @param string $aes_data The encrypted password, hex-encoded
+ − 547
* @param string $aes_key The MD5 hash of the encryption key, hex-encoded
+ − 548
* @param string $challenge The 256-bit MD5 challenge string - first 128 bits should be the hash, the last 128 should be the challenge salt
+ − 549
* @param int $level The privilege level we're authenticating for, defaults to 0
+ − 550
* @return string 'success' on success, or error string on failure
+ − 551
*/
+ − 552
+ − 553
function login_with_crypto($username, $aes_data, $aes_key, $challenge, $level = USER_LEVEL_MEMBER)
+ − 554
{
+ − 555
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 556
+ − 557
$privcache = $this->private_key;
+ − 558
+ − 559
// Instanciate the Rijndael encryption object
+ − 560
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
+ − 561
+ − 562
// Fetch our decryption key
+ − 563
+ − 564
$aes_key = $this->fetch_public_key($aes_key);
+ − 565
if(!$aes_key)
+ − 566
return 'Couldn\'t look up public key "'.$aes_key.'" for decryption';
+ − 567
+ − 568
// Convert the key to a binary string
+ − 569
$bin_key = hexdecode($aes_key);
+ − 570
+ − 571
if(strlen($bin_key) != AES_BITS / 8)
+ − 572
return 'The decryption key is the wrong length';
+ − 573
+ − 574
// Decrypt our password
+ − 575
$password = $aes->decrypt($aes_data, $bin_key, ENC_HEX);
+ − 576
+ − 577
// Initialize our success switch
+ − 578
$success = false;
+ − 579
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 580
// Escaped username
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 581
$db_username_lower = $this->prepare_text(strtolower($username));
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 582
$db_username = $this->prepare_text($username);
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 583
1
+ − 584
// Select the user data from the table, and decrypt that so we can verify the password
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 585
$this->sql('SELECT password,old_encryption,user_id,user_level,theme,style,temp_password,temp_password_time FROM '.table_prefix.'users WHERE lcase(username)=\''.$db_username_lower.'\' OR username=\'' . $db_username . '\';');
1
+ − 586
if($db->numrows() < 1)
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 587
{
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 588
// This wasn't logged in <1.0.2, dunno how it slipped through
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 589
if($level > USER_LEVEL_MEMBER)
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 590
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 591
else
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 592
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
177
+ − 593
return "The username and/or password is incorrect.";
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 594
}
1
+ − 595
$row = $db->fetchrow();
+ − 596
+ − 597
// Check to see if we're logging in using a temporary password
+ − 598
+ − 599
if((intval($row['temp_password_time']) + 3600*24) > time() )
+ − 600
{
+ − 601
$temp_pass = $aes->decrypt( $row['temp_password'], $this->private_key, ENC_HEX );
+ − 602
if( $temp_pass == $password )
+ − 603
{
+ − 604
$url = makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $row['temp_password']);
+ − 605
+ − 606
$code = $plugins->setHook('login_password_reset');
+ − 607
foreach ( $code as $cmd )
+ − 608
{
+ − 609
eval($cmd);
+ − 610
}
+ − 611
+ − 612
redirect($url, 'Login sucessful', 'Please wait while you are transferred to the Password Reset form.');
+ − 613
exit;
+ − 614
}
+ − 615
}
+ − 616
+ − 617
if($row['old_encryption'] == 1)
+ − 618
{
+ − 619
// The user's password is stored using the obsolete and insecure MD5 algorithm, so we'll update the field with the new password
+ − 620
if(md5($password) == $row['password'])
+ − 621
{
+ − 622
$pass_stashed = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 623
$this->sql('UPDATE '.table_prefix.'users SET password=\''.$pass_stashed.'\',old_encryption=0 WHERE user_id='.$row['user_id'].';');
+ − 624
$success = true;
+ − 625
}
+ − 626
}
+ − 627
else
+ − 628
{
+ − 629
// Our password field is up-to-date with the >=1.0RC1 encryption standards, so decrypt the password in the table and see if we have a match; if so then do challenge authentication
+ − 630
$real_pass = $aes->decrypt(hexdecode($row['password']), $this->private_key, ENC_BINARY);
+ − 631
if($password == $real_pass)
+ − 632
{
+ − 633
// Yay! We passed AES authentication, now do an MD5 challenge check to make sure we weren't spoofed
+ − 634
$chal = substr($challenge, 0, 32);
+ − 635
$salt = substr($challenge, 32, 32);
+ − 636
$correct_challenge = md5( $real_pass . $salt );
+ − 637
if($chal == $correct_challenge)
+ − 638
$success = true;
+ − 639
}
+ − 640
}
+ − 641
if($success)
+ − 642
{
+ − 643
if($level > $row['user_level'])
+ − 644
return 'You are not authorized for this level of access.';
+ − 645
+ − 646
$sess = $this->register_session(intval($row['user_id']), $username, $password, $level);
+ − 647
if($sess)
+ − 648
{
+ − 649
$this->username = $username;
+ − 650
$this->user_id = intval($row['user_id']);
+ − 651
$this->theme = $row['theme'];
+ − 652
$this->style = $row['style'];
+ − 653
+ − 654
if($level > USER_LEVEL_MEMBER)
+ − 655
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_good\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
+ − 656
else
+ − 657
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
+ − 658
+ − 659
$code = $plugins->setHook('login_success');
+ − 660
foreach ( $code as $cmd )
+ − 661
{
+ − 662
eval($cmd);
+ − 663
}
+ − 664
return 'success';
+ − 665
}
+ − 666
else
+ − 667
return 'Your login credentials were correct, but an internal error occurred while registering the session key in the database.';
+ − 668
}
+ − 669
else
+ − 670
{
+ − 671
if($level > USER_LEVEL_MEMBER)
+ − 672
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
+ − 673
else
+ − 674
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
+ − 675
+ − 676
return 'The username and/or password is incorrect.';
+ − 677
}
+ − 678
}
+ − 679
+ − 680
/**
+ − 681
* Attempts to login without using crypto stuff, mainly for use when the other side doesn't like Javascript
+ − 682
* This method of authentication is inherently insecure, there's really nothing we can do about it except hope and pray that everyone moves to Firefox
+ − 683
* Technically it still uses crypto, but it only decrypts the password already stored, which is (obviously) required for authentication
+ − 684
* @param string $username The username
+ − 685
* @param string $password The password -OR- the MD5 hash of the password if $already_md5ed is true
+ − 686
* @param bool $already_md5ed This should be set to true if $password is an MD5 hash, and should be false if it's plaintext. Defaults to false.
+ − 687
* @param int $level The privilege level we're authenticating for, defaults to 0
+ − 688
*/
+ − 689
+ − 690
function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER)
+ − 691
{
+ − 692
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 693
+ − 694
$pass_hashed = ( $already_md5ed ) ? $password : md5($password);
+ − 695
+ − 696
// Perhaps we're upgrading Enano?
+ − 697
if($this->compat)
+ − 698
{
+ − 699
return $this->login_compat($username, $pass_hashed, $level);
+ − 700
}
+ − 701
+ − 702
// Instanciate the Rijndael encryption object
+ − 703
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
+ − 704
+ − 705
// Initialize our success switch
+ − 706
$success = false;
+ − 707
+ − 708
// Retrieve the real password from the database
+ − 709
$this->sql('SELECT password,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix.'users WHERE lcase(username)=\''.$this->prepare_text(strtolower($username)).'\';');
177
+ − 710
if ( $db->numrows() < 1 )
+ − 711
{
+ − 712
// This wasn't logged in <1.0.2, dunno how it slipped through
+ − 713
if($level > USER_LEVEL_MEMBER)
+ − 714
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
+ − 715
else
+ − 716
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
+ − 717
return "The username and/or password is incorrect.";
+ − 718
}
1
+ − 719
$row = $db->fetchrow();
+ − 720
+ − 721
// Check to see if we're logging in using a temporary password
+ − 722
+ − 723
if((intval($row['temp_password_time']) + 3600*24) > time() )
+ − 724
{
+ − 725
$temp_pass = $aes->decrypt( $row['temp_password'], $this->private_key, ENC_HEX );
+ − 726
if( md5($temp_pass) == $pass_hashed )
+ − 727
{
+ − 728
$code = $plugins->setHook('login_password_reset');
+ − 729
foreach ( $code as $cmd )
+ − 730
{
+ − 731
eval($cmd);
+ − 732
}
+ − 733
+ − 734
header('Location: ' . makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $row['temp_password']) );
+ − 735
+ − 736
exit;
+ − 737
}
+ − 738
}
+ − 739
+ − 740
if($row['old_encryption'] == 1)
+ − 741
{
+ − 742
// The user's password is stored using the obsolete and insecure MD5 algorithm - we'll update the field with the new password
+ − 743
if($pass_hashed == $row['password'] && !$already_md5ed)
+ − 744
{
+ − 745
$pass_stashed = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 746
$this->sql('UPDATE '.table_prefix.'users SET password=\''.$pass_stashed.'\',old_encryption=0 WHERE user_id='.$row['user_id'].';');
+ − 747
$success = true;
+ − 748
}
+ − 749
elseif($pass_hashed == $row['password'] && $already_md5ed)
+ − 750
{
+ − 751
// We don't have the real password so don't bother with encrypting it, just call it success and get out of here
+ − 752
$success = true;
+ − 753
}
+ − 754
}
+ − 755
else
+ − 756
{
+ − 757
// Our password field is up-to-date with the >=1.0RC1 encryption standards, so decrypt the password in the table and see if we have a match
+ − 758
$real_pass = $aes->decrypt($row['password'], $this->private_key);
+ − 759
if($pass_hashed == md5($real_pass))
+ − 760
{
+ − 761
$success = true;
+ − 762
}
+ − 763
}
+ − 764
if($success)
+ − 765
{
+ − 766
if((int)$level > (int)$row['user_level'])
+ − 767
return 'You are not authorized for this level of access.';
+ − 768
$sess = $this->register_session(intval($row['user_id']), $username, $real_pass, $level);
+ − 769
if($sess)
+ − 770
{
+ − 771
if($level > USER_LEVEL_MEMBER)
+ − 772
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_good\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
+ − 773
else
+ − 774
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
+ − 775
+ − 776
$code = $plugins->setHook('login_success');
+ − 777
foreach ( $code as $cmd )
+ − 778
{
+ − 779
eval($cmd);
+ − 780
}
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 781
1
+ − 782
return 'success';
+ − 783
}
+ − 784
else
+ − 785
return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.';
+ − 786
}
+ − 787
else
+ − 788
{
+ − 789
if($level > USER_LEVEL_MEMBER)
+ − 790
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
+ − 791
else
+ − 792
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
+ − 793
+ − 794
return 'The username and/or password is incorrect.';
+ − 795
}
+ − 796
}
+ − 797
+ − 798
/**
+ − 799
* Attempts to log in using the old table structure and algorithm.
+ − 800
* @param string $username
+ − 801
* @param string $password This should be an MD5 hash
+ − 802
* @return string 'success' if successful, or error message on failure
+ − 803
*/
+ − 804
+ − 805
function login_compat($username, $password, $level = 0)
+ − 806
{
+ − 807
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 808
$pass_hashed =& $password;
+ − 809
$this->sql('SELECT password,user_id,user_level FROM '.table_prefix.'users WHERE username=\''.$this->prepare_text($username).'\';');
+ − 810
if($db->numrows() < 1)
+ − 811
return 'The username and/or password is incorrect.';
+ − 812
$row = $db->fetchrow();
+ − 813
if($row['password'] == $password)
+ − 814
{
+ − 815
if((int)$level > (int)$row['user_level'])
+ − 816
return 'You are not authorized for this level of access.';
+ − 817
$sess = $this->register_session_compat(intval($row['user_id']), $username, $password, $level);
+ − 818
if($sess)
+ − 819
return 'success';
+ − 820
else
+ − 821
return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.';
+ − 822
}
+ − 823
else
+ − 824
{
+ − 825
return 'The username and/or password is incorrect.';
+ − 826
}
+ − 827
}
+ − 828
+ − 829
/**
+ − 830
* Registers a session key in the database. This function *ASSUMES* that the username and password have already been validated!
+ − 831
* Basically the session key is a base64-encoded cookie (encrypted with the site's private key) that says "u=[username];p=[sha1 of password]"
+ − 832
* @param int $user_id
+ − 833
* @param string $username
+ − 834
* @param string $password
+ − 835
* @param int $level The level of access to grant, defaults to USER_LEVEL_MEMBER
+ − 836
* @return bool
+ − 837
*/
+ − 838
+ − 839
function register_session($user_id, $username, $password, $level = USER_LEVEL_MEMBER)
+ − 840
{
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 841
// Random key identifier
1
+ − 842
$salt = md5(microtime() . mt_rand());
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 843
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 844
// SHA1 hash of password, stored in the key
1
+ − 845
$passha1 = sha1($password);
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 846
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 847
// Unencrypted session key
1
+ − 848
$session_key = "u=$username;p=$passha1;s=$salt";
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 849
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 850
// Encrypt the key
1
+ − 851
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
+ − 852
$session_key = $aes->encrypt($session_key, $this->private_key, ENC_HEX);
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 853
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 854
// If we're registering an elevated-privilege key, it needs to be on GET
1
+ − 855
if($level > USER_LEVEL_MEMBER)
+ − 856
{
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 857
// Reverse it - cosmetic only ;-)
1
+ − 858
$hexkey = strrev($session_key);
+ − 859
$this->sid_super = $hexkey;
+ − 860
$_GET['auth'] = $hexkey;
+ − 861
}
+ − 862
else
+ − 863
{
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 864
// Stash it in a cookie
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 865
// For now, make the cookie last forever, we can change this in 1.1.x
191
+ − 866
setcookie( 'sid', $session_key, time()+315360000, scriptPath.'/', null, ( isset($_SERVER['HTTPS']) ) );
1
+ − 867
$_COOKIE['sid'] = $session_key;
+ − 868
}
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 869
// $keyhash is stored in the database, this is for compatibility with the older DB structure
1
+ − 870
$keyhash = md5($session_key);
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 871
// Record the user's IP
1
+ − 872
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 873
if(!$ip)
+ − 874
die('$session->register_session: Remote-Addr was spoofed');
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 875
// The time needs to be stashed to enforce the 15-minute limit on elevated session keys
1
+ − 876
$time = time();
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 877
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 878
// Sanity check
1
+ − 879
if(!is_int($user_id))
+ − 880
die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 881
if(!is_int($level))
+ − 882
die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 883
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 884
// All done!
1
+ − 885
$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.');');
+ − 886
return true;
+ − 887
}
+ − 888
+ − 889
/**
+ − 890
* Identical to register_session in nature, but uses the old login/table structure. DO NOT use this.
+ − 891
* @see sessionManager::register_session()
+ − 892
* @access private
+ − 893
*/
+ − 894
+ − 895
function register_session_compat($user_id, $username, $password, $level = 0)
+ − 896
{
+ − 897
$salt = md5(microtime() . mt_rand());
+ − 898
$thekey = md5($password . $salt);
+ − 899
if($level > 0)
+ − 900
{
+ − 901
$this->sid_super = $thekey;
+ − 902
}
+ − 903
else
+ − 904
{
+ − 905
setcookie( 'sid', $thekey, time()+315360000, scriptPath.'/' );
+ − 906
$_COOKIE['sid'] = $thekey;
+ − 907
}
+ − 908
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 909
if(!$ip)
+ − 910
die('$session->register_session: Remote-Addr was spoofed');
+ − 911
$time = time();
+ − 912
if(!is_int($user_id))
+ − 913
die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 914
if(!is_int($level))
+ − 915
die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 916
$query = $this->sql('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time) VALUES(\''.$thekey.'\', \''.$salt.'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.');');
+ − 917
return true;
+ − 918
}
+ − 919
+ − 920
/**
+ − 921
* Creates/restores a guest session
+ − 922
* @todo implement real session management for guests
+ − 923
*/
+ − 924
+ − 925
function register_guest_session()
+ − 926
{
+ − 927
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 928
$this->username = $_SERVER['REMOTE_ADDR'];
+ − 929
$this->user_level = USER_LEVEL_GUEST;
+ − 930
if($this->compat || defined('IN_ENANO_INSTALL'))
+ − 931
{
+ − 932
$this->theme = 'oxygen';
+ − 933
$this->style = 'bleu';
+ − 934
}
+ − 935
else
+ − 936
{
+ − 937
$this->theme = ( isset($_GET['theme']) && isset($template->named_theme_list[$_GET['theme']])) ? $_GET['theme'] : $template->default_theme;
+ − 938
$this->style = ( isset($_GET['style']) && file_exists(ENANO_ROOT.'/themes/'.$this->theme . '/css/'.$_GET['style'].'.css' )) ? $_GET['style'] : substr($template->named_theme_list[$this->theme]['default_style'], 0, strlen($template->named_theme_list[$this->theme]['default_style'])-4);
+ − 939
}
+ − 940
$this->user_id = 1;
+ − 941
}
+ − 942
+ − 943
/**
+ − 944
* Validates a session key, and returns the userdata associated with the key or false
+ − 945
* @param string $key The session key to validate
+ − 946
* @return array Keys are 'user_id', 'username', 'email', 'real_name', 'user_level', 'theme', 'style', 'signature', 'reg_time', 'account_active', 'activation_key', and 'auth_level' or bool false if validation failed. The key 'auth_level' is the maximum authorization level that this key provides.
+ − 947
*/
+ − 948
+ − 949
function validate_session($key)
+ − 950
{
+ − 951
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 952
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE, true);
+ − 953
$decrypted_key = $aes->decrypt($key, $this->private_key, ENC_HEX);
+ − 954
+ − 955
if ( !$decrypted_key )
+ − 956
{
+ − 957
die_semicritical('AES encryption error', '<p>Something went wrong during the AES decryption process.</p><pre>'.print_r($decrypted_key, true).'</pre>');
+ − 958
}
+ − 959
+ − 960
$n = preg_match('/^u='.$this->valid_username.';p=([A-Fa-f0-9]+?);s=([A-Fa-f0-9]+?)$/', $decrypted_key, $keydata);
+ − 961
if($n < 1)
+ − 962
{
+ − 963
// echo '(debug) $session->validate_session: Key does not match regex<br />Decrypted key: '.$decrypted_key;
+ − 964
return false;
+ − 965
}
+ − 966
$keyhash = md5($key);
+ − 967
$salt = $db->escape($keydata[3]);
18
+ − 968
$query = $db->sql_query('SELECT u.user_id AS uid,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms,x.* FROM '.table_prefix.'session_keys AS k
+ − 969
LEFT JOIN '.table_prefix.'users AS u
+ − 970
ON ( u.user_id=k.user_id )
+ − 971
LEFT JOIN '.table_prefix.'users_extra AS x
+ − 972
ON ( u.user_id=x.user_id OR x.user_id IS NULL )
+ − 973
LEFT JOIN '.table_prefix.'privmsgs AS p
+ − 974
ON ( p.message_to=u.username AND p.message_read=0 )
+ − 975
WHERE k.session_key=\''.$keyhash.'\'
+ − 976
AND k.salt=\''.$salt.'\'
+ − 977
GROUP BY u.user_id;');
+ − 978
if ( !$query )
+ − 979
{
+ − 980
$query = $this->sql('SELECT u.user_id AS uid,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms FROM '.table_prefix.'session_keys AS k
+ − 981
LEFT JOIN '.table_prefix.'users AS u
+ − 982
ON ( u.user_id=k.user_id )
+ − 983
LEFT JOIN '.table_prefix.'privmsgs AS p
+ − 984
ON ( p.message_to=u.username AND p.message_read=0 )
+ − 985
WHERE k.session_key=\''.$keyhash.'\'
+ − 986
AND k.salt=\''.$salt.'\'
+ − 987
GROUP BY u.user_id;');
+ − 988
}
1
+ − 989
if($db->numrows() < 1)
+ − 990
{
+ − 991
// echo '(debug) $session->validate_session: Key was not found in database<br />';
+ − 992
return false;
+ − 993
}
+ − 994
$row = $db->fetchrow();
+ − 995
$row['user_id'] =& $row['uid'];
+ − 996
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 997
if($row['auth_level'] > $row['user_level'])
+ − 998
{
+ − 999
// Failed authorization check
+ − 1000
// echo '(debug) $session->validate_session: access to this auth level denied<br />';
+ − 1001
return false;
+ − 1002
}
+ − 1003
if($ip != $row['source_ip'])
+ − 1004
{
+ − 1005
// Failed IP address check
+ − 1006
// echo '(debug) $session->validate_session: IP address mismatch<br />';
+ − 1007
return false;
+ − 1008
}
+ − 1009
+ − 1010
// Do the password validation
+ − 1011
$real_pass = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 1012
+ − 1013
//die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1014
if(sha1($real_pass) != $keydata[2])
+ − 1015
{
+ − 1016
// Failed password check
+ − 1017
// echo '(debug) $session->validate_session: encrypted password is wrong<br />Real password: '.$real_pass.'<br />Real hash: '.sha1($real_pass).'<br />User hash: '.$keydata[2];
+ − 1018
return false;
+ − 1019
}
+ − 1020
+ − 1021
$time_now = time();
+ − 1022
$time_key = $row['time'] + 900;
+ − 1023
if($time_now > $time_key && $row['auth_level'] > USER_LEVEL_MEMBER)
+ − 1024
{
+ − 1025
// Session timed out
+ − 1026
// echo '(debug) $session->validate_session: super session timed out<br />';
+ − 1027
$this->sw_timed_out = true;
+ − 1028
return false;
+ − 1029
}
+ − 1030
+ − 1031
// If this is an elevated-access session key, update the time
+ − 1032
if( $row['auth_level'] > USER_LEVEL_MEMBER )
+ − 1033
{
+ − 1034
$this->sql('UPDATE '.table_prefix.'session_keys SET time='.time().' WHERE session_key=\''.$keyhash.'\';');
+ − 1035
}
+ − 1036
31
+ − 1037
$user_extra = array();
+ − 1038
foreach ( array('user_aim', 'user_yahoo', 'user_msn', 'user_xmpp', 'user_homepage', 'user_location', 'user_job', 'user_hobbies', 'email_public') as $column )
+ − 1039
{
+ − 1040
$user_extra[$column] = $row[$column];
+ − 1041
}
+ − 1042
+ − 1043
$this->user_extra = $user_extra;
+ − 1044
// Leave the rest to PHP's automatic garbage collector ;-)
+ − 1045
1
+ − 1046
$row['password'] = md5($real_pass);
+ − 1047
return $row;
+ − 1048
}
+ − 1049
+ − 1050
/**
+ − 1051
* Validates a session key, and returns the userdata associated with the key or false. Optimized for compatibility with the old MD5-based auth system.
+ − 1052
* @param string $key The session key to validate
+ − 1053
* @return array Keys are 'user_id', 'username', 'email', 'real_name', 'user_level', 'theme', 'style', 'signature', 'reg_time', 'account_active', 'activation_key', and 'auth_level' or bool false if validation failed. The key 'auth_level' is the maximum authorization level that this key provides.
+ − 1054
*/
+ − 1055
+ − 1056
function compat_validate_session($key)
+ − 1057
{
+ − 1058
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1059
$key = $db->escape($key);
+ − 1060
+ − 1061
$query = $this->sql('SELECT u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,k.source_ip,k.salt,k.time,k.auth_level FROM '.table_prefix.'session_keys AS k
+ − 1062
LEFT JOIN '.table_prefix.'users AS u
+ − 1063
ON u.user_id=k.user_id
+ − 1064
WHERE k.session_key=\''.$key.'\';');
+ − 1065
if($db->numrows() < 1)
+ − 1066
{
+ − 1067
// echo '(debug) $session->validate_session: Key '.$key.' was not found in database<br />';
+ − 1068
return false;
+ − 1069
}
+ − 1070
$row = $db->fetchrow();
+ − 1071
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1072
if($row['auth_level'] > $row['user_level'])
+ − 1073
{
+ − 1074
// Failed authorization check
+ − 1075
// echo '(debug) $session->validate_session: user not authorized for this access level';
+ − 1076
return false;
+ − 1077
}
+ − 1078
if($ip != $row['source_ip'])
+ − 1079
{
+ − 1080
// Failed IP address check
+ − 1081
// echo '(debug) $session->validate_session: IP address mismatch; IP in table: '.$row['source_ip'].'; reported IP: '.$ip.'';
+ − 1082
return false;
+ − 1083
}
+ − 1084
+ − 1085
// Do the password validation
+ − 1086
$real_key = md5($row['password'] . $row['salt']);
+ − 1087
+ − 1088
//die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1089
if($real_key != $key)
+ − 1090
{
+ − 1091
// Failed password check
+ − 1092
// echo '(debug) $session->validate_session: supplied password is wrong<br />Real key: '.$real_key.'<br />User key: '.$key;
+ − 1093
return false;
+ − 1094
}
+ − 1095
+ − 1096
$time_now = time();
+ − 1097
$time_key = $row['time'] + 900;
+ − 1098
if($time_now > $time_key && $row['auth_level'] >= 1)
+ − 1099
{
+ − 1100
$this->sw_timed_out = true;
+ − 1101
// Session timed out
+ − 1102
// echo '(debug) $session->validate_session: super session timed out<br />';
+ − 1103
return false;
+ − 1104
}
+ − 1105
+ − 1106
return $row;
+ − 1107
}
+ − 1108
+ − 1109
/**
+ − 1110
* Demotes us to one less than the specified auth level. AKA destroys elevated authentication and/or logs out the user, depending on $level
+ − 1111
* @param int $level How low we should go - USER_LEVEL_MEMBER means demote to USER_LEVEL_GUEST, and anything more powerful than USER_LEVEL_MEMBER means demote to USER_LEVEL_MEMBER
+ − 1112
* @return string 'success' if successful, or error on failure
+ − 1113
*/
+ − 1114
+ − 1115
function logout($level = USER_LEVEL_MEMBER)
+ − 1116
{
+ − 1117
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1118
$ou = $this->username;
+ − 1119
$oid = $this->user_id;
+ − 1120
if($level > USER_LEVEL_CHPREF)
+ − 1121
{
+ − 1122
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
+ − 1123
if(!$this->user_logged_in || $this->auth_level < USER_LEVEL_MOD) return 'success';
+ − 1124
// Destroy elevated privileges
+ − 1125
$keyhash = md5(strrev($this->sid_super));
+ − 1126
$this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.$keyhash.'\' AND user_id=\'' . $this->user_id . '\';');
+ − 1127
$this->sid_super = false;
+ − 1128
$this->auth_level = USER_LEVEL_MEMBER;
+ − 1129
}
+ − 1130
else
+ − 1131
{
+ − 1132
if($this->user_logged_in)
+ − 1133
{
+ − 1134
// Completely destroy our session
+ − 1135
if($this->auth_level > USER_LEVEL_CHPREF)
+ − 1136
{
+ − 1137
$this->logout(USER_LEVEL_ADMIN);
+ − 1138
}
+ − 1139
$this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.md5($this->sid).'\';');
+ − 1140
setcookie( 'sid', '', time()-(3600*24), scriptPath.'/' );
+ − 1141
}
+ − 1142
}
+ − 1143
$code = $plugins->setHook('logout_success'); // , Array('level'=>$level,'old_username'=>$ou,'old_user_id'=>$oid));
+ − 1144
foreach ( $code as $cmd )
+ − 1145
{
+ − 1146
eval($cmd);
+ − 1147
}
+ − 1148
return 'success';
+ − 1149
}
+ − 1150
+ − 1151
# Miscellaneous stuff
+ − 1152
+ − 1153
/**
+ − 1154
* Appends the high-privilege session key to the URL if we are authorized to do high-privilege stuff
+ − 1155
* @param string $url The URL to add session data to
+ − 1156
* @return string
+ − 1157
*/
+ − 1158
+ − 1159
function append_sid($url)
+ − 1160
{
+ − 1161
$sep = ( strstr($url, '?') ) ? '&' : '?';
+ − 1162
if ( $this->sid_super )
+ − 1163
{
+ − 1164
$url = $url . $sep . 'auth=' . urlencode($this->sid_super);
+ − 1165
// echo($this->sid_super.'<br/>');
+ − 1166
}
+ − 1167
return $url;
+ − 1168
}
+ − 1169
+ − 1170
/**
+ − 1171
* Grabs the user's password MD5
+ − 1172
* @return string, or bool false if access denied
+ − 1173
*/
+ − 1174
+ − 1175
function grab_password_hash()
+ − 1176
{
+ − 1177
if(!$this->password_hash) return false;
+ − 1178
return $this->password_hash;
+ − 1179
}
+ − 1180
+ − 1181
/**
+ − 1182
* Destroys the user's password MD5 in memory
+ − 1183
*/
+ − 1184
+ − 1185
function disallow_password_grab()
+ − 1186
{
+ − 1187
$this->password_hash = false;
+ − 1188
return false;
+ − 1189
}
+ − 1190
+ − 1191
/**
+ − 1192
* Generates an AES key and stashes it in the database
+ − 1193
* @return string Hex-encoded AES key
+ − 1194
*/
+ − 1195
+ − 1196
function rijndael_genkey()
+ − 1197
{
+ − 1198
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
+ − 1199
$key = $aes->gen_readymade_key();
+ − 1200
$keys = getConfig('login_key_cache');
+ − 1201
if(is_string($keys))
+ − 1202
$keys .= $key;
+ − 1203
else
+ − 1204
$keys = $key;
+ − 1205
setConfig('login_key_cache', $keys);
+ − 1206
return $key;
+ − 1207
}
+ − 1208
+ − 1209
/**
+ − 1210
* Generate a totally random 128-bit value for MD5 challenges
+ − 1211
* @return string
+ − 1212
*/
+ − 1213
+ − 1214
function dss_rand()
+ − 1215
{
+ − 1216
$aes = new AESCrypt();
+ − 1217
$random = $aes->randkey(128);
+ − 1218
unset($aes);
+ − 1219
return md5(microtime() . $random);
+ − 1220
}
+ − 1221
+ − 1222
/**
+ − 1223
* Fetch a cached login public key using the MD5sum as an identifier. Each key can only be fetched once before it is destroyed.
+ − 1224
* @param string $md5 The MD5 sum of the key
+ − 1225
* @return string, or bool false on failure
+ − 1226
*/
+ − 1227
+ − 1228
function fetch_public_key($md5)
+ − 1229
{
+ − 1230
$keys = getConfig('login_key_cache');
+ − 1231
$keys = enano_str_split($keys, AES_BITS / 4);
+ − 1232
+ − 1233
foreach($keys as $i => $k)
+ − 1234
{
+ − 1235
if(md5($k) == $md5)
+ − 1236
{
+ − 1237
unset($keys[$i]);
+ − 1238
if(count($keys) > 0)
+ − 1239
{
+ − 1240
if ( strlen(getConfig('login_key_cache') ) > 64000 )
+ − 1241
{
+ − 1242
// This should only need to be done once every month or so for an average-size site
+ − 1243
setConfig('login_key_cache', '');
+ − 1244
}
+ − 1245
else
+ − 1246
{
+ − 1247
$keys = implode('', array_values($keys));
+ − 1248
setConfig('login_key_cache', $keys);
+ − 1249
}
+ − 1250
}
+ − 1251
else
+ − 1252
{
+ − 1253
setConfig('login_key_cache', '');
+ − 1254
}
+ − 1255
return $k;
+ − 1256
}
+ − 1257
}
+ − 1258
// Couldn't find the key...
+ − 1259
return false;
+ − 1260
}
+ − 1261
+ − 1262
/**
+ − 1263
* Adds a user to a group.
+ − 1264
* @param int User ID
+ − 1265
* @param int Group ID
+ − 1266
* @param bool Group moderator - defaults to false
+ − 1267
* @return bool True on success, false on failure
+ − 1268
*/
+ − 1269
+ − 1270
function add_user_to_group($user_id, $group_id, $is_mod = false)
+ − 1271
{
+ − 1272
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1273
+ − 1274
// Validation
+ − 1275
if ( !is_int($user_id) || !is_int($group_id) || !is_bool($is_mod) )
+ − 1276
return false;
+ − 1277
if ( $user_id < 1 || $group_id < 1 )
+ − 1278
return false;
+ − 1279
+ − 1280
$mod_switch = ( $is_mod ) ? '1' : '0';
+ − 1281
$q = $this->sql('SELECT member_id,is_mod FROM '.table_prefix.'group_members WHERE user_id=' . $user_id . ' AND group_id=' . $group_id . ';');
+ − 1282
if ( !$q )
+ − 1283
$db->_die();
+ − 1284
if ( $db->numrows() < 1 )
+ − 1285
{
+ − 1286
// User is not in group
+ − 1287
$this->sql('INSERT INTO '.table_prefix.'group_members(user_id,group_id,is_mod) VALUES(' . $user_id . ', ' . $group_id . ', ' . $mod_switch . ');');
+ − 1288
return true;
+ − 1289
}
+ − 1290
else
+ − 1291
{
+ − 1292
$row = $db->fetchrow();
+ − 1293
// Update modship status
+ − 1294
if ( strval($row['is_mod']) == $mod_switch )
+ − 1295
{
+ − 1296
// Modship unchanged
+ − 1297
return true;
+ − 1298
}
+ − 1299
else
+ − 1300
{
+ − 1301
// Modship changed
+ − 1302
$this->sql('UPDATE '.table_prefix.'group_members SET is_mod=' . $mod_switch . ' WHERE member_id=' . $row['member_id'] . ';');
+ − 1303
return true;
+ − 1304
}
+ − 1305
}
+ − 1306
return false;
+ − 1307
}
+ − 1308
+ − 1309
/**
+ − 1310
* Removes a user from a group.
+ − 1311
* @param int User ID
+ − 1312
* @param int Group ID
+ − 1313
* @return bool True on success, false on failure
+ − 1314
* @todo put a little more error checking in...
+ − 1315
*/
+ − 1316
+ − 1317
function remove_user_from_group($user_id, $group_id)
+ − 1318
{
+ − 1319
if ( !is_int($user_id) || !is_int($group_id) )
+ − 1320
return false;
+ − 1321
$this->sql('DELETE FROM '.table_prefix."group_members WHERE user_id=$user_id AND group_id=$group_id;");
+ − 1322
return true;
+ − 1323
}
+ − 1324
+ − 1325
/**
+ − 1326
* Checks the banlist to ensure that we're an allowed user. Doesn't return anything because it dies if the user is banned.
+ − 1327
*/
+ − 1328
+ − 1329
function check_banlist()
+ − 1330
{
+ − 1331
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1332
if($this->compat)
+ − 1333
$q = $this->sql('SELECT ban_id,ban_type,ban_value,is_regex FROM '.table_prefix.'banlist ORDER BY ban_type;');
+ − 1334
else
+ − 1335
$q = $this->sql('SELECT ban_id,ban_type,ban_value,is_regex,reason FROM '.table_prefix.'banlist ORDER BY ban_type;');
+ − 1336
if(!$q) $db->_die('The banlist data could not be selected.');
+ − 1337
$banned = false;
+ − 1338
while($row = $db->fetchrow())
+ − 1339
{
+ − 1340
if($this->compat)
+ − 1341
$row['reason'] = 'None available - session manager is in compatibility mode';
+ − 1342
switch($row['ban_type'])
+ − 1343
{
+ − 1344
case BAN_IP:
+ − 1345
if(intval($row['is_regex'])==1) {
+ − 1346
if(preg_match('#'.$row['ban_value'].'#i', $_SERVER['REMOTE_ADDR']))
+ − 1347
{
+ − 1348
$banned = true;
+ − 1349
$reason = $row['reason'];
+ − 1350
}
+ − 1351
}
+ − 1352
else {
+ − 1353
if($row['ban_value']==$_SERVER['REMOTE_ADDR']) { $banned = true; $reason = $row['reason']; }
+ − 1354
}
+ − 1355
break;
+ − 1356
case BAN_USER:
+ − 1357
if(intval($row['is_regex'])==1) {
+ − 1358
if(preg_match('#'.$row['ban_value'].'#i', $this->username))
+ − 1359
{
+ − 1360
$banned = true;
+ − 1361
$reason = $row['reason'];
+ − 1362
}
+ − 1363
}
+ − 1364
else {
+ − 1365
if($row['ban_value']==$this->username) { $banned = true; $reason = $row['reason']; }
+ − 1366
}
+ − 1367
break;
+ − 1368
case BAN_EMAIL:
+ − 1369
if(intval($row['is_regex'])==1) {
+ − 1370
if(preg_match('#'.$row['ban_value'].'#i', $this->email))
+ − 1371
{
+ − 1372
$banned = true;
+ − 1373
$reason = $row['reason'];
+ − 1374
}
+ − 1375
}
+ − 1376
else {
+ − 1377
if($row['ban_value']==$this->email) { $banned = true; $reason = $row['reason']; }
+ − 1378
}
+ − 1379
break;
+ − 1380
default:
+ − 1381
die('Ban error: rule "'.$row['ban_value'].'" has an invalid type ('.$row['ban_type'].')');
+ − 1382
}
+ − 1383
}
+ − 1384
if($banned && $paths->get_pageid_from_url() != $paths->nslist['Special'].'CSS')
+ − 1385
{
+ − 1386
// This guy is banned - kill the session, kill the database connection, bail out, and be pretty about it
+ − 1387
die_semicritical('Ban notice', '<div class="error-box">You have been banned from this website. Please contact the site administrator for more information.<br /><br />Reason:<br />'.$reason.'</div>');
+ − 1388
exit;
+ − 1389
}
+ − 1390
}
+ − 1391
+ − 1392
# Registration
+ − 1393
+ − 1394
/**
+ − 1395
* Registers a user. This does not perform any type of login.
+ − 1396
* @param string $username
+ − 1397
* @param string $password This should be unencrypted.
+ − 1398
* @param string $email
+ − 1399
* @param string $real_name Optional, defaults to ''.
30
+ − 1400
* @param bool $coppa Optional. If true, the account is not activated initially and an admin activation request is sent. The caller is responsible for sending the address info and notice.
1
+ − 1401
*/
+ − 1402
30
+ − 1403
function create_user($username, $password, $email, $real_name = '', $coppa = false)
13
fdd6b9dd42c3
Installer actually works now on dev servers; minor language change in template.php; code cleanliness fix in sessions.php
Dan
diff
changeset
+ − 1404
{
1
+ − 1405
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1406
+ − 1407
// Initialize AES
+ − 1408
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
+ − 1409
+ − 1410
if(!preg_match('#^'.$this->valid_username.'$#', $username)) return 'The username you chose contains invalid characters.';
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1411
$user_orig = $username;
1
+ − 1412
$username = $this->prepare_text($username);
+ − 1413
$email = $this->prepare_text($email);
+ − 1414
$real_name = $this->prepare_text($real_name);
+ − 1415
+ − 1416
$nameclause = ( $real_name != '' ) ? ' OR real_name=\''.$real_name.'\'' : '';
+ − 1417
$q = $this->sql('SELECT * FROM '.table_prefix.'users WHERE lcase(username)=\''.strtolower($username).'\' OR email=\''.$email.'\''.$nameclause.';');
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1418
if($db->numrows() > 0)
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1419
{
1
+ − 1420
$r = 'The ';
+ − 1421
$i=0;
+ − 1422
$row = $db->fetchrow();
+ − 1423
// Wow! An error checker that actually speaks English with the properest grammar! :-P
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1424
if ( $row['username'] == $username )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1425
{
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1426
$r .= 'username';
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1427
$i++;
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1428
}
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1429
if ( $row['email'] == $email )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1430
{
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1431
if($i) $r.=', ';
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1432
$r .= 'e-mail address';
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1433
$i++;
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1434
}
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1435
if ( $row['real_name'] == $real_name && $real_name != '' )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1436
{
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1437
if($i) $r.=', and ';
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1438
$r .= 'real name';
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1439
$i++;
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1440
}
1
+ − 1441
$r .= ' that you entered ';
+ − 1442
$r .= ( $i == 1 ) ? 'is' : 'are';
+ − 1443
$r .= ' already in use by another user.';
+ − 1444
return $r;
+ − 1445
}
+ − 1446
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1447
// Is the password strong enough?
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1448
if ( getConfig('pw_strength_enable') )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1449
{
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1450
$min_score = intval( getConfig('pw_strength_minimum') );
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1451
$pass_score = password_score($password);
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1452
if ( $pass_score < $min_score )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1453
{
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1454
return 'The password you entered did not meet the complexity requirements for this site. Please choose a stronger password.';
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1455
}
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1456
}
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1457
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1458
$password = $aes->encrypt($password, $this->private_key, ENC_HEX);
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1459
1
+ − 1460
// Require the account to be activated?
+ − 1461
switch(getConfig('account_activation'))
+ − 1462
{
+ − 1463
case 'none':
+ − 1464
default:
+ − 1465
$active = '1';
+ − 1466
break;
+ − 1467
case 'user':
+ − 1468
$active = '0';
+ − 1469
break;
+ − 1470
case 'admin':
+ − 1471
$active = '0';
+ − 1472
break;
+ − 1473
}
30
+ − 1474
if ( $coppa )
+ − 1475
$active = '0';
+ − 1476
+ − 1477
$coppa_col = ( $coppa ) ? '1' : '0';
1
+ − 1478
+ − 1479
// Generate a totally random activation key
+ − 1480
$actkey = sha1 ( microtime() . mt_rand() );
+ − 1481
30
+ − 1482
// We good, create the user
+ − 1483
$this->sql('INSERT INTO '.table_prefix.'users ( username, password, email, real_name, theme, style, reg_time, account_active, activation_key, user_level, user_coppa ) VALUES ( \''.$username.'\', \''.$password.'\', \''.$email.'\', \''.$real_name.'\', \''.$template->default_theme.'\', \''.$template->default_style.'\', '.time().', '.$active.', \''.$actkey.'\', '.USER_LEVEL_CHPREF.', ' . $coppa_col . ' );');
1
+ − 1484
31
+ − 1485
// Get user ID and create users_extra entry
+ − 1486
$q = $this->sql('SELECT user_id FROM '.table_prefix."users WHERE username='$username';");
+ − 1487
if ( $db->numrows() > 0 )
+ − 1488
{
+ − 1489
$row = $db->fetchrow();
+ − 1490
$db->free_result();
+ − 1491
+ − 1492
$user_id =& $row['user_id'];
42
45ebe475ff75
I dunno how many times I'm gonna have to fix the "problem seems to be the hex conversion" bug, but this is at least the fourth try.
Dan
diff
changeset
+ − 1493
$this->sql('INSERT INTO '.table_prefix.'users_extra(user_id) VALUES(' . $user_id . ');');
31
+ − 1494
}
+ − 1495
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1496
// Grant edit and very limited mod access to the userpage
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1497
$acl_data = array(
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1498
'read' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1499
'view_source' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1500
'edit_page' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1501
'post_comments' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1502
'edit_comments' => AUTH_ALLOW, // only allows editing own comments
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1503
'history_view' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1504
'history_rollback' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1505
'rename' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1506
'delete_page' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1507
'tag_create' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1508
'tag_delete_own' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1509
'tag_delete_other' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1510
'edit_cat' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1511
'create_page' => AUTH_ALLOW
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1512
);
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1513
$acl_data = $db->escape($this->perm_to_string($acl_data));
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1514
$userpage = $db->escape(sanitize_page_id($user_orig));
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1515
$cols = "target_type, target_id, page_id, namespace, rules";
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1516
$vals = ACL_TYPE_USER . ", $user_id, '$userpage', 'User', '$acl_data'";
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1517
$q = "INSERT INTO ".table_prefix."acl($cols) VALUES($vals);";
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1518
$this->sql($q);
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1519
1
+ − 1520
// Require the account to be activated?
30
+ − 1521
if ( $coppa )
+ − 1522
{
+ − 1523
$this->admin_activation_request($username);
+ − 1524
$this->send_coppa_mail($username,$email);
+ − 1525
}
+ − 1526
else
1
+ − 1527
{
30
+ − 1528
switch(getConfig('account_activation'))
+ − 1529
{
+ − 1530
case 'none':
+ − 1531
default:
+ − 1532
break;
+ − 1533
case 'user':
+ − 1534
$a = $this->send_activation_mail($username);
+ − 1535
if(!$a)
+ − 1536
{
+ − 1537
$this->admin_activation_request($username);
+ − 1538
return 'The activation e-mail could not be sent due to an internal error. This could possibly be due to an incorrect SMTP configuration. A request has been sent to the administrator to activate your account for you. ' . $a;
+ − 1539
}
+ − 1540
break;
+ − 1541
case 'admin':
1
+ − 1542
$this->admin_activation_request($username);
30
+ − 1543
break;
+ − 1544
}
1
+ − 1545
}
+ − 1546
+ − 1547
// Leave some data behind for the hook
+ − 1548
$code = $plugins->setHook('user_registered'); // , Array('username'=>$username));
+ − 1549
foreach ( $code as $cmd )
+ − 1550
{
+ − 1551
eval($cmd);
+ − 1552
}
+ − 1553
+ − 1554
// $this->register_session($username, $password);
+ − 1555
return 'success';
+ − 1556
}
+ − 1557
+ − 1558
/**
+ − 1559
* Attempts to send an e-mail to the specified user with activation instructions.
+ − 1560
* @param string $u The usernamd of the user requesting activation
+ − 1561
* @return bool true on success, false on failure
+ − 1562
*/
+ − 1563
+ − 1564
function send_activation_mail($u, $actkey = false)
+ − 1565
{
+ − 1566
global $db, $session, $paths, $template, $plugins; // Common objects
131
+ − 1567
$q = $this->sql('SELECT username,email FROM '.table_prefix.'users WHERE user_id=2 OR user_level=' . USER_LEVEL_ADMIN . ' ORDER BY user_id ASC;');
1
+ − 1568
$un = $db->fetchrow();
+ − 1569
$admin_user = $un['username'];
+ − 1570
$q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1571
$r = $db->fetchrow();
+ − 1572
if ( empty($r['email']) )
+ − 1573
$db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1574
$message = 'Dear '.$u.',
+ − 1575
Thank you for registering on '.getConfig('site_name').'. Your account creation is almost complete. To complete the registration process, please click the following link or paste it into your web browser:
+ − 1576
+ − 1577
';
+ − 1578
if(isset($_SERVER['HTTPS'])) $prot = 'https';
+ − 1579
else $prot = 'http';
+ − 1580
if($_SERVER['SERVER_PORT'] == '80') $p = '';
+ − 1581
else $p = ':'.$_SERVER['SERVER_PORT'];
+ − 1582
$sidbak = false;
+ − 1583
if($this->sid_super)
+ − 1584
$sidbak = $this->sid_super;
+ − 1585
$this->sid_super = false;
+ − 1586
$aklink = makeUrlNS('Special', 'ActivateAccount/'.str_replace(' ', '_', $u).'/'. ( ( is_string($actkey) ) ? $actkey : $r['activation_key'] ) );
+ − 1587
if($sidbak)
+ − 1588
$this->sid_super = $sidbak;
+ − 1589
unset($sidbak);
+ − 1590
$message .= "$prot://".$_SERVER['HTTP_HOST'].$p.$aklink;
+ − 1591
$message .= "\n\nSincerely yours, \n$admin_user and the ".$_SERVER['HTTP_HOST']." administration team";
+ − 1592
error_reporting(E_ALL);
+ − 1593
dc_dump($r, 'session: about to send activation e-mail to '.$r['email']);
+ − 1594
if(getConfig('smtp_enabled') == '1')
+ − 1595
{
+ − 1596
$result = smtp_send_email($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 1597
if($result == 'success') $result = true;
+ − 1598
else { echo $result; $result = false; }
+ − 1599
} else {
+ − 1600
$result = mail($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 1601
}
+ − 1602
return $result;
+ − 1603
}
+ − 1604
+ − 1605
/**
30
+ − 1606
* Attempts to send an e-mail to the specified user's e-mail address on file intended for the parents
+ − 1607
* @param string $u The usernamd of the user requesting activation
+ − 1608
* @return bool true on success, false on failure
+ − 1609
*/
+ − 1610
+ − 1611
function send_coppa_mail($u, $actkey = false)
+ − 1612
{
+ − 1613
+ − 1614
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1615
+ − 1616
$q = $this->sql('SELECT username,email FROM '.table_prefix.'users WHERE user_id=2 OR user_level=' . USER_LEVEL_ADMIN . ' ORDER BY user_id ASC;');
+ − 1617
$un = $db->fetchrow();
+ − 1618
$admin_user = $un['username'];
+ − 1619
+ − 1620
$q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1621
$r = $db->fetchrow();
+ − 1622
if ( empty($r['email']) )
+ − 1623
$db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1624
+ − 1625
if(isset($_SERVER['HTTPS'])) $prot = 'https';
+ − 1626
else $prot = 'http';
+ − 1627
if($_SERVER['SERVER_PORT'] == '80') $p = '';
+ − 1628
else $p = ':'.$_SERVER['SERVER_PORT'];
+ − 1629
$sidbak = false;
+ − 1630
if($this->sid_super)
+ − 1631
$sidbak = $this->sid_super;
+ − 1632
$this->sid_super = false;
+ − 1633
if($sidbak)
+ − 1634
$this->sid_super = $sidbak;
+ − 1635
unset($sidbak);
+ − 1636
$link = "$prot://".$_SERVER['HTTP_HOST'].scriptPath;
+ − 1637
+ − 1638
$message = 'Dear parent or legal guardian,
+ − 1639
A child under the username ' . $u . ' recently registered on our website. The child provided your e-mail address as the one of his or her authorized parent or legal guardian, and to comply with the United States Childrens\' Online Privacy Protection act, we ask that all parents of children ages 13 or under please mail us a written form authorizing their child\'s use of our website.
+ − 1640
+ − 1641
If you wish for your child to be allowed access to our website, please print and fill out the form below, and mail it to this address:
+ − 1642
+ − 1643
' . getConfig('coppa_address') . '
+ − 1644
+ − 1645
If you do NOT wish for your child to be allowed access to our site, you do not need to do anything - your child will not be able to access our site as a registered user unless you authorize their account activation.
+ − 1646
+ − 1647
Authorization form:
+ − 1648
-------------------------------- Cut here --------------------------------
+ − 1649
+ − 1650
I, _______________________________________, the legal parent or guardian of the child registered on the website "' . getConfig('site_name') . '" as ' . $u . ', hereby give my authorization for the child\'s e-mail address, instant messaging information, location, and real name, to be collected and stored in a database owned and maintained by ' . getConfig('site_name') . ' at the child\'s option, and for the administrators of this website to use this information according to the privacy policy displayed on their website <' . $link . '>.
+ − 1651
+ − 1652
Child\'s name: _____________________________________
+ − 1653
+ − 1654
Child\'s e-mail address: _____________________________________
+ − 1655
(optional - if you don\'t provide this, we\'ll just send site-related e-mails to your e-mail address)
+ − 1656
+ − 1657
Signature of parent or guardian:
+ − 1658
+ − 1659
____________________________________________________
+ − 1660
+ − 1661
Date (YYYY-MM-DD): ______ / _____ / _____
+ − 1662
+ − 1663
-------------------------------- Cut here --------------------------------';
+ − 1664
$message .= "\n\nSincerely yours, \n$admin_user and the ".$_SERVER['HTTP_HOST']." administration team";
+ − 1665
+ − 1666
error_reporting(E_ALL);
+ − 1667
+ − 1668
dc_dump($r, 'session: about to send COPPA e-mail to '.$r['email']);
+ − 1669
if(getConfig('smtp_enabled') == '1')
+ − 1670
{
+ − 1671
$result = smtp_send_email($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 1672
if($result == 'success')
+ − 1673
{
+ − 1674
$result = true;
+ − 1675
}
+ − 1676
else
+ − 1677
{
+ − 1678
echo $result;
+ − 1679
$result = false;
+ − 1680
}
+ − 1681
}
+ − 1682
else
+ − 1683
{
+ − 1684
$result = mail($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 1685
}
+ − 1686
return $result;
+ − 1687
}
+ − 1688
+ − 1689
/**
1
+ − 1690
* Sends an e-mail to a user so they can reset their password.
+ − 1691
* @param int $user The user ID, or username if it's a string
+ − 1692
* @return bool true on success, false on failure
+ − 1693
*/
+ − 1694
+ − 1695
function mail_password_reset($user)
+ − 1696
{
+ − 1697
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1698
if(is_int($user))
+ − 1699
{
+ − 1700
$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
+ − 1701
}
+ − 1702
elseif(is_string($user))
+ − 1703
{
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1704
$q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE lcase(username)=lcase(\''.$db->escape($user).'\');');
1
+ − 1705
}
+ − 1706
else
+ − 1707
{
+ − 1708
return false;
+ − 1709
}
+ − 1710
+ − 1711
$row = $db->fetchrow();
+ − 1712
$temp_pass = $this->random_pass();
+ − 1713
+ − 1714
$this->register_temp_password($row['user_id'], $temp_pass);
+ − 1715
+ − 1716
$site_name = getConfig('site_name');
+ − 1717
+ − 1718
$message = "Dear {$row['username']},
+ − 1719
+ − 1720
Someone (hopefully you) on the {$site_name} website requested that a new password be created.
+ − 1721
+ − 1722
The request was sent from the IP address {$_SERVER['REMOTE_ADDR']}.
+ − 1723
+ − 1724
If you did not request the new password, then you do not need to do anything; the password will be invalidated after 24 hours.
+ − 1725
+ − 1726
If you did request this password, then please log in using the password shown below:
+ − 1727
+ − 1728
Password: {$temp_pass}
+ − 1729
+ − 1730
After you log in using this password, you will be able to reset your real password. You can only log in using this temporary password once.
+ − 1731
+ − 1732
Sincerely yours,
+ − 1733
The {$site_name} administration team
+ − 1734
";
+ − 1735
+ − 1736
if(getConfig('smtp_enabled') == '1')
+ − 1737
{
+ − 1738
$result = smtp_send_email($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 1739
if($result == 'success')
+ − 1740
{
+ − 1741
$result = true;
+ − 1742
}
+ − 1743
else
+ − 1744
{
+ − 1745
echo '<p>'.$result.'</p>';
+ − 1746
$result = false;
+ − 1747
}
+ − 1748
} else {
+ − 1749
$result = mail($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 1750
}
+ − 1751
return $result;
+ − 1752
}
+ − 1753
+ − 1754
/**
+ − 1755
* Sets the temporary password for the specified user to whatever is specified.
+ − 1756
* @param int $user_id
+ − 1757
* @param string $password
+ − 1758
* @return bool
+ − 1759
*/
+ − 1760
+ − 1761
function register_temp_password($user_id, $password)
+ − 1762
{
+ − 1763
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
+ − 1764
$temp_pass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 1765
$this->sql('UPDATE '.table_prefix.'users SET temp_password=\'' . $temp_pass . '\',temp_password_time='.time().' WHERE user_id='.intval($user_id).';');
+ − 1766
}
+ − 1767
+ − 1768
/**
+ − 1769
* Sends a request to the admin panel to have the username $u activated.
+ − 1770
* @param string $u The username of the user requesting activation
+ − 1771
*/
+ − 1772
+ − 1773
function admin_activation_request($u)
+ − 1774
{
+ − 1775
global $db;
+ − 1776
$this->sql('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, author, edit_summary) VALUES(\'admin\', \'activ_req\', '.time().', \''.date('d M Y h:i a').'\', \''.$this->username.'\', \''.$db->escape($u).'\');');
+ − 1777
}
+ − 1778
+ − 1779
/**
+ − 1780
* Activates a user account. If the action fails, a report is sent to the admin.
+ − 1781
* @param string $user The username of the user requesting activation
+ − 1782
* @param string $key The activation key
+ − 1783
*/
+ − 1784
+ − 1785
function activate_account($user, $key)
+ − 1786
{
+ − 1787
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1788
$this->sql('UPDATE '.table_prefix.'users SET account_active=1 WHERE username=\''.$db->escape($user).'\' AND activation_key=\''.$db->escape($key).'\';');
+ − 1789
$r = mysql_affected_rows();
+ − 1790
if ( $r > 0 )
+ − 1791
{
+ − 1792
$e = $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_good\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
+ − 1793
}
+ − 1794
else
+ − 1795
{
+ − 1796
$e = $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_bad\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
+ − 1797
}
+ − 1798
return $r;
+ − 1799
}
+ − 1800
+ − 1801
/**
+ − 1802
* For a given user level identifier (USER_LEVEL_*), returns a string describing that user level.
+ − 1803
* @param int User level
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1804
* @param bool If true, returns a shorter string. Optional.
1
+ − 1805
* @return string
+ − 1806
*/
+ − 1807
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1808
function userlevel_to_string($user_level, $short = false)
1
+ − 1809
{
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1810
if ( $short )
1
+ − 1811
{
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1812
switch ( $user_level )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1813
{
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1814
case USER_LEVEL_GUEST:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1815
return 'Guest';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1816
case USER_LEVEL_MEMBER:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1817
return 'Member';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1818
case USER_LEVEL_CHPREF:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1819
return 'Sensitive preferences changeable';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1820
case USER_LEVEL_MOD:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1821
return 'Moderator';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1822
case USER_LEVEL_ADMIN:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1823
return 'Administrative';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1824
default:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1825
return "Level $user_level";
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1826
}
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1827
}
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1828
else
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1829
{
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1830
switch ( $user_level )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1831
{
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1832
case USER_LEVEL_GUEST:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1833
return 'Low - guest privileges';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1834
case USER_LEVEL_MEMBER:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1835
return 'Standard - normal member level';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1836
case USER_LEVEL_CHPREF:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1837
return 'Medium - user can change his/her own e-mail address and password';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1838
case USER_LEVEL_MOD:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1839
return 'High - moderator privileges';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1840
case USER_LEVEL_ADMIN:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1841
return 'Highest - administrative privileges';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1842
default:
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1843
return "Unknown ($user_level)";
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1844
}
1
+ − 1845
}
+ − 1846
}
+ − 1847
+ − 1848
/**
+ − 1849
* 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.
+ − 1850
* @param int $user_id The user ID of the user to update - this cannot be changed
+ − 1851
* @param string $username The new username
+ − 1852
* @param string $old_pass The current password - only required if sessionManager::$user_level < USER_LEVEL_ADMIN. This should usually be an UNENCRYPTED string. This can also be an array - if it is, key 0 is treated as data AES-encrypted with key 1
+ − 1853
* @param string $password The new password
+ − 1854
* @param string $email The new e-mail address
+ − 1855
* @param string $realname The new real name
+ − 1856
* @param string $signature The updated forum/comment signature
+ − 1857
* @param int $user_level The updated user level
+ − 1858
* @return string 'success' if successful, or array of error strings on failure
+ − 1859
*/
+ − 1860
+ − 1861
function update_user($user_id, $username = false, $old_pass = false, $password = false, $email = false, $realname = false, $signature = false, $user_level = false)
+ − 1862
{
+ − 1863
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1864
+ − 1865
// Create some arrays
+ − 1866
+ − 1867
$errors = Array(); // Used to hold error strings
+ − 1868
$strs = Array(); // Sub-query statements
+ − 1869
+ − 1870
// Scan the user ID for problems
+ − 1871
if(intval($user_id) < 1) $errors[] = 'SQL injection attempt';
+ − 1872
+ − 1873
// Instanciate the AES encryption class
+ − 1874
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE);
+ − 1875
+ − 1876
// If all of our input vars are false, then we've effectively done our job so get out of here
+ − 1877
if($username === false && $password === false && $email === false && $realname === false && $signature === false && $user_level === false)
+ − 1878
{
+ − 1879
// echo 'debug: $session->update_user(): success (no changes requested)';
+ − 1880
return 'success';
+ − 1881
}
+ − 1882
+ − 1883
// Initialize our authentication check
+ − 1884
$authed = false;
+ − 1885
+ − 1886
// Verify the inputted password
+ − 1887
if(is_string($old_pass))
+ − 1888
{
+ − 1889
$q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 1890
if($db->numrows() < 1)
+ − 1891
{
+ − 1892
$errors[] = 'The password data could not be selected for verification.';
+ − 1893
}
+ − 1894
else
+ − 1895
{
+ − 1896
$row = $db->fetchrow();
+ − 1897
$real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 1898
if($real == $old_pass)
+ − 1899
$authed = true;
+ − 1900
}
+ − 1901
}
+ − 1902
+ − 1903
elseif(is_array($old_pass))
+ − 1904
{
+ − 1905
$old_pass = $aes->decrypt($old_pass[0], $old_pass[1]);
+ − 1906
$q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 1907
if($db->numrows() < 1)
+ − 1908
{
+ − 1909
$errors[] = 'The password data could not be selected for verification.';
+ − 1910
}
+ − 1911
else
+ − 1912
{
+ − 1913
$row = $db->fetchrow();
+ − 1914
$real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 1915
if($real == $old_pass)
+ − 1916
$authed = true;
+ − 1917
}
+ − 1918
}
+ − 1919
+ − 1920
// Initialize our query
+ − 1921
$q = 'UPDATE '.table_prefix.'users SET ';
+ − 1922
+ − 1923
if($this->auth_level >= USER_LEVEL_ADMIN || $authed) // Need the current password in order to update the e-mail address, change the username, or reset the password
+ − 1924
{
+ − 1925
// Username
+ − 1926
if(is_string($username))
+ − 1927
{
+ − 1928
// Check the username for problems
+ − 1929
if(!preg_match('#^'.$this->valid_username.'$#', $username))
+ − 1930
$errors[] = 'The username you entered contains invalid characters.';
+ − 1931
$strs[] = 'username=\''.$db->escape($username).'\'';
+ − 1932
}
+ − 1933
// Password
+ − 1934
if(is_string($password) && strlen($password) >= 6)
+ − 1935
{
+ − 1936
// Password needs to be encrypted before being stashed
+ − 1937
$encpass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 1938
if(!$encpass)
+ − 1939
$errors[] = 'The password could not be encrypted due to an internal error.';
+ − 1940
$strs[] = 'password=\''.$encpass.'\'';
+ − 1941
}
+ − 1942
// E-mail addy
+ − 1943
if(is_string($email))
+ − 1944
{
+ − 1945
// I didn't write this regex.
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1946
if(!preg_match('/^(?:[\w\d]+\.?)+@((?:(?:[\w\d]\-?)+\.)+\w{2,4}|localhost)$/', $email))
1
+ − 1947
$errors[] = 'The e-mail address you entered is invalid.';
+ − 1948
$strs[] = 'email=\''.$db->escape($email).'\'';
+ − 1949
}
+ − 1950
}
+ − 1951
// Real name
+ − 1952
if(is_string($realname))
+ − 1953
{
+ − 1954
$strs[] = 'real_name=\''.$db->escape($realname).'\'';
+ − 1955
}
+ − 1956
// Forum/comment signature
+ − 1957
if(is_string($signature))
+ − 1958
{
+ − 1959
$strs[] = 'signature=\''.$db->escape($signature).'\'';
+ − 1960
}
+ − 1961
// User level
+ − 1962
if(is_int($user_level))
+ − 1963
{
+ − 1964
$strs[] = 'user_level='.$user_level;
+ − 1965
}
+ − 1966
+ − 1967
// Add our generated query to the query string
+ − 1968
$q .= implode(',', $strs);
+ − 1969
+ − 1970
// One last error check
+ − 1971
if(sizeof($strs) < 1) $errors[] = 'An internal error occured building the SQL query, this is a bug';
+ − 1972
if(sizeof($errors) > 0) return $errors;
+ − 1973
+ − 1974
// Free our temp arrays
+ − 1975
unset($strs, $errors);
+ − 1976
+ − 1977
// Finalize the query and run it
+ − 1978
$q .= ' WHERE user_id='.$user_id.';';
+ − 1979
$this->sql($q);
+ − 1980
+ − 1981
// We also need to trigger re-activation.
+ − 1982
if ( is_string($email) )
+ − 1983
{
+ − 1984
switch(getConfig('account_activation'))
+ − 1985
{
+ − 1986
case 'user':
+ − 1987
case 'admin':
+ − 1988
+ − 1989
if ( $session->user_level >= USER_LEVEL_MOD && getConfig('account_activation') == 'admin' )
+ − 1990
// Don't require re-activation by admins for admins
+ − 1991
break;
+ − 1992
+ − 1993
// retrieve username
+ − 1994
if ( !$username )
+ − 1995
{
+ − 1996
$q = $this->sql('SELECT username FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 1997
if($db->numrows() < 1)
+ − 1998
{
+ − 1999
$errors[] = 'The username could not be selected.';
+ − 2000
}
+ − 2001
else
+ − 2002
{
+ − 2003
$row = $db->fetchrow();
+ − 2004
$username = $row['username'];
+ − 2005
}
+ − 2006
}
+ − 2007
if ( !$username )
+ − 2008
return $errors;
+ − 2009
+ − 2010
// Generate a totally random activation key
+ − 2011
$actkey = sha1 ( microtime() . mt_rand() );
+ − 2012
$a = $this->send_activation_mail($username, $actkey);
+ − 2013
if(!$a)
+ − 2014
{
+ − 2015
$this->admin_activation_request($username);
+ − 2016
}
+ − 2017
// Deactivate the account until e-mail is confirmed
+ − 2018
$q = $db->sql_query('UPDATE '.table_prefix.'users SET account_active=0,activation_key=\'' . $actkey . '\' WHERE user_id=' . $user_id . ';');
+ − 2019
break;
+ − 2020
}
+ − 2021
}
+ − 2022
+ − 2023
// Yay! We're done
+ − 2024
return 'success';
+ − 2025
}
+ − 2026
+ − 2027
#
+ − 2028
# Access Control Lists
+ − 2029
#
+ − 2030
+ − 2031
/**
+ − 2032
* Creates a new permission field in memory. If the permissions are set in the database, they are used. Otherwise, $default_perm is used.
+ − 2033
* @param string $acl_type An identifier for this field
+ − 2034
* @param int $default_perm Whether permission should be granted or not if it's not specified in the ACLs.
+ − 2035
* @param string $desc A human readable name for the permission type
+ − 2036
* @param array $deps The list of dependencies - this should be an array of ACL types
+ − 2037
* @param string $scope Which namespaces this field should apply to. This should be either a pipe-delimited list of namespace IDs or just "All".
+ − 2038
*/
+ − 2039
+ − 2040
function register_acl_type($acl_type, $default_perm = AUTH_DISALLOW, $desc = false, $deps = Array(), $scope = 'All')
+ − 2041
{
+ − 2042
if(isset($this->acl_types[$acl_type]))
+ − 2043
return false;
+ − 2044
else
+ − 2045
{
+ − 2046
if(!$desc)
+ − 2047
{
+ − 2048
$desc = capitalize_first_letter(str_replace('_', ' ', $acl_type));
+ − 2049
}
+ − 2050
$this->acl_types[$acl_type] = $default_perm;
+ − 2051
$this->acl_descs[$acl_type] = $desc;
+ − 2052
$this->acl_deps[$acl_type] = $deps;
+ − 2053
$this->acl_scope[$acl_type] = explode('|', $scope);
+ − 2054
}
+ − 2055
return true;
+ − 2056
}
+ − 2057
+ − 2058
/**
+ − 2059
* Tells us whether permission $type is allowed or not based on the current rules.
+ − 2060
* @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 2061
* @param bool $no_deps If true, disables dependency checking
+ − 2062
* @return bool True if allowed, false if denied or if an error occured
+ − 2063
*/
+ − 2064
+ − 2065
function get_permissions($type, $no_deps = false)
+ − 2066
{
+ − 2067
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2068
if ( isset( $this->perms[$type] ) )
+ − 2069
{
+ − 2070
if ( $this->perms[$type] == AUTH_DENY )
+ − 2071
$ret = false;
+ − 2072
else if ( $this->perms[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2073
$ret = true;
+ − 2074
else if ( $this->perms[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2075
$ret = false;
+ − 2076
else if ( $this->perms[$type] == AUTH_ALLOW )
+ − 2077
$ret = true;
+ − 2078
else if ( $this->perms[$type] == AUTH_DISALLOW )
+ − 2079
$ret = false;
+ − 2080
}
+ − 2081
else if(isset($this->acl_types[$type]))
+ − 2082
{
+ − 2083
if ( $this->acl_types[$type] == AUTH_DENY )
+ − 2084
$ret = false;
+ − 2085
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2086
$ret = true;
+ − 2087
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2088
$ret = false;
+ − 2089
else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 2090
$ret = true;
+ − 2091
else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 2092
$ret = false;
+ − 2093
}
+ − 2094
else
+ − 2095
{
+ − 2096
// ACL type is undefined
+ − 2097
trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
+ − 2098
return false; // Be on the safe side and deny access
+ − 2099
}
+ − 2100
if ( !$no_deps )
+ − 2101
{
+ − 2102
if ( !$this->acl_check_deps($type) )
+ − 2103
return false;
+ − 2104
}
+ − 2105
return $ret;
+ − 2106
}
+ − 2107
+ − 2108
/**
+ − 2109
* Fetch the permissions that apply to the current user for the page specified. The object you get will have the get_permissions method
+ − 2110
* and several other abilities.
+ − 2111
* @param string $page_id
+ − 2112
* @param string $namespace
+ − 2113
* @return object
+ − 2114
*/
+ − 2115
+ − 2116
function fetch_page_acl($page_id, $namespace)
+ − 2117
{
+ − 2118
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2119
+ − 2120
if ( count ( $this->acl_base_cache ) < 1 )
+ − 2121
{
+ − 2122
// Permissions table not yet initialized
+ − 2123
return false;
+ − 2124
}
+ − 2125
155
+ − 2126
// cache of permission objects (to save RAM and SQL queries)
+ − 2127
static $objcache = array();
+ − 2128
+ − 2129
if ( count($objcache) == 0 )
+ − 2130
{
+ − 2131
foreach ( $paths->nslist as $key => $_ )
+ − 2132
{
+ − 2133
$objcache[$key] = array();
+ − 2134
}
+ − 2135
}
+ − 2136
+ − 2137
if ( isset($objcache[$namespace][$page_id]) )
+ − 2138
{
+ − 2139
return $objcache[$namespace][$page_id];
+ − 2140
}
+ − 2141
1
+ − 2142
//if ( !isset( $paths->pages[$paths->nslist[$namespace] . $page_id] ) )
+ − 2143
//{
+ − 2144
// // Page does not exist
+ − 2145
// return false;
+ − 2146
//}
+ − 2147
155
+ − 2148
$objcache[$namespace][$page_id] = new Session_ACLPageInfo( $page_id, $namespace, $this->acl_types, $this->acl_descs, $this->acl_deps, $this->acl_base_cache );
+ − 2149
$object =& $objcache[$namespace][$page_id];
1
+ − 2150
+ − 2151
return $object;
+ − 2152
+ − 2153
}
+ − 2154
+ − 2155
/**
+ − 2156
* Read all of our permissions from the database and process/apply them. This should be called after the page is determined.
+ − 2157
* @access private
+ − 2158
*/
+ − 2159
+ − 2160
function init_permissions()
+ − 2161
{
+ − 2162
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2163
// Initialize the permissions list with some defaults
+ − 2164
$this->perms = $this->acl_types;
+ − 2165
$this->acl_defaults_used = $this->perms;
+ − 2166
+ − 2167
// Fetch sitewide defaults from the permissions table
+ − 2168
$bs = 'SELECT rules FROM '.table_prefix.'acl WHERE page_id IS NULL AND namespace IS NULL AND ( ';
+ − 2169
+ − 2170
$q = Array();
+ − 2171
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 2172
if(count($this->groups) > 0)
+ − 2173
{
+ − 2174
foreach($this->groups as $g_id => $g_name)
+ − 2175
{
+ − 2176
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2177
}
+ − 2178
}
+ − 2179
$bs .= implode(' OR ', $q) . ' ) ORDER BY target_type ASC, target_id ASC;';
+ − 2180
$q = $this->sql($bs);
+ − 2181
if ( $row = $db->fetchrow() )
+ − 2182
{
+ − 2183
do {
+ − 2184
$rules = $this->string_to_perm($row['rules']);
+ − 2185
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2186
$this->acl_merge_with_current($rules, $is_everyone);
+ − 2187
} while ( $row = $db->fetchrow() );
+ − 2188
}
+ − 2189
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2190
// Cache the sitewide permissions for later use
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2191
$this->acl_base_cache = $this->perms;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2192
1
+ − 2193
// Eliminate types that don't apply to this namespace
+ − 2194
foreach ( $this->perms AS $i => $perm )
+ − 2195
{
+ − 2196
if ( !in_array ( $paths->namespace, $this->acl_scope[$i] ) && !in_array('All', $this->acl_scope[$i]) )
+ − 2197
{
+ − 2198
unset($this->perms[$i]);
+ − 2199
}
+ − 2200
}
+ − 2201
73
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2202
// PAGE group info
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2203
$pg_list = $paths->get_page_groups($paths->cpage['urlname_nons'], $paths->namespace);
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2204
$pg_info = '';
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2205
foreach ( $pg_list as $g_id )
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2206
{
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2207
$pg_info .= ' ( page_id=\'' . $g_id . '\' AND namespace=\'__PageGroup\' ) OR';
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2208
}
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2209
1
+ − 2210
// Build a query to grab ACL info
+ − 2211
$bs = 'SELECT rules,target_type,target_id FROM '.table_prefix.'acl WHERE ( ';
+ − 2212
$q = Array();
+ − 2213
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 2214
if(count($this->groups) > 0)
+ − 2215
{
+ − 2216
foreach($this->groups as $g_id => $g_name)
+ − 2217
{
+ − 2218
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2219
}
+ − 2220
}
+ − 2221
// The reason we're using an ORDER BY statement here is because ACL_TYPE_GROUP is less than ACL_TYPE_USER, causing the user's individual
+ − 2222
// permissions to override group permissions.
73
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2223
$bs .= implode(' OR ', $q) . ' ) AND (' . $pg_info . ' ( page_id=\''.$db->escape($paths->cpage['urlname_nons']).'\' AND namespace=\''.$db->escape($paths->namespace).'\' ) )
1
+ − 2224
ORDER BY target_type ASC, page_id ASC, namespace ASC;';
+ − 2225
$q = $this->sql($bs);
+ − 2226
if ( $row = $db->fetchrow() )
+ − 2227
{
+ − 2228
do {
+ − 2229
$rules = $this->string_to_perm($row['rules']);
+ − 2230
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2231
$this->acl_merge_with_current($rules, $is_everyone);
+ − 2232
} while ( $row = $db->fetchrow() );
+ − 2233
}
+ − 2234
+ − 2235
}
+ − 2236
+ − 2237
/**
+ − 2238
* Extends the scope of a permission type.
+ − 2239
* @param string The name of the permission type
+ − 2240
* @param string The namespace(s) that should be covered. This can be either one namespace ID or a pipe-delimited list.
+ − 2241
* @param object Optional - the current $paths object, in case we're doing this from the acl_rule_init hook
+ − 2242
*/
+ − 2243
+ − 2244
function acl_extend_scope($perm_type, $namespaces, &$p_in)
+ − 2245
{
+ − 2246
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2247
$p_obj = ( is_object($p_in) ) ? $p_in : $paths;
+ − 2248
$nslist = explode('|', $namespaces);
+ − 2249
foreach ( $nslist as $i => $ns )
+ − 2250
{
+ − 2251
if ( !isset($p_obj->nslist[$ns]) )
+ − 2252
{
+ − 2253
unset($nslist[$i]);
+ − 2254
}
+ − 2255
else
+ − 2256
{
+ − 2257
$this->acl_scope[$perm_type][] = $ns;
+ − 2258
if ( isset($this->acl_types[$perm_type]) && !isset($this->perms[$perm_type]) )
+ − 2259
{
+ − 2260
$this->perms[$perm_type] = $this->acl_types[$perm_type];
+ − 2261
}
+ − 2262
}
+ − 2263
}
+ − 2264
}
+ − 2265
+ − 2266
/**
+ − 2267
* Converts a permissions field into a string for database insertion. Similar in spirit to serialize().
+ − 2268
* @param array $perms An associative array with only integers as values
+ − 2269
* @return string
+ − 2270
*/
+ − 2271
+ − 2272
function perm_to_string($perms)
+ − 2273
{
+ − 2274
$s = '';
+ − 2275
foreach($perms as $perm => $ac)
+ − 2276
{
+ − 2277
$s .= "$perm=$ac;";
+ − 2278
}
+ − 2279
return $s;
+ − 2280
}
+ − 2281
+ − 2282
/**
+ − 2283
* Converts a permissions string back to an array.
+ − 2284
* @param string $perms The result from sessionManager::perm_to_string()
+ − 2285
* @return array
+ − 2286
*/
+ − 2287
+ − 2288
function string_to_perm($perms)
+ − 2289
{
+ − 2290
$ret = Array();
+ − 2291
preg_match_all('#([a-z0-9_-]+)=([0-9]+);#i', $perms, $matches);
+ − 2292
foreach($matches[1] as $i => $t)
+ − 2293
{
+ − 2294
$ret[$t] = intval($matches[2][$i]);
+ − 2295
}
+ − 2296
return $ret;
+ − 2297
}
+ − 2298
+ − 2299
/**
+ − 2300
* Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence over the first, but AUTH_DENY always prevails.
+ − 2301
* @param array $perm1 The first set of permissions
+ − 2302
* @param array $perm2 The second set of permissions
+ − 2303
* @return array
+ − 2304
*/
+ − 2305
+ − 2306
function acl_merge($perm1, $perm2)
+ − 2307
{
+ − 2308
$ret = $perm1;
+ − 2309
foreach ( $perm2 as $type => $level )
+ − 2310
{
+ − 2311
if ( isset( $ret[$type] ) )
+ − 2312
{
+ − 2313
if ( $ret[$type] != AUTH_DENY )
+ − 2314
$ret[$type] = $level;
+ − 2315
}
+ − 2316
// else
+ − 2317
// {
+ − 2318
// $ret[$type] = $level;
+ − 2319
// }
+ − 2320
}
+ − 2321
return $ret;
+ − 2322
}
+ − 2323
+ − 2324
/**
+ − 2325
* Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
+ − 2326
* @param array The array to merge into the master ACL list
+ − 2327
* @param bool If true, $perm is treated as the "new default"
+ − 2328
* @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
+ − 2329
*/
+ − 2330
+ − 2331
function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
+ − 2332
{
+ − 2333
foreach ( $this->perms as $i => $p )
+ − 2334
{
+ − 2335
if ( isset($perm[$i]) )
+ − 2336
{
+ − 2337
if ( $is_everyone && !$this->acl_defaults_used[$i] )
+ − 2338
continue;
+ − 2339
// Decide precedence
+ − 2340
if ( isset($this->acl_defaults_used[$i]) )
+ − 2341
{
+ − 2342
//echo "$i: default in use, overriding to: {$perm[$i]}<br />";
+ − 2343
// Defaults are in use, override
+ − 2344
$this->perms[$i] = $perm[$i];
+ − 2345
$this->acl_defaults_used[$i] = ( $is_everyone );
+ − 2346
}
+ − 2347
else
+ − 2348
{
+ − 2349
//echo "$i: default NOT in use";
+ − 2350
// Defaults are not in use, merge as normal
+ − 2351
if ( $this->perms[$i] != AUTH_DENY )
+ − 2352
{
+ − 2353
//echo ", but overriding";
+ − 2354
$this->perms[$i] = $perm[$i];
+ − 2355
}
+ − 2356
//echo "<br />";
+ − 2357
}
+ − 2358
}
+ − 2359
}
+ − 2360
}
+ − 2361
+ − 2362
/**
+ − 2363
* Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence
+ − 2364
* over the first, without exceptions. This is used to merge the hardcoded defaults with admin-specified
+ − 2365
* defaults, which take precedence.
+ − 2366
* @param array $perm1 The first set of permissions
+ − 2367
* @param array $perm2 The second set of permissions
+ − 2368
* @return array
+ − 2369
*/
+ − 2370
+ − 2371
function acl_merge_complete($perm1, $perm2)
+ − 2372
{
+ − 2373
$ret = $perm1;
+ − 2374
foreach ( $perm2 as $type => $level )
+ − 2375
{
+ − 2376
$ret[$type] = $level;
+ − 2377
}
+ − 2378
return $ret;
+ − 2379
}
+ − 2380
+ − 2381
/**
+ − 2382
* Tell us if the dependencies for a given permission are met.
+ − 2383
* @param string The ACL permission ID
+ − 2384
* @return bool
+ − 2385
*/
+ − 2386
+ − 2387
function acl_check_deps($type)
+ − 2388
{
+ − 2389
if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 2390
return true;
+ − 2391
if(sizeof($this->acl_deps[$type]) < 1)
+ − 2392
return true;
+ − 2393
$deps = $this->acl_deps[$type];
+ − 2394
while(true)
+ − 2395
{
+ − 2396
$full_resolved = true;
+ − 2397
$j = sizeof($deps);
+ − 2398
for ( $i = 0; $i < $j; $i++ )
+ − 2399
{
+ − 2400
$b = $deps;
+ − 2401
$deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 2402
if( $b == $deps )
+ − 2403
{
+ − 2404
break 2;
+ − 2405
}
+ − 2406
$j = sizeof($deps);
+ − 2407
}
+ − 2408
}
+ − 2409
//die('<pre>'.print_r($deps, true).'</pre>');
+ − 2410
foreach($deps as $d)
+ − 2411
{
+ − 2412
if ( !$this->get_permissions($d) )
+ − 2413
{
+ − 2414
return false;
+ − 2415
}
+ − 2416
}
+ − 2417
return true;
+ − 2418
}
+ − 2419
+ − 2420
/**
+ − 2421
* Makes a CAPTCHA code and caches the code in the database
+ − 2422
* @param int $len The length of the code, in bytes
+ − 2423
* @return string A unique identifier assigned to the code. This hash should be passed to sessionManager::getCaptcha() to retrieve the code.
+ − 2424
*/
+ − 2425
+ − 2426
function make_captcha($len = 7)
+ − 2427
{
+ − 2428
$chars = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9');
+ − 2429
$s = '';
+ − 2430
for($i=0;$i<$len;$i++) $s .= $chars[mt_rand(0, count($chars)-1)];
+ − 2431
$hash = md5(microtime() . mt_rand());
+ − 2432
$this->sql('INSERT INTO '.table_prefix.'session_keys(session_key,salt,auth_level,source_ip,user_id) VALUES(\''.$hash.'\', \''.$s.'\', -1, \''.ip2hex($_SERVER['REMOTE_ADDR']).'\', -2);');
+ − 2433
return $hash;
+ − 2434
}
+ − 2435
+ − 2436
/**
+ − 2437
* For the given code ID, returns the correct CAPTCHA code, or false on failure
+ − 2438
* @param string $hash The unique ID assigned to the code
+ − 2439
* @return string The correct confirmation code
+ − 2440
*/
+ − 2441
+ − 2442
function get_captcha($hash)
+ − 2443
{
+ − 2444
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2445
$s = $this->sql('SELECT salt FROM '.table_prefix.'session_keys WHERE session_key=\''.$db->escape($hash).'\' AND source_ip=\''.ip2hex($_SERVER['REMOTE_ADDR']).'\';');
+ − 2446
if($db->numrows() < 1) return false;
+ − 2447
$r = $db->fetchrow();
+ − 2448
return $r['salt'];
+ − 2449
}
+ − 2450
+ − 2451
/**
+ − 2452
* Deletes all CAPTCHA codes cached in the DB for this user.
+ − 2453
*/
+ − 2454
+ − 2455
function kill_captcha()
+ − 2456
{
+ − 2457
$this->sql('DELETE FROM '.table_prefix.'session_keys WHERE user_id=-2 AND source_ip=\''.ip2hex($_SERVER['REMOTE_ADDR']).'\';');
+ − 2458
}
+ − 2459
+ − 2460
/**
+ − 2461
* Generates a random password.
+ − 2462
* @param int $length Optional - length of password
+ − 2463
* @return string
+ − 2464
*/
+ − 2465
+ − 2466
function random_pass($length = 10)
+ − 2467
{
+ − 2468
$valid_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_+@#%&<>';
+ − 2469
$valid_chars = enano_str_split($valid_chars);
+ − 2470
$ret = '';
+ − 2471
for ( $i = 0; $i < $length; $i++ )
+ − 2472
{
+ − 2473
$ret .= $valid_chars[mt_rand(0, count($valid_chars)-1)];
+ − 2474
}
+ − 2475
return $ret;
+ − 2476
}
+ − 2477
+ − 2478
/**
+ − 2479
* Generates some Javascript that calls the AES encryption library.
+ − 2480
* @param string The name of the form
+ − 2481
* @param string The name of the password field
+ − 2482
* @param string The name of the field that switches encryption on or off
+ − 2483
* @param string The name of the field that contains the encryption key
+ − 2484
* @param string The name of the field that will contain the encrypted password
+ − 2485
* @param string The name of the field that handles MD5 challenge data
+ − 2486
* @return string
+ − 2487
*/
+ − 2488
+ − 2489
function aes_javascript($form_name, $pw_field, $use_crypt, $crypt_key, $crypt_data, $challenge)
+ − 2490
{
+ − 2491
$code = '
+ − 2492
<script type="text/javascript">
+ − 2493
disableJSONExts();
+ − 2494
str = \'\';
+ − 2495
for(i=0;i<keySizeInBits/4;i++) str+=\'0\';
+ − 2496
var key = hexToByteArray(str);
+ − 2497
var pt = hexToByteArray(str);
+ − 2498
var ct = rijndaelEncrypt(pt, key, \'ECB\');
+ − 2499
var ct = byteArrayToHex(ct);
+ − 2500
switch(keySizeInBits)
+ − 2501
{
+ − 2502
case 128:
+ − 2503
v = \'66e94bd4ef8a2c3b884cfa59ca342b2e\';
+ − 2504
break;
+ − 2505
case 192:
+ − 2506
v = \'aae06992acbf52a3e8f4a96ec9300bd7aae06992acbf52a3e8f4a96ec9300bd7\';
+ − 2507
break;
+ − 2508
case 256:
+ − 2509
v = \'dc95c078a2408989ad48a21492842087dc95c078a2408989ad48a21492842087\';
+ − 2510
break;
+ − 2511
}
+ − 2512
var testpassed = ' . ( ( isset($_GET['use_crypt']) && $_GET['use_crypt']=='0') ? 'false; // CRYPTO-AUTH DISABLED ON USER REQUEST // ' : '' ) . '( ct == v && md5_vm_test() );
+ − 2513
var frm = document.forms.'.$form_name.';
+ − 2514
function runEncryption()
+ − 2515
{
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2516
var frm = document.forms.'.$form_name.';
1
+ − 2517
if(testpassed)
+ − 2518
{
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2519
frm.'.$use_crypt.'.value = \'yes\';
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2520
var cryptkey = frm.'.$crypt_key.'.value;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2521
frm.'.$crypt_key.'.value = hex_md5(cryptkey);
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2522
cryptkey = hexToByteArray(cryptkey);
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2523
if(!cryptkey || ( ( typeof cryptkey == \'string\' || typeof cryptkey == \'object\' ) ) && cryptkey.length != keySizeInBits / 8 )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2524
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2525
if ( frm._login ) frm._login.disabled = true;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2526
len = ( typeof cryptkey == \'string\' || typeof cryptkey == \'object\' ) ? \'\\nLen: \'+cryptkey.length : \'\';
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2527
alert(\'The key is messed up\\nType: \'+typeof(cryptkey)+len);
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2528
}
1
+ − 2529
pass = frm.'.$pw_field.'.value;
+ − 2530
chal = frm.'.$challenge.'.value;
+ − 2531
challenge = hex_md5(pass + chal) + chal;
+ − 2532
frm.'.$challenge.'.value = challenge;
+ − 2533
pass = stringToByteArray(pass);
+ − 2534
cryptstring = rijndaelEncrypt(pass, cryptkey, \'ECB\');
+ − 2535
if(!cryptstring)
+ − 2536
{
+ − 2537
return false;
+ − 2538
}
+ − 2539
cryptstring = byteArrayToHex(cryptstring);
+ − 2540
frm.'.$crypt_data.'.value = cryptstring;
+ − 2541
frm.'.$pw_field.'.value = \'\';
+ − 2542
}
+ − 2543
return false;
+ − 2544
}
+ − 2545
</script>
+ − 2546
';
+ − 2547
return $code;
+ − 2548
}
+ − 2549
+ − 2550
}
+ − 2551
+ − 2552
/**
+ − 2553
* Class used to fetch permissions for a specific page. Used internally by SessionManager.
+ − 2554
* @package Enano
+ − 2555
* @subpackage Session manager
+ − 2556
* @license http://www.gnu.org/copyleft/gpl.html
+ − 2557
* @access private
+ − 2558
*/
+ − 2559
+ − 2560
class Session_ACLPageInfo {
+ − 2561
+ − 2562
/**
+ − 2563
* The page ID of this ACL info package
+ − 2564
* @var string
+ − 2565
*/
+ − 2566
+ − 2567
var $page_id;
+ − 2568
+ − 2569
/**
+ − 2570
* The namespace of the page being checked
+ − 2571
* @var string
+ − 2572
*/
+ − 2573
+ − 2574
var $namespace;
+ − 2575
+ − 2576
/**
+ − 2577
* Our list of permission types.
+ − 2578
* @access private
+ − 2579
* @var array
+ − 2580
*/
+ − 2581
+ − 2582
var $acl_types = Array();
+ − 2583
+ − 2584
/**
+ − 2585
* The list of descriptions for the permission types
+ − 2586
* @var array
+ − 2587
*/
+ − 2588
+ − 2589
var $acl_descs = Array();
+ − 2590
+ − 2591
/**
+ − 2592
* A list of dependencies for ACL types.
+ − 2593
* @var array
+ − 2594
*/
+ − 2595
+ − 2596
var $acl_deps = Array();
+ − 2597
+ − 2598
/**
+ − 2599
* Our tell-all list of permissions.
+ − 2600
* @access private - or, preferably, protected...too bad this has to be PHP4 compatible
+ − 2601
* @var array
+ − 2602
*/
+ − 2603
+ − 2604
var $perms = Array();
+ − 2605
+ − 2606
/**
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2607
* Array to track which default permissions are being used
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2608
* @var array
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2609
* @access private
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2610
*/
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2611
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2612
var $acl_defaults_used = Array();
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2613
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2614
/**
1
+ − 2615
* Constructor.
+ − 2616
* @param string $page_id The ID of the page to check
+ − 2617
* @param string $namespace The namespace of the page to check.
+ − 2618
* @param array $acl_types List of ACL types
+ − 2619
* @param array $acl_descs List of human-readable descriptions for permissions (associative)
+ − 2620
* @param array $acl_deps List of dependencies for permissions. For example, viewing history/diffs depends on the ability to read the page.
+ − 2621
* @param array $base What to start with - this is an attempt to reduce the number of SQL queries.
+ − 2622
*/
+ − 2623
+ − 2624
function Session_ACLPageInfo($page_id, $namespace, $acl_types, $acl_descs, $acl_deps, $base)
+ − 2625
{
+ − 2626
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2627
+ − 2628
$this->acl_deps = $acl_deps;
+ − 2629
$this->acl_types = $acl_types;
+ − 2630
$this->acl_descs = $acl_descs;
+ − 2631
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2632
$this->perms = $acl_types;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2633
$this->perms = $session->acl_merge_complete($this->perms, $base);
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2634
73
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2635
// PAGE group info
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2636
$pg_list = $paths->get_page_groups($page_id, $namespace);
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2637
$pg_info = '';
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2638
foreach ( $pg_list as $g_id )
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2639
{
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2640
$pg_info .= ' ( page_id=\'' . $g_id . '\' AND namespace=\'__PageGroup\' ) OR';
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2641
}
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2642
1
+ − 2643
// Build a query to grab ACL info
+ − 2644
$bs = 'SELECT rules FROM '.table_prefix.'acl WHERE ( ';
+ − 2645
$q = Array();
+ − 2646
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$session->user_id.' )';
+ − 2647
if(count($session->groups) > 0)
+ − 2648
{
+ − 2649
foreach($session->groups as $g_id => $g_name)
+ − 2650
{
+ − 2651
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2652
}
+ − 2653
}
+ − 2654
// The reason we're using an ORDER BY statement here is because ACL_TYPE_GROUP is less than ACL_TYPE_USER, causing the user's individual
+ − 2655
// permissions to override group permissions.
73
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2656
$bs .= implode(' OR ', $q) . ' ) AND (' . $pg_info . ' page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\' )
1
+ − 2657
ORDER BY target_type ASC, page_id ASC, namespace ASC;';
+ − 2658
$q = $session->sql($bs);
+ − 2659
if ( $row = $db->fetchrow() )
+ − 2660
{
+ − 2661
do {
+ − 2662
$rules = $session->string_to_perm($row['rules']);
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2663
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2664
$this->acl_merge_with_current($rules, $is_everyone);
1
+ − 2665
} while ( $row = $db->fetchrow() );
+ − 2666
}
+ − 2667
+ − 2668
$this->page_id = $page_id;
+ − 2669
$this->namespace = $namespace;
+ − 2670
}
+ − 2671
+ − 2672
/**
+ − 2673
* Tells us whether permission $type is allowed or not based on the current rules.
+ − 2674
* @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 2675
* @param bool $no_deps If true, disables dependency checking
+ − 2676
* @return bool True if allowed, false if denied or if an error occured
+ − 2677
*/
+ − 2678
+ − 2679
function get_permissions($type, $no_deps = false)
+ − 2680
{
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2681
// echo '<pre>' . print_r($this->perms, true) . '</pre>';
1
+ − 2682
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2683
if ( isset( $this->perms[$type] ) )
+ − 2684
{
+ − 2685
if ( $this->perms[$type] == AUTH_DENY )
+ − 2686
$ret = false;
+ − 2687
else if ( $this->perms[$type] == AUTH_WIKIMODE &&
+ − 2688
( isset($paths->pages[$paths->nslist[$this->namespace].$this->page_id]) &&
+ − 2689
( $paths->pages[$paths->nslist[$this->namespace].$this->page_id]['wiki_mode'] == '1' ||
+ − 2690
( $paths->pages[$paths->nslist[$this->namespace].$this->page_id]['wiki_mode'] == '2'
+ − 2691
&& getConfig('wiki_mode') == '1'
+ − 2692
) ) ) )
+ − 2693
$ret = true;
+ − 2694
else if ( $this->perms[$type] == AUTH_WIKIMODE && (
+ − 2695
!isset($paths->pages[$paths->nslist[$this->namespace].$this->page_id])
+ − 2696
|| (
+ − 2697
isset($paths->pages[$paths->nslist[$this->namespace].$this->page_id]) && (
+ − 2698
$paths->pages[$paths->nslist[$this->namespace].$this->page_id]['wiki_mode'] == '0'
+ − 2699
|| (
+ − 2700
$paths->pages[$paths->nslist[$this->namespace].$this->page_id]['wiki_mode'] == '2' && getConfig('wiki_mode') != '1'
+ − 2701
) ) ) ) )
+ − 2702
$ret = false;
+ − 2703
else if ( $this->perms[$type] == AUTH_ALLOW )
+ − 2704
$ret = true;
+ − 2705
else if ( $this->perms[$type] == AUTH_DISALLOW )
+ − 2706
$ret = false;
+ − 2707
}
+ − 2708
else if(isset($this->acl_types[$type]))
+ − 2709
{
+ − 2710
if ( $this->acl_types[$type] == AUTH_DENY )
+ − 2711
$ret = false;
+ − 2712
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2713
$ret = true;
+ − 2714
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2715
$ret = false;
+ − 2716
else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 2717
$ret = true;
+ − 2718
else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 2719
$ret = false;
+ − 2720
}
+ − 2721
else
+ − 2722
{
+ − 2723
// ACL type is undefined
+ − 2724
trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
+ − 2725
return false; // Be on the safe side and deny access
+ − 2726
}
+ − 2727
if ( !$no_deps )
+ − 2728
{
+ − 2729
if ( !$this->acl_check_deps($type) )
+ − 2730
return false;
+ − 2731
}
+ − 2732
return $ret;
+ − 2733
}
+ − 2734
+ − 2735
/**
+ − 2736
* Tell us if the dependencies for a given permission are met.
+ − 2737
* @param string The ACL permission ID
+ − 2738
* @return bool
+ − 2739
*/
+ − 2740
+ − 2741
function acl_check_deps($type)
+ − 2742
{
+ − 2743
if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 2744
return true;
+ − 2745
if(sizeof($this->acl_deps[$type]) < 1)
+ − 2746
return true;
+ − 2747
$deps = $this->acl_deps[$type];
+ − 2748
while(true)
+ − 2749
{
+ − 2750
$full_resolved = true;
+ − 2751
$j = sizeof($deps);
+ − 2752
for ( $i = 0; $i < $j; $i++ )
+ − 2753
{
+ − 2754
$b = $deps;
+ − 2755
$deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 2756
if( $b == $deps )
+ − 2757
{
+ − 2758
break 2;
+ − 2759
}
+ − 2760
$j = sizeof($deps);
+ − 2761
}
+ − 2762
}
+ − 2763
//die('<pre>'.print_r($deps, true).'</pre>');
+ − 2764
foreach($deps as $d)
+ − 2765
{
+ − 2766
if ( !$this->get_permissions($d) )
+ − 2767
{
+ − 2768
return false;
+ − 2769
}
+ − 2770
}
+ − 2771
return true;
+ − 2772
}
+ − 2773
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2774
/**
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2775
* Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2776
* @param array The array to merge into the master ACL list
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2777
* @param bool If true, $perm is treated as the "new default"
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2778
* @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2779
*/
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2780
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2781
function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2782
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2783
foreach ( $this->perms as $i => $p )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2784
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2785
if ( isset($perm[$i]) )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2786
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2787
if ( $is_everyone && !$this->acl_defaults_used[$i] )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2788
continue;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2789
// Decide precedence
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2790
if ( isset($this->acl_defaults_used[$i]) )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2791
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2792
//echo "$i: default in use, overriding to: {$perm[$i]}<br />";
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2793
// Defaults are in use, override
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2794
$this->perms[$i] = $perm[$i];
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2795
$this->acl_defaults_used[$i] = ( $is_everyone );
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2796
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2797
else
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2798
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2799
//echo "$i: default NOT in use";
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2800
// Defaults are not in use, merge as normal
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2801
if ( $this->perms[$i] != AUTH_DENY )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2802
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2803
//echo ", but overriding";
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2804
$this->perms[$i] = $perm[$i];
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2805
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2806
//echo "<br />";
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2807
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2808
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2809
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2810
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2811
1
+ − 2812
}
+ − 2813
+ − 2814
?>