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