1
+ − 1 <?php
+ − 2
+ − 3 /*
+ − 4 * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
685
17ebe24cdf85
Rebranded as 1.1.5 (Caoineag alpha 5) and fixed a couple bugs related to CDN support in template_nodb and installerUI. Updated readme.
Dan
diff
changeset
+ − 5 * Version 1.1.5 (Caoineag alpha 5)
536
+ − 6 * Copyright (C) 2006-2008 Dan Fuhry
1
+ − 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 /**
+ − 17 * Anything and everything related to security and user management. This includes AES encryption, which is illegal in some countries.
+ − 18 * Documenting the API was not easy - I hope you folks enjoy it.
+ − 19 * @package Enano
+ − 20 * @subpackage Session manager
+ − 21 * @category security, user management, logins, etc.
+ − 22 */
+ − 23
+ − 24 class sessionManager {
+ − 25
+ − 26 # Variables
+ − 27
+ − 28 /**
+ − 29 * Whether we're logged in or not
+ − 30 * @var bool
+ − 31 */
+ − 32
+ − 33 var $user_logged_in = false;
+ − 34
+ − 35 /**
+ − 36 * Our current low-privilege session key
+ − 37 * @var string
+ − 38 */
+ − 39
+ − 40 var $sid;
+ − 41
+ − 42 /**
+ − 43 * Username of currently logged-in user, or IP address if not logged in
+ − 44 * @var string
+ − 45 */
+ − 46
+ − 47 var $username;
+ − 48
+ − 49 /**
436
+ − 50 * User ID of currently logged-in user, or 1 if not logged in
1
+ − 51 * @var int
+ − 52 */
+ − 53
436
+ − 54 var $user_id = 1;
1
+ − 55
+ − 56 /**
+ − 57 * Real name of currently logged-in user, or blank if not logged in
+ − 58 * @var string
+ − 59 */
+ − 60
+ − 61 var $real_name;
+ − 62
+ − 63 /**
+ − 64 * E-mail address of currently logged-in user, or blank if not logged in
+ − 65 * @var string
+ − 66 */
+ − 67
+ − 68 var $email;
+ − 69
+ − 70 /**
31
+ − 71 * List of "extra" user information fields (IM handles, etc.)
+ − 72 * @var array (associative)
+ − 73 */
+ − 74
+ − 75 var $user_extra;
+ − 76
+ − 77 /**
1
+ − 78 * User level of current user
+ − 79 * USER_LEVEL_GUEST: guest
+ − 80 * USER_LEVEL_MEMBER: regular user
+ − 81 * USER_LEVEL_CHPREF: default - pseudo-level that allows changing password and e-mail address (requires re-authentication)
+ − 82 * USER_LEVEL_MOD: moderator
+ − 83 * USER_LEVEL_ADMIN: administrator
+ − 84 * @var int
+ − 85 */
+ − 86
+ − 87 var $user_level;
+ − 88
+ − 89 /**
+ − 90 * High-privilege session key
+ − 91 * @var string or false if not running on high-level authentication
+ − 92 */
+ − 93
+ − 94 var $sid_super;
+ − 95
+ − 96 /**
+ − 97 * The user's theme preference, defaults to $template->default_theme
+ − 98 * @var string
+ − 99 */
+ − 100
+ − 101 var $theme;
+ − 102
+ − 103 /**
+ − 104 * The user's style preference, or style auto-detected based on theme if not logged in
+ − 105 * @var string
+ − 106 */
+ − 107
+ − 108 var $style;
+ − 109
+ − 110 /**
+ − 111 * Signature of current user - appended to comments, etc.
+ − 112 * @var string
+ − 113 */
+ − 114
+ − 115 var $signature;
+ − 116
+ − 117 /**
+ − 118 * UNIX timestamp of when we were registered, or 0 if not logged in
+ − 119 * @var int
+ − 120 */
+ − 121
+ − 122 var $reg_time;
+ − 123
+ − 124 /**
+ − 125 * MD5 hash of the current user's password, if applicable
+ − 126 * @var string OR bool false
+ − 127 */
+ − 128
+ − 129 var $password_hash;
+ − 130
+ − 131 /**
+ − 132 * The number of unread private messages this user has.
+ − 133 * @var int
+ − 134 */
+ − 135
+ − 136 var $unread_pms = 0;
+ − 137
+ − 138 /**
591
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 139 * AES key used to encrypt passwords and session key info.
1
+ − 140 * @var string
591
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 141 * @access private
1
+ − 142 */
+ − 143
591
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 144 protected $private_key;
1
+ − 145
+ − 146 /**
+ − 147 * Regex that defines a valid username, minus the ^ and $, these are added later
+ − 148 * @var string
+ − 149 */
+ − 150
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 151 var $valid_username = '([^<>&\?\'"%\n\r\t\a\/]+)';
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 152
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 153 /**
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 154 * The current user's user title. Defaults to NULL.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 155 * @var string
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 156 */
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 157
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 158 var $user_title = null;
1
+ − 159
+ − 160 /**
+ − 161 * What we're allowed to do as far as permissions go. This changes based on the value of the "auth" URI param.
+ − 162 * @var string
+ − 163 */
+ − 164
436
+ − 165 var $auth_level = 1;
1
+ − 166
+ − 167 /**
+ − 168 * State variable to track if a session timed out
+ − 169 * @var bool
+ − 170 */
+ − 171
+ − 172 var $sw_timed_out = false;
+ − 173
+ − 174 /**
554
+ − 175 * Token appended to some important forms to prevent CSRF.
+ − 176 * @var string
+ − 177 */
+ − 178
+ − 179 var $csrf_token = false;
+ − 180
+ − 181 /**
1
+ − 182 * Switch to track if we're started or not.
+ − 183 * @access private
+ − 184 * @var bool
+ − 185 */
+ − 186
+ − 187 var $started = false;
+ − 188
+ − 189 /**
+ − 190 * Switch to control compatibility mode (for older Enano websites being upgraded)
+ − 191 * @access private
+ − 192 * @var bool
+ − 193 */
+ − 194
+ − 195 var $compat = false;
+ − 196
+ − 197 /**
+ − 198 * Our list of permission types.
+ − 199 * @access private
+ − 200 * @var array
+ − 201 */
+ − 202
+ − 203 var $acl_types = Array();
+ − 204
+ − 205 /**
+ − 206 * The list of descriptions for the permission types
+ − 207 * @var array
+ − 208 */
+ − 209
+ − 210 var $acl_descs = Array();
+ − 211
+ − 212 /**
+ − 213 * A list of dependencies for ACL types.
+ − 214 * @var array
+ − 215 */
+ − 216
+ − 217 var $acl_deps = Array();
+ − 218
+ − 219 /**
246
+ − 220 * Our tell-all list of permissions. Do not even try to change this.
+ − 221 * @access private
1
+ − 222 * @var array
+ − 223 */
+ − 224
+ − 225 var $perms = Array();
+ − 226
+ − 227 /**
+ − 228 * A cache variable - saved after sitewide permissions are checked but before page-specific permissions.
+ − 229 * @var array
+ − 230 * @access private
+ − 231 */
+ − 232
+ − 233 var $acl_base_cache = Array();
+ − 234
+ − 235 /**
+ − 236 * Stores the scope information for ACL types.
+ − 237 * @var array
+ − 238 * @access private
+ − 239 */
+ − 240
+ − 241 var $acl_scope = Array();
+ − 242
+ − 243 /**
+ − 244 * Array to track which default permissions are being used
+ − 245 * @var array
+ − 246 * @access private
+ − 247 */
+ − 248
+ − 249 var $acl_defaults_used = Array();
+ − 250
+ − 251 /**
+ − 252 * Array to track group membership.
+ − 253 * @var array
+ − 254 */
+ − 255
+ − 256 var $groups = Array();
+ − 257
+ − 258 /**
+ − 259 * Associative array to track group modship.
+ − 260 * @var array
+ − 261 */
+ − 262
+ − 263 var $group_mod = Array();
+ − 264
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 265 /**
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 266 * A constant array of user-level-to-rank default associations.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 267 * @var array
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 268 */
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 269
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 270 var $level_rank_table = array(
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 271 USER_LEVEL_ADMIN => RANK_ID_ADMIN,
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 272 USER_LEVEL_MOD => RANK_ID_MOD,
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 273 USER_LEVEL_MEMBER => RANK_ID_MEMBER,
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 274 USER_LEVEL_CHPREF => RANK_ID_MEMBER,
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 275 USER_LEVEL_GUEST => RANK_ID_GUEST
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 276 );
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 277
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 278 /**
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 279 * A constant array that maps precedence constants to language strings
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 280 * @var array
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 281 */
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 282
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 283 var $acl_inherit_lang_table = array(
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 284 ACL_INHERIT_ENANO_DEFAULT => 'acl_inherit_enano_default',
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 285 ACL_INHERIT_GLOBAL_EVERYONE => 'acl_inherit_global_everyone',
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 286 ACL_INHERIT_GLOBAL_GROUP => 'acl_inherit_global_group',
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 287 ACL_INHERIT_GLOBAL_USER => 'acl_inherit_global_user',
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 288 ACL_INHERIT_PG_EVERYONE => 'acl_inherit_pg_everyone',
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 289 ACL_INHERIT_PG_GROUP => 'acl_inherit_pg_group',
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 290 ACL_INHERIT_PG_USER => 'acl_inherit_pg_user',
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 291 ACL_INHERIT_LOCAL_EVERYONE => 'acl_inherit_local_everyone',
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 292 ACL_INHERIT_LOCAL_GROUP => 'acl_inherit_local_group',
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 293 ACL_INHERIT_LOCAL_USER => 'acl_inherit_local_user'
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 294 );
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 295
1
+ − 296 # Basic functions
+ − 297
+ − 298 /**
+ − 299 * Constructor.
+ − 300 */
+ − 301
+ − 302 function __construct()
+ − 303 {
+ − 304 global $db, $session, $paths, $template, $plugins; // Common objects
268
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 305
289
2b60c89dc27f
Fixed a few major bugs with the upgrade script and the config file not getting loaded properly due to IN_ENANO_INSTALL
Dan
diff
changeset
+ − 306 if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') )
268
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 307 {
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 308 @include(ENANO_ROOT.'/config.new.php');
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 309 }
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 310 else
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 311 {
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 312 @include(ENANO_ROOT.'/config.php');
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 313 }
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 314
1
+ − 315 unset($dbhost, $dbname, $dbuser, $dbpasswd);
+ − 316 if(isset($crypto_key))
+ − 317 {
+ − 318 $this->private_key = $crypto_key;
+ − 319 $this->private_key = hexdecode($this->private_key);
+ − 320 }
+ − 321 else
+ − 322 {
+ − 323 if(is_writable(ENANO_ROOT.'/config.php'))
+ − 324 {
+ − 325 // Generate and stash a private key
+ − 326 // This should only happen during an automated silent gradual migration to the new encryption platform.
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 327 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 328 $this->private_key = $aes->gen_readymade_key();
+ − 329
+ − 330 $config = file_get_contents(ENANO_ROOT.'/config.php');
+ − 331 if(!$config)
+ − 332 {
+ − 333 die('$session->__construct(): can\'t get the contents of config.php');
+ − 334 }
+ − 335
+ − 336 $config = str_replace("?>", "\$crypto_key = '{$this->private_key}';\n?>", $config);
+ − 337 // And while we're at it...
+ − 338 $config = str_replace('MIDGET_INSTALLED', 'ENANO_INSTALLED', $config);
+ − 339 $fh = @fopen(ENANO_ROOT.'/config.php', 'w');
+ − 340 if ( !$fh )
+ − 341 {
+ − 342 die('$session->__construct(): Couldn\'t open config file for writing to store the private key, I tried to avoid something like this...');
+ − 343 }
+ − 344
+ − 345 fwrite($fh, $config);
+ − 346 fclose($fh);
+ − 347 }
+ − 348 else
+ − 349 {
+ − 350 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>');
+ − 351 }
+ − 352 }
+ − 353 // Check for compatibility mode
+ − 354 if(defined('IN_ENANO_INSTALL'))
+ − 355 {
+ − 356 $q = $db->sql_query('SELECT old_encryption FROM '.table_prefix.'users LIMIT 1;');
+ − 357 if(!$q)
+ − 358 {
+ − 359 $error = mysql_error();
+ − 360 if(strstr($error, "Unknown column 'old_encryption'"))
+ − 361 $this->compat = true;
+ − 362 else
+ − 363 $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)');
+ − 364 }
+ − 365 $db->free_result();
+ − 366 }
+ − 367 }
+ − 368
+ − 369 /**
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 370 * PHP 4 compatible constructor. Deprecated in 1.1.x.
1
+ − 371 */
+ − 372
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 373 /*
1
+ − 374 function sessionManager()
+ − 375 {
+ − 376 $this->__construct();
+ − 377 }
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 378 */
1
+ − 379
+ − 380 /**
+ − 381 * Wrapper function to sanitize strings for MySQL and HTML
+ − 382 * @param string $text The text to sanitize
+ − 383 * @return string
+ − 384 */
+ − 385
+ − 386 function prepare_text($text)
+ − 387 {
+ − 388 global $db;
+ − 389 return $db->escape(htmlspecialchars($text));
+ − 390 }
+ − 391
+ − 392 /**
+ − 393 * Makes a SQL query and handles error checking
+ − 394 * @param string $query The SQL query to make
+ − 395 * @return resource
+ − 396 */
+ − 397
+ − 398 function sql($query)
+ − 399 {
+ − 400 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 401 $result = $db->sql_query($query);
+ − 402 if(!$result)
+ − 403 {
+ − 404 $db->_die('The error seems to have occurred somewhere in the session management code.');
+ − 405 }
+ − 406 return $result;
+ − 407 }
+ − 408
+ − 409 # Session restoration and permissions
+ − 410
+ − 411 /**
+ − 412 * Initializes the basic state of things, including most user prefs, login data, cookie stuff
+ − 413 */
+ − 414
+ − 415 function start()
+ − 416 {
+ − 417 global $db, $session, $paths, $template, $plugins; // Common objects
209
+ − 418 global $lang;
406
+ − 419 global $timezone;
1
+ − 420 if($this->started) return;
+ − 421 $this->started = true;
+ − 422 $user = false;
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
diff
changeset
+ − 423 if ( isset($_COOKIE['sid']) )
1
+ − 424 {
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
diff
changeset
+ − 425 if ( $this->compat )
1
+ − 426 {
+ − 427 $userdata = $this->compat_validate_session($_COOKIE['sid']);
+ − 428 }
+ − 429 else
+ − 430 {
+ − 431 $userdata = $this->validate_session($_COOKIE['sid']);
+ − 432 }
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
diff
changeset
+ − 433 if ( is_array($userdata) )
1
+ − 434 {
+ − 435 $data = RenderMan::strToPageID($paths->get_pageid_from_url());
+ − 436
+ − 437 if(!$this->compat && $userdata['account_active'] != 1 && $data[1] != 'Special' && $data[1] != 'Admin')
+ − 438 {
603
+ − 439 $this->show_inactive_error($userdata);
1
+ − 440 }
+ − 441
+ − 442 $this->sid = $_COOKIE['sid'];
+ − 443 $this->user_logged_in = true;
+ − 444 $this->user_id = intval($userdata['user_id']);
+ − 445 $this->username = $userdata['username'];
+ − 446 $this->password_hash = $userdata['password'];
+ − 447 $this->user_level = intval($userdata['user_level']);
+ − 448 $this->real_name = $userdata['real_name'];
+ − 449 $this->email = $userdata['email'];
+ − 450 $this->unread_pms = $userdata['num_pms'];
568
+ − 451 $this->user_title = ( isset($userdata['user_title']) ) ? $userdata['user_title'] : null;
1
+ − 452 if(!$this->compat)
+ − 453 {
+ − 454 $this->theme = $userdata['theme'];
+ − 455 $this->style = $userdata['style'];
+ − 456 $this->signature = $userdata['signature'];
+ − 457 $this->reg_time = $userdata['reg_time'];
+ − 458 }
436
+ − 459 $this->auth_level = USER_LEVEL_MEMBER;
554
+ − 460 // generate an anti-CSRF token
+ − 461 $this->csrf_token = sha1($this->username . $this->sid . $this->user_id);
1
+ − 462 if(!isset($template->named_theme_list[$this->theme]))
+ − 463 {
+ − 464 if($this->compat || !is_object($template))
+ − 465 {
+ − 466 $this->theme = 'oxygen';
+ − 467 $this->style = 'bleu';
+ − 468 }
+ − 469 else
+ − 470 {
+ − 471 $this->theme = $template->default_theme;
+ − 472 $this->style = $template->default_style;
+ − 473 }
+ − 474 }
+ − 475 $user = true;
711
+ − 476
+ − 477 // set timezone params
406
+ − 478 $GLOBALS['timezone'] = $userdata['user_timezone'];
711
+ − 479 $GLOBALS['dst_params'] = explode(';', $userdata['user_dst']);
+ − 480 foreach ( $GLOBALS['dst_params'] as &$parm )
+ − 481 {
+ − 482 if ( substr($parm, -1) != 'd' )
+ − 483 $parm = intval($parm);
+ − 484 }
1
+ − 485
209
+ − 486 // Set language
+ − 487 if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ − 488 {
+ − 489 $lang_id = intval($userdata['user_lang']);
+ − 490 $lang = new Language($lang_id);
406
+ − 491 @setlocale(LC_ALL, $lang->lang_code);
209
+ − 492 }
1
+ − 493
+ − 494 if(isset($_REQUEST['auth']) && !$this->sid_super)
+ − 495 {
+ − 496 // Now he thinks he's a moderator. Or maybe even an administrator. Let's find out if he's telling the truth.
+ − 497 if($this->compat)
+ − 498 {
+ − 499 $key = $_REQUEST['auth'];
+ − 500 $super = $this->compat_validate_session($key);
+ − 501 }
+ − 502 else
+ − 503 {
+ − 504 $key = strrev($_REQUEST['auth']);
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 505 if ( !empty($key) && ( strlen($key) / 2 ) % 4 == 0 )
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 506 {
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 507 $super = $this->validate_session($key);
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 508 }
1
+ − 509 }
518
+ − 510 if(is_array(@$super))
1
+ − 511 {
+ − 512 $this->auth_level = intval($super['auth_level']);
+ − 513 $this->sid_super = $_REQUEST['auth'];
+ − 514 }
+ − 515 }
+ − 516 }
+ − 517 }
+ − 518 if(!$user)
+ − 519 {
+ − 520 //exit;
+ − 521 $this->register_guest_session();
+ − 522 }
+ − 523 if(!$this->compat)
+ − 524 {
+ − 525 // init groups
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 526 $q = $this->sql('SELECT g.group_name,g.group_id,m.is_mod FROM '.table_prefix.'groups AS g' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 527 . ' LEFT JOIN '.table_prefix.'group_members AS m' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 528 . ' ON g.group_id=m.group_id' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 529 . ' WHERE ( m.user_id='.$this->user_id.'' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 530 . ' OR g.group_name=\'Everyone\')' . "\n"
592
+ − 531 . ' ' . ( /* quick hack for upgrade compatibility reasons */ enano_version() == '1.0RC1' ? '' : 'AND ( m.pending != 1 OR m.pending IS NULL )' ) . '' . "\n"
+ − 532 . ' ORDER BY group_id ASC;'); // The ORDER BY is to make sure "Everyone" comes first so the permissions can be overridden
1
+ − 533 if($row = $db->fetchrow())
+ − 534 {
+ − 535 do {
+ − 536 $this->groups[$row['group_id']] = $row['group_name'];
+ − 537 $this->group_mod[$row['group_id']] = ( intval($row['is_mod']) == 1 );
+ − 538 } while($row = $db->fetchrow());
+ − 539 }
+ − 540 else
+ − 541 {
+ − 542 die('No group info');
+ − 543 }
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
diff
changeset
+ − 544 profiler_log('Fetched group memberships');
1
+ − 545 }
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 546
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 547 // make sure we aren't banned
1
+ − 548 $this->check_banlist();
+ − 549
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 550 // Printable page view? Probably the wrong place to control
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 551 // it but $template is pretty dumb, it will just about always
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 552 // do what you ask it to do, which isn't always what we want
1
+ − 553 if ( isset ( $_GET['printable'] ) )
+ − 554 {
+ − 555 $this->theme = 'printable';
+ − 556 $this->style = 'default';
+ − 557 }
+ − 558
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 559 // setup theme ACLs
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 560 $template->process_theme_acls();
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 561
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
diff
changeset
+ − 562 profiler_log('Sessions started. Banlist and theme ACLs initialized');
1
+ − 563 }
+ − 564
+ − 565 # Logins
+ − 566
+ − 567 /**
+ − 568 * Attempts to perform a login using crypto functions
+ − 569 * @param string $username The username
+ − 570 * @param string $aes_data The encrypted password, hex-encoded
+ − 571 * @param string $aes_key The MD5 hash of the encryption key, hex-encoded
+ − 572 * @param string $challenge The 256-bit MD5 challenge string - first 128 bits should be the hash, the last 128 should be the challenge salt
+ − 573 * @param int $level The privilege level we're authenticating for, defaults to 0
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 574 * @param string $captcha_hash Optional. If we're locked out and the lockout policy is captcha, this should be the identifier for the code.
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 575 * @param string $captcha_code Optional. If we're locked out and the lockout policy is captcha, this should be the code the user entered.
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 576 * @param bool $remember Optional. If true, remembers the session for X days. Otherwise, assigns a short session. Defaults to false.
436
+ − 577 * @param bool $lookup_key Optional. If true (default) this queries the database for the "real" encryption key. Else, uses what is given.
1
+ − 578 * @return string 'success' on success, or error string on failure
+ − 579 */
+ − 580
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 581 function login_with_crypto($username, $aes_data, $aes_key_id, $challenge, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false, $remember = false, $lookup_key = true)
1
+ − 582 {
+ − 583 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 584
+ − 585 // Instanciate the Rijndael encryption object
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 586 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 587
+ − 588 // Fetch our decryption key
+ − 589
436
+ − 590 if ( $lookup_key )
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 591 {
436
+ − 592 $aes_key = $this->fetch_public_key($aes_key_id);
+ − 593 if ( !$aes_key )
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 594 {
436
+ − 595 // It could be that our key cache is full. If it seems larger than 65KB, clear it
+ − 596 if ( strlen(getConfig('login_key_cache')) > 65000 )
+ − 597 {
+ − 598 setConfig('login_key_cache', '');
+ − 599 return array(
+ − 600 'success' => false,
+ − 601 'error' => 'key_not_found_cleared',
+ − 602 );
+ − 603 }
304
+ − 604 return array(
+ − 605 'success' => false,
436
+ − 606 'error' => 'key_not_found'
304
+ − 607 );
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 608 }
436
+ − 609 }
+ − 610 else
+ − 611 {
+ − 612 $aes_key =& $aes_key_id;
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 613 }
1
+ − 614
+ − 615 // Convert the key to a binary string
+ − 616 $bin_key = hexdecode($aes_key);
+ − 617
+ − 618 if(strlen($bin_key) != AES_BITS / 8)
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 619 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 620 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 621 'error' => 'key_wrong_length'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 622 );
1
+ − 623
+ − 624 // Decrypt our password
+ − 625 $password = $aes->decrypt($aes_data, $bin_key, ENC_HEX);
+ − 626
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 627 // Let the LoginAPI do the rest.
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 628 return $this->login_without_crypto($username, $password, false, $level, $captcha_hash, $captcha_code, $remember);
1
+ − 629 }
+ − 630
+ − 631 /**
+ − 632 * Attempts to login without using crypto stuff, mainly for use when the other side doesn't like Javascript
+ − 633 * 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
+ − 634 * Technically it still uses crypto, but it only decrypts the password already stored, which is (obviously) required for authentication
+ − 635 * @param string $username The username
+ − 636 * @param string $password The password -OR- the MD5 hash of the password if $already_md5ed is true
+ − 637 * @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.
+ − 638 * @param int $level The privilege level we're authenticating for, defaults to 0
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 639 * @param string $captcha_hash Optional. If we're locked out and the lockout policy is captcha, this should be the identifier for the code.
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 640 * @param string $captcha_code Optional. If we're locked out and the lockout policy is captcha, this should be the code the user entered.
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 641 * @param bool $remember Optional. If true, remembers the session for X days. Otherwise, assigns a short session. Defaults to false.
1
+ − 642 */
+ − 643
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 644 function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false, $remember = false)
1
+ − 645 {
+ − 646 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 647
+ − 648 $pass_hashed = ( $already_md5ed ) ? $password : md5($password);
+ − 649
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 650 // Replace underscores with spaces in username
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 651 // (Added in 1.0.2)
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 652 $username = str_replace('_', ' ', $username);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 653
1
+ − 654 // Perhaps we're upgrading Enano?
+ − 655 if($this->compat)
+ − 656 {
+ − 657 return $this->login_compat($username, $pass_hashed, $level);
+ − 658 }
+ − 659
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 660 if ( !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 661 {
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 662 // Lockout stuff
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 663 $threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 664 $duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 665 // convert to minutes
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 666 $duration = $duration * 60;
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 667 $policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
436
+ − 668
+ − 669 $timestamp_cutoff = time() - $duration;
+ − 670 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
+ − 671 $q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
+ − 672 $fails = $db->numrows();
+ − 673
+ − 674 $captcha_good = false;
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 675 if ( $policy == 'captcha' && $captcha_hash && $captcha_code )
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 676 {
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 677 // policy is captcha -- check if it's correct, and if so, bypass lockout check
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 678 $real_code = $this->get_captcha($captcha_hash);
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 679 if ( strtolower($real_code) === strtolower($captcha_code) )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 680 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 681 $captcha_good = true;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 682 }
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 683 }
436
+ − 684 if ( $policy != 'disable' && !$captcha_good )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 685 {
436
+ − 686 if ( $fails >= $threshold )
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 687 {
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 688 // ooh boy, somebody's in trouble ;-)
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 689 $row = $db->fetchrow();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 690 $db->free_result();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 691 return array(
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 692 'success' => false,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 693 'error' => 'locked_out',
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 694 'lockout_threshold' => $threshold,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 695 'lockout_duration' => ( $duration / 60 ),
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 696 'lockout_fails' => $fails,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 697 'lockout_policy' => $policy,
436
+ − 698 'time_rem' => ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ),
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 699 'lockout_last_time' => $row['timestamp']
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 700 );
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 701 }
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 702 }
436
+ − 703 $db->free_result();
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 704 }
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 705
1
+ − 706 // Instanciate the Rijndael encryption object
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 707 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 708
+ − 709 // Initialize our success switch
+ − 710 $success = false;
+ − 711
+ − 712 // Retrieve the real password from the database
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 713 $this->sql('SELECT password,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=\''.$this->prepare_text(strtolower($username)).'\';');
1
+ − 714 if($db->numrows() < 1)
188
+ − 715 {
+ − 716 // This wasn't logged in <1.0.2, dunno how it slipped through
+ − 717 if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 718 $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().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
188
+ − 719 else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 720 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 721
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 722 // Do we also need to increment the lockout countdown?
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 723 if ( @$policy != 'disable' && !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 724 {
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 725 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 726 // increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 727 $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 728 $fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 729 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 730 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 731 'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 732 'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 733 'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 734 'lockout_fails' => $fails,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 735 'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 736 );
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 737 }
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 738
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 739 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 740 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 741 'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 742 );
188
+ − 743 }
1
+ − 744 $row = $db->fetchrow();
+ − 745
+ − 746 // Check to see if we're logging in using a temporary password
+ − 747
+ − 748 if((intval($row['temp_password_time']) + 3600*24) > time() )
+ − 749 {
+ − 750 $temp_pass = $aes->decrypt( $row['temp_password'], $this->private_key, ENC_HEX );
+ − 751 if( md5($temp_pass) == $pass_hashed )
+ − 752 {
+ − 753 $code = $plugins->setHook('login_password_reset');
+ − 754 foreach ( $code as $cmd )
+ − 755 {
+ − 756 eval($cmd);
+ − 757 }
+ − 758
521
d264784355e5
Implemented the password-reset redirect _properly_ instead of the hackish direct header() call in sessions.php
Dan
diff
changeset
+ − 759 return array(
d264784355e5
Implemented the password-reset redirect _properly_ instead of the hackish direct header() call in sessions.php
Dan
diff
changeset
+ − 760 'success' => false,
d264784355e5
Implemented the password-reset redirect _properly_ instead of the hackish direct header() call in sessions.php
Dan
diff
changeset
+ − 761 'error' => 'valid_reset',
d264784355e5
Implemented the password-reset redirect _properly_ instead of the hackish direct header() call in sessions.php
Dan
diff
changeset
+ − 762 'redirect_url' => makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $row['temp_password'])
d264784355e5
Implemented the password-reset redirect _properly_ instead of the hackish direct header() call in sessions.php
Dan
diff
changeset
+ − 763 );
1
+ − 764 }
+ − 765 }
+ − 766
+ − 767 if($row['old_encryption'] == 1)
+ − 768 {
+ − 769 // The user's password is stored using the obsolete and insecure MD5 algorithm - we'll update the field with the new password
+ − 770 if($pass_hashed == $row['password'] && !$already_md5ed)
+ − 771 {
+ − 772 $pass_stashed = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 773 $this->sql('UPDATE '.table_prefix.'users SET password=\''.$pass_stashed.'\',old_encryption=0 WHERE user_id='.$row['user_id'].';');
+ − 774 $success = true;
+ − 775 }
+ − 776 elseif($pass_hashed == $row['password'] && $already_md5ed)
+ − 777 {
+ − 778 // We don't have the real password so don't bother with encrypting it, just call it success and get out of here
+ − 779 $success = true;
+ − 780 }
+ − 781 }
+ − 782 else
+ − 783 {
+ − 784 // 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
+ − 785 $real_pass = $aes->decrypt($row['password'], $this->private_key);
+ − 786 if($pass_hashed == md5($real_pass))
+ − 787 {
+ − 788 $success = true;
+ − 789 }
+ − 790 }
+ − 791 if($success)
+ − 792 {
+ − 793 if((int)$level > (int)$row['user_level'])
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 794 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 795 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 796 'error' => 'too_big_for_britches'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 797 );
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 798 $sess = $this->register_session(intval($row['user_id']), $username, $real_pass, $level, $remember);
1
+ − 799 if($sess)
+ − 800 {
+ − 801 if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 802 $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().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 803 else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 804 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 805
+ − 806 $code = $plugins->setHook('login_success');
+ − 807 foreach ( $code as $cmd )
+ − 808 {
+ − 809 eval($cmd);
+ − 810 }
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
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 812 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 813 'success' => true
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 814 );
1
+ − 815 }
+ − 816 else
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 817 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 818 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 819 'error' => 'backend_fail'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 820 );
1
+ − 821 }
+ − 822 else
+ − 823 {
+ − 824 if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 825 $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().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 826 else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 827 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 828
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 829 // Do we also need to increment the lockout countdown?
568
+ − 830 if ( !defined('IN_ENANO_INSTALL') && $policy != 'disable' )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 831 {
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 832 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 833 // increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 834 $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 835 $fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 836 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 837 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 838 'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 839 'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 840 'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 841 'lockout_fails' => $fails,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 842 'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 843 );
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 844 }
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 845
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 846 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 847 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 848 'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 849 );
1
+ − 850 }
+ − 851 }
+ − 852
+ − 853 /**
554
+ − 854 * Attempts to log in using the old table structure and algorithm. This is for upgrades from old 1.0.x releases.
1
+ − 855 * @param string $username
+ − 856 * @param string $password This should be an MD5 hash
+ − 857 * @return string 'success' if successful, or error message on failure
+ − 858 */
+ − 859
+ − 860 function login_compat($username, $password, $level = 0)
+ − 861 {
+ − 862 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 863 $pass_hashed =& $password;
+ − 864 $this->sql('SELECT password,user_id,user_level FROM '.table_prefix.'users WHERE username=\''.$this->prepare_text($username).'\';');
+ − 865 if($db->numrows() < 1)
+ − 866 return 'The username and/or password is incorrect.';
+ − 867 $row = $db->fetchrow();
+ − 868 if($row['password'] == $password)
+ − 869 {
+ − 870 if((int)$level > (int)$row['user_level'])
+ − 871 return 'You are not authorized for this level of access.';
+ − 872 $sess = $this->register_session_compat(intval($row['user_id']), $username, $password, $level);
+ − 873 if($sess)
+ − 874 return 'success';
+ − 875 else
+ − 876 return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.';
+ − 877 }
+ − 878 else
+ − 879 {
+ − 880 return 'The username and/or password is incorrect.';
+ − 881 }
+ − 882 }
+ − 883
+ − 884 /**
+ − 885 * Registers a session key in the database. This function *ASSUMES* that the username and password have already been validated!
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 886 * Basically the session key is a hex-encoded cookie (encrypted with the site's private key) that says "u=[username];p=[sha1 of password];s=[unique key id]"
1
+ − 887 * @param int $user_id
+ − 888 * @param string $username
+ − 889 * @param string $password
+ − 890 * @param int $level The level of access to grant, defaults to USER_LEVEL_MEMBER
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 891 * @param bool $remember Whether the session should be long-term (true) or not (false). Defaults to short-term.
1
+ − 892 * @return bool
+ − 893 */
+ − 894
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 895 function register_session($user_id, $username, $password, $level = USER_LEVEL_MEMBER, $remember = false)
1
+ − 896 {
697
+ − 897 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 898
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
+ − 899 // Random key identifier
1
+ − 900 $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
+ − 901
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
+ − 902 // SHA1 hash of password, stored in the key
1
+ − 903 $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
+ − 904
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
+ − 905 // Unencrypted session key
1
+ − 906 $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
+ − 907
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 908 // Type of key
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 909 $key_type = ( $level > USER_LEVEL_MEMBER ) ? SK_ELEV : ( $remember ? SK_LONG : SK_SHORT );
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 910
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
+ − 911 // Encrypt the key
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 912 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 913 $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
+ − 914
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
+ − 915 // If we're registering an elevated-privilege key, it needs to be on GET
1
+ − 916 if($level > USER_LEVEL_MEMBER)
+ − 917 {
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
+ − 918 // Reverse it - cosmetic only ;-)
1
+ − 919 $hexkey = strrev($session_key);
+ − 920 $this->sid_super = $hexkey;
+ − 921 $_GET['auth'] = $hexkey;
+ − 922 }
+ − 923 else
+ − 924 {
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
+ − 925 // 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
+ − 926 // For now, make the cookie last forever, we can change this in 1.1.x
542
5841df0ab575
Added ETag support and increased caching settings to try and speed the system up. Result of a YSlow audit.
Dan
diff
changeset
+ − 927 setcookie( 'sid', $session_key, time()+15552000, scriptPath.'/', null, ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ) );
1
+ − 928 $_COOKIE['sid'] = $session_key;
+ − 929 }
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
+ − 930 // $keyhash is stored in the database, this is for compatibility with the older DB structure
1
+ − 931 $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
+ − 932 // Record the user's IP
466
+ − 933 $ip = $_SERVER['REMOTE_ADDR'];
+ − 934 if(!is_valid_ip($ip))
1
+ − 935 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
+ − 936 // The time needs to be stashed to enforce the 15-minute limit on elevated session keys
1
+ − 937 $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
+ − 938
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
+ − 939 // Sanity check
1
+ − 940 if(!is_int($user_id))
+ − 941 die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 942 if(!is_int($level))
+ − 943 die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 944
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
+ − 945 // All done!
697
+ − 946 $query = $db->sql_query('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time, key_type) VALUES(\''.$keyhash.'\', \''.$salt.'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.', ' . $key_type . ');');
+ − 947 if ( !$query && defined('IN_ENANO_UPGRADE') )
+ − 948 // we're trying to upgrade so the key_type column is probably missing - try it again without specifying the key type
+ − 949 $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.');');
+ − 950
1
+ − 951 return true;
+ − 952 }
+ − 953
+ − 954 /**
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 955 * Identical to register_session in nature, but uses the old login/table structure. DO NOT use this except in the upgrade script under very controlled circumstances.
1
+ − 956 * @see sessionManager::register_session()
+ − 957 * @access private
+ − 958 */
+ − 959
+ − 960 function register_session_compat($user_id, $username, $password, $level = 0)
+ − 961 {
+ − 962 $salt = md5(microtime() . mt_rand());
+ − 963 $thekey = md5($password . $salt);
+ − 964 if($level > 0)
+ − 965 {
+ − 966 $this->sid_super = $thekey;
+ − 967 }
+ − 968 else
+ − 969 {
+ − 970 setcookie( 'sid', $thekey, time()+315360000, scriptPath.'/' );
+ − 971 $_COOKIE['sid'] = $thekey;
+ − 972 }
+ − 973 $ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 974 if(!$ip)
+ − 975 die('$session->register_session: Remote-Addr was spoofed');
+ − 976 $time = time();
+ − 977 if(!is_int($user_id))
+ − 978 die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 979 if(!is_int($level))
+ − 980 die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 981 $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.');');
+ − 982 return true;
+ − 983 }
+ − 984
+ − 985 /**
+ − 986 * Creates/restores a guest session
+ − 987 * @todo implement real session management for guests
+ − 988 */
+ − 989
+ − 990 function register_guest_session()
+ − 991 {
+ − 992 global $db, $session, $paths, $template, $plugins; // Common objects
209
+ − 993 global $lang;
1
+ − 994 $this->username = $_SERVER['REMOTE_ADDR'];
+ − 995 $this->user_level = USER_LEVEL_GUEST;
+ − 996 if($this->compat || defined('IN_ENANO_INSTALL'))
+ − 997 {
+ − 998 $this->theme = 'oxygen';
+ − 999 $this->style = 'bleu';
+ − 1000 }
+ − 1001 else
+ − 1002 {
+ − 1003 $this->theme = ( isset($_GET['theme']) && isset($template->named_theme_list[$_GET['theme']])) ? $_GET['theme'] : $template->default_theme;
466
+ − 1004 $this->style = ( isset($_GET['style']) && file_exists(ENANO_ROOT.'/themes/'.$this->theme . '/css/'.$_GET['style'].'.css' )) ? $_GET['style'] : preg_replace('/\.css$/', '', $template->named_theme_list[$this->theme]['default_style']);
1
+ − 1005 }
+ − 1006 $this->user_id = 1;
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 1007 // This is a VERY special case we are allowing. It lets the installer create languages using the Enano API.
209
+ − 1008 if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ − 1009 {
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 1010 $language = ( isset($_GET['lang']) && preg_match('/^[a-z0-9_]+$/', @$_GET['lang']) ) ? $_GET['lang'] : intval(getConfig('default_language'));
209
+ − 1011 $lang = new Language($language);
406
+ − 1012 @setlocale(LC_ALL, $lang->lang_code);
209
+ − 1013 }
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
diff
changeset
+ − 1014 // make a CSRF token
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
diff
changeset
+ − 1015 $this->csrf_token = sha1($_SERVER['REMOTE_ADDR'] . sha1($this->private_key));
1
+ − 1016 }
+ − 1017
+ − 1018 /**
+ − 1019 * Validates a session key, and returns the userdata associated with the key or false
+ − 1020 * @param string $key The session key to validate
+ − 1021 * @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.
+ − 1022 */
+ − 1023
+ − 1024 function validate_session($key)
+ − 1025 {
+ − 1026 global $db, $session, $paths, $template, $plugins; // Common objects
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1027 profiler_log("SessionManager: checking session: " . sha1($key));
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1028 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1029 $decrypted_key = $aes->decrypt($key, $this->private_key, ENC_HEX);
+ − 1030
+ − 1031 if ( !$decrypted_key )
+ − 1032 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1033 // die_semicritical('AES encryption error', '<p>Something went wrong during the AES decryption process.</p><pre>'.print_r($decrypted_key, true).'</pre>');
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1034 return false;
1
+ − 1035 }
+ − 1036
+ − 1037 $n = preg_match('/^u='.$this->valid_username.';p=([A-Fa-f0-9]+?);s=([A-Fa-f0-9]+?)$/', $decrypted_key, $keydata);
+ − 1038 if($n < 1)
+ − 1039 {
+ − 1040 // echo '(debug) $session->validate_session: Key does not match regex<br />Decrypted key: '.$decrypted_key;
+ − 1041 return false;
+ − 1042 }
+ − 1043 $keyhash = md5($key);
+ − 1044 $salt = $db->escape($keydata[3]);
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
diff
changeset
+ − 1045 profiler_log("SessionManager: checking session: " . sha1($key) . ": decrypted session key to $decrypted_key");
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1046 // using a normal call to $db->sql_query to avoid failing on errors here
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1047 $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,' . "\n"
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1048 . ' u.reg_time,u.account_active,u.activation_key,u.user_lang,u.user_title,k.source_ip,k.time,k.auth_level,k.key_type,COUNT(p.message_id) AS num_pms,' . "\n"
711
+ − 1049 . ' u.user_timezone, u.user_dst, x.* FROM '.table_prefix.'session_keys AS k' . "\n"
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1050 . ' LEFT JOIN '.table_prefix.'users AS u' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1051 . ' ON ( u.user_id=k.user_id )' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1052 . ' LEFT JOIN '.table_prefix.'users_extra AS x' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1053 . ' ON ( u.user_id=x.user_id OR x.user_id IS NULL )' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1054 . ' LEFT JOIN '.table_prefix.'privmsgs AS p' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1055 . ' ON ( p.message_to=u.username AND p.message_read=0 )' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1056 . ' WHERE k.session_key=\''.$keyhash.'\'' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1057 . ' AND k.salt=\''.$salt.'\'' . "\n"
618
+ − 1058 . ' GROUP BY u.user_id,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,u.user_lang,u.user_timezone,u.user_title,k.source_ip,k.time,k.auth_level,x.user_id, x.user_aim, x.user_yahoo, x.user_msn, x.user_xmpp, x.user_homepage, x.user_location, x.user_job, x.user_hobbies, x.email_public, x.disable_js_fx;');
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1059
603
+ − 1060 if ( !$query && ( defined('IN_ENANO_INSTALL') or defined('IN_ENANO_UPGRADE') ) )
18
+ − 1061 {
711
+ − 1062 $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, 1440 AS user_timezone, \'0;0;0;0;60\' AS user_dst, ' . SK_SHORT . ' AS key_type FROM '.table_prefix.'session_keys AS k
18
+ − 1063 LEFT JOIN '.table_prefix.'users AS u
+ − 1064 ON ( u.user_id=k.user_id )
+ − 1065 LEFT JOIN '.table_prefix.'privmsgs AS p
+ − 1066 ON ( p.message_to=u.username AND p.message_read=0 )
+ − 1067 WHERE k.session_key=\''.$keyhash.'\'
+ − 1068 AND k.salt=\''.$salt.'\'
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1069 GROUP BY u.user_id,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;');
18
+ − 1070 }
603
+ − 1071 else if ( !$query )
+ − 1072 {
+ − 1073 $db->_die();
+ − 1074 }
1
+ − 1075 if($db->numrows() < 1)
+ − 1076 {
+ − 1077 // echo '(debug) $session->validate_session: Key was not found in database<br />';
+ − 1078 return false;
+ − 1079 }
+ − 1080 $row = $db->fetchrow();
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
diff
changeset
+ − 1081 profiler_log("SessionManager: checking session: " . sha1($key) . ": selected and fetched results");
1
+ − 1082 $row['user_id'] =& $row['uid'];
466
+ − 1083 $ip = $_SERVER['REMOTE_ADDR'];
1
+ − 1084 if($row['auth_level'] > $row['user_level'])
+ − 1085 {
+ − 1086 // Failed authorization check
+ − 1087 // echo '(debug) $session->validate_session: access to this auth level denied<br />';
+ − 1088 return false;
+ − 1089 }
+ − 1090 if($ip != $row['source_ip'])
+ − 1091 {
484
+ − 1092 // Special exception for 1.1.x upgrade - the 1.1.3 upgrade changes the size of the column and this is what validate_session
+ − 1093 // expects, but if the column size hasn't changed yet just check the first 10 digits of the IP.
+ − 1094 $fail = true;
+ − 1095 if ( defined('IN_ENANO_UPGRADE') )
+ − 1096 {
568
+ − 1097 if ( substr($ip, 0, 10) == substr($row['source_ip'], 0, 10) )
484
+ − 1098 $fail = false;
+ − 1099 }
1
+ − 1100 // Failed IP address check
+ − 1101 // echo '(debug) $session->validate_session: IP address mismatch<br />';
484
+ − 1102 if ( $fail )
+ − 1103 return false;
1
+ − 1104 }
+ − 1105
+ − 1106 // Do the password validation
+ − 1107 $real_pass = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 1108
+ − 1109 //die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1110 if(sha1($real_pass) != $keydata[2])
+ − 1111 {
+ − 1112 // Failed password check
+ − 1113 // 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];
+ − 1114 return false;
+ − 1115 }
+ − 1116
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1117 // timestamp check
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1118 switch ( $row['key_type'] )
1
+ − 1119 {
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1120 case SK_SHORT:
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1121 $time_now = time();
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1122 $time_key = $row['time'] + ( 60 * intval(getConfig('session_short', '720')) );
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1123 if ( $time_now > $time_key )
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1124 {
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1125 // Session timed out
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1126 return false;
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1127 }
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1128 break;
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1129 case SK_LONG:
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1130 if ( intval(getConfig('session_remember_time', '0')) === 0 )
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1131 {
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1132 // sessions last infinitely, timestamp validation is therefore successful
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1133 break;
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1134 }
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1135 $time_now = time();
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1136 $time_key = $row['time'] + ( 86400 * intval(getConfig('session_remember_time', '30')) );
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1137 if ( $time_now > $time_key )
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1138 {
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1139 // Session timed out
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1140 return false;
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1141 }
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1142 break;
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1143 case SK_ELEV:
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1144 $time_now = time();
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1145 $time_key = $row['time'] + 900;
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1146 if($time_now > $time_key && $row['auth_level'] > USER_LEVEL_MEMBER)
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1147 {
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1148 // Session timed out
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1149 // echo '(debug) $session->validate_session: super session timed out<br />';
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1150 $this->sw_timed_out = true;
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1151 return false;
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1152 }
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1153 break;
1
+ − 1154 }
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1155
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1156 // If this is an elevated-access or short-term session key, update the time
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 1157 if( $row['key_type'] == SK_ELEV || $row['key_type'] == SK_SHORT )
1
+ − 1158 {
+ − 1159 $this->sql('UPDATE '.table_prefix.'session_keys SET time='.time().' WHERE session_key=\''.$keyhash.'\';');
+ − 1160 }
+ − 1161
31
+ − 1162 $user_extra = array();
555
ac4c6a7f01d8
Added user preference for disabling visual effects in Javascript applets; added re-import button to installed plugins
Dan
diff
changeset
+ − 1163 foreach ( array('user_aim', 'user_yahoo', 'user_msn', 'user_xmpp', 'user_homepage', 'user_location', 'user_job', 'user_hobbies', 'email_public', 'disable_js_fx') as $column )
31
+ − 1164 {
375
8d0e3a5a6990
[minor] Trying to be a little more careful with values from users_extra in validate_session()
Dan
diff
changeset
+ − 1165 if ( isset($row[$column]) )
8d0e3a5a6990
[minor] Trying to be a little more careful with values from users_extra in validate_session()
Dan
diff
changeset
+ − 1166 $user_extra[$column] = $row[$column];
31
+ − 1167 }
+ − 1168
+ − 1169 $this->user_extra = $user_extra;
+ − 1170 // Leave the rest to PHP's automatic garbage collector ;-)
+ − 1171
1
+ − 1172 $row['password'] = md5($real_pass);
406
+ − 1173 $row['user_timezone'] = intval($row['user_timezone']) - 1440;
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1174
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1175 profiler_log("SessionManager: finished session check");
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1176
1
+ − 1177 return $row;
+ − 1178 }
+ − 1179
+ − 1180 /**
+ − 1181 * Validates a session key, and returns the userdata associated with the key or false. Optimized for compatibility with the old MD5-based auth system.
+ − 1182 * @param string $key The session key to validate
+ − 1183 * @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.
+ − 1184 */
+ − 1185
+ − 1186 function compat_validate_session($key)
+ − 1187 {
+ − 1188 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1189 $key = $db->escape($key);
+ − 1190
406
+ − 1191 $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,1440 AS user_timezone FROM '.table_prefix.'session_keys AS k
1
+ − 1192 LEFT JOIN '.table_prefix.'users AS u
+ − 1193 ON u.user_id=k.user_id
+ − 1194 WHERE k.session_key=\''.$key.'\';');
+ − 1195 if($db->numrows() < 1)
+ − 1196 {
+ − 1197 // echo '(debug) $session->validate_session: Key '.$key.' was not found in database<br />';
+ − 1198 return false;
+ − 1199 }
+ − 1200 $row = $db->fetchrow();
+ − 1201 $ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1202 if($row['auth_level'] > $row['user_level'])
+ − 1203 {
+ − 1204 // Failed authorization check
+ − 1205 // echo '(debug) $session->validate_session: user not authorized for this access level';
+ − 1206 return false;
+ − 1207 }
+ − 1208 if($ip != $row['source_ip'])
+ − 1209 {
+ − 1210 // Failed IP address check
+ − 1211 // echo '(debug) $session->validate_session: IP address mismatch; IP in table: '.$row['source_ip'].'; reported IP: '.$ip.'';
+ − 1212 return false;
+ − 1213 }
+ − 1214
+ − 1215 // Do the password validation
+ − 1216 $real_key = md5($row['password'] . $row['salt']);
+ − 1217
+ − 1218 //die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1219 if($real_key != $key)
+ − 1220 {
+ − 1221 // Failed password check
+ − 1222 // echo '(debug) $session->validate_session: supplied password is wrong<br />Real key: '.$real_key.'<br />User key: '.$key;
+ − 1223 return false;
+ − 1224 }
+ − 1225
+ − 1226 $time_now = time();
+ − 1227 $time_key = $row['time'] + 900;
+ − 1228 if($time_now > $time_key && $row['auth_level'] >= 1)
+ − 1229 {
+ − 1230 $this->sw_timed_out = true;
+ − 1231 // Session timed out
+ − 1232 // echo '(debug) $session->validate_session: super session timed out<br />';
+ − 1233 return false;
+ − 1234 }
+ − 1235
406
+ − 1236 $row['user_timezone'] = intval($row['user_timezone']) - 1440;
+ − 1237
1
+ − 1238 return $row;
+ − 1239 }
+ − 1240
+ − 1241 /**
+ − 1242 * Demotes us to one less than the specified auth level. AKA destroys elevated authentication and/or logs out the user, depending on $level
+ − 1243 * @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
+ − 1244 * @return string 'success' if successful, or error on failure
+ − 1245 */
+ − 1246
+ − 1247 function logout($level = USER_LEVEL_MEMBER)
+ − 1248 {
+ − 1249 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1250 $ou = $this->username;
+ − 1251 $oid = $this->user_id;
+ − 1252 if($level > USER_LEVEL_CHPREF)
+ − 1253 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1254 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1255 if(!$this->user_logged_in || $this->auth_level < ( USER_LEVEL_MEMBER + 1))
221
+ − 1256 {
+ − 1257 return 'success';
+ − 1258 }
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1259 // See if we can get rid of the cached decrypted session key
595
b051eb79b158
As promised, dropped in the new librijndael. Benchmarks say about 3 times faster, but more performance testing will be done.
Dan
diff
changeset
+ − 1260 $key_bin = hex2bin(strrev($this->sid_super));
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1261 $key_hash = sha1($key_bin . '::' . $this->private_key);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1262 aes_decrypt_cache_destroy($key_hash);
1
+ − 1263 // Destroy elevated privileges
+ − 1264 $keyhash = md5(strrev($this->sid_super));
+ − 1265 $this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.$keyhash.'\' AND user_id=\'' . $this->user_id . '\';');
+ − 1266 $this->sid_super = false;
+ − 1267 $this->auth_level = USER_LEVEL_MEMBER;
+ − 1268 }
+ − 1269 else
+ − 1270 {
+ − 1271 if($this->user_logged_in)
+ − 1272 {
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1273 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1274 // See if we can get rid of the cached decrypted session key
595
b051eb79b158
As promised, dropped in the new librijndael. Benchmarks say about 3 times faster, but more performance testing will be done.
Dan
diff
changeset
+ − 1275 $key_bin = hex2bin($this->sid);
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1276 $key_hash = sha1($key_bin . '::' . $this->private_key);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1277 aes_decrypt_cache_destroy($key_hash);
1
+ − 1278 // Completely destroy our session
+ − 1279 if($this->auth_level > USER_LEVEL_CHPREF)
+ − 1280 {
+ − 1281 $this->logout(USER_LEVEL_ADMIN);
+ − 1282 }
+ − 1283 $this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.md5($this->sid).'\';');
+ − 1284 setcookie( 'sid', '', time()-(3600*24), scriptPath.'/' );
+ − 1285 }
+ − 1286 }
+ − 1287 $code = $plugins->setHook('logout_success'); // , Array('level'=>$level,'old_username'=>$ou,'old_user_id'=>$oid));
+ − 1288 foreach ( $code as $cmd )
+ − 1289 {
+ − 1290 eval($cmd);
+ − 1291 }
+ − 1292 return 'success';
+ − 1293 }
+ − 1294
+ − 1295 # Miscellaneous stuff
+ − 1296
+ − 1297 /**
603
+ − 1298 * Alerts the user that their account is inactive, and tells them appropriate steps to remedy the situation. Halts execution.
+ − 1299 * @param array Return from validate_session()
+ − 1300 */
+ − 1301
+ − 1302 function show_inactive_error($userdata)
+ − 1303 {
+ − 1304 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1305 global $lang;
+ − 1306
+ − 1307 $language = intval(getConfig('default_language'));
+ − 1308 $lang = new Language($language);
+ − 1309 @setlocale(LC_ALL, $lang->lang_code);
+ − 1310
+ − 1311 $this->logout();
+ − 1312 $a = getConfig('account_activation');
+ − 1313 switch($a)
+ − 1314 {
+ − 1315 case 'none':
+ − 1316 default:
+ − 1317 $solution = $lang->get('user_login_noact_solution_none');
+ − 1318 break;
+ − 1319 case 'user':
+ − 1320 $solution = $lang->get('user_login_noact_solution_user');
+ − 1321 break;
+ − 1322 case 'admin':
+ − 1323 $solution = $lang->get('user_login_noact_solution_admin');
+ − 1324 break;
+ − 1325 }
+ − 1326
+ − 1327 // admin activation request opportunity
+ − 1328 $q = $db->sql_query('SELECT 1 FROM '.table_prefix.'logs WHERE log_type=\'admin\' AND action=\'activ_req\' AND edit_summary=\'' . $db->escape($userdata['username']) . '\';');
+ − 1329 if ( !$q )
+ − 1330 $db->_die();
+ − 1331
+ − 1332 $can_request = ( $db->numrows() < 1 );
+ − 1333 $db->free_result();
+ − 1334
+ − 1335 if ( isset($_POST['logout']) )
+ − 1336 {
+ − 1337 $this->sid = $_COOKIE['sid'];
+ − 1338 $this->user_logged_in = true;
+ − 1339 $this->user_id = intval($userdata['user_id']);
+ − 1340 $this->username = $userdata['username'];
+ − 1341 $this->auth_level = USER_LEVEL_MEMBER;
+ − 1342 $this->user_level = USER_LEVEL_MEMBER;
+ − 1343 $this->logout();
+ − 1344 redirect(scriptPath . '/', $lang->get('user_login_noact_msg_logout_success_title'), $lang->get('user_login_noact_msg_logout_success_body'), 5);
+ − 1345 }
+ − 1346
+ − 1347 if ( $can_request && !isset($_POST['activation_request']) )
+ − 1348 {
+ − 1349 $form = '<p>' . $lang->get('user_login_noact_msg_ask_admins') . '</p>
+ − 1350 <form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
+ − 1351 <p><input type="submit" name="activation_request" value="' . $lang->get('user_login_noact_btn_request_activation') . '" /> <input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p>
+ − 1352 </form>';
+ − 1353 }
+ − 1354 else
+ − 1355 {
+ − 1356 if ( $can_request && isset($_POST['activation_request']) )
+ − 1357 {
+ − 1358 $this->admin_activation_request($userdata['username']);
+ − 1359 $form = '<p>' . $lang->get('user_login_noact_msg_admins_just_asked') . '</p>
+ − 1360 <form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
+ − 1361 <p><input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p>
+ − 1362 </form>';
+ − 1363 }
+ − 1364 else
+ − 1365 {
+ − 1366 $form = '<p>' . $lang->get('user_login_noact_msg_admins_asked') . '</p>
+ − 1367 <form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
+ − 1368 <p><input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p>
+ − 1369 </form>';
+ − 1370 }
+ − 1371 }
+ − 1372
+ − 1373 die_semicritical($lang->get('user_login_noact_title'), '<p>' . $lang->get('user_login_noact_msg_intro') . ' '.$solution.'</p>' . $form);
+ − 1374 }
+ − 1375
+ − 1376 /**
1
+ − 1377 * Appends the high-privilege session key to the URL if we are authorized to do high-privilege stuff
+ − 1378 * @param string $url The URL to add session data to
+ − 1379 * @return string
+ − 1380 */
+ − 1381
+ − 1382 function append_sid($url)
+ − 1383 {
+ − 1384 $sep = ( strstr($url, '?') ) ? '&' : '?';
+ − 1385 if ( $this->sid_super )
+ − 1386 {
+ − 1387 $url = $url . $sep . 'auth=' . urlencode($this->sid_super);
+ − 1388 // echo($this->sid_super.'<br/>');
+ − 1389 }
+ − 1390 return $url;
+ − 1391 }
+ − 1392
+ − 1393 /**
+ − 1394 * Grabs the user's password MD5
+ − 1395 * @return string, or bool false if access denied
+ − 1396 */
+ − 1397
+ − 1398 function grab_password_hash()
+ − 1399 {
+ − 1400 if(!$this->password_hash) return false;
+ − 1401 return $this->password_hash;
+ − 1402 }
+ − 1403
+ − 1404 /**
+ − 1405 * Destroys the user's password MD5 in memory
+ − 1406 */
+ − 1407
+ − 1408 function disallow_password_grab()
+ − 1409 {
+ − 1410 $this->password_hash = false;
+ − 1411 return false;
+ − 1412 }
+ − 1413
+ − 1414 /**
+ − 1415 * Generates an AES key and stashes it in the database
+ − 1416 * @return string Hex-encoded AES key
+ − 1417 */
+ − 1418
+ − 1419 function rijndael_genkey()
+ − 1420 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1421 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1422 $key = $aes->gen_readymade_key();
+ − 1423 $keys = getConfig('login_key_cache');
+ − 1424 if(is_string($keys))
+ − 1425 $keys .= $key;
+ − 1426 else
+ − 1427 $keys = $key;
+ − 1428 setConfig('login_key_cache', $keys);
+ − 1429 return $key;
+ − 1430 }
+ − 1431
+ − 1432 /**
+ − 1433 * Generate a totally random 128-bit value for MD5 challenges
+ − 1434 * @return string
+ − 1435 */
+ − 1436
+ − 1437 function dss_rand()
+ − 1438 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1439 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1440 $random = $aes->randkey(128);
+ − 1441 unset($aes);
+ − 1442 return md5(microtime() . $random);
+ − 1443 }
+ − 1444
+ − 1445 /**
+ − 1446 * Fetch a cached login public key using the MD5sum as an identifier. Each key can only be fetched once before it is destroyed.
+ − 1447 * @param string $md5 The MD5 sum of the key
+ − 1448 * @return string, or bool false on failure
+ − 1449 */
+ − 1450
+ − 1451 function fetch_public_key($md5)
+ − 1452 {
+ − 1453 $keys = getConfig('login_key_cache');
+ − 1454 $keys = enano_str_split($keys, AES_BITS / 4);
+ − 1455
+ − 1456 foreach($keys as $i => $k)
+ − 1457 {
+ − 1458 if(md5($k) == $md5)
+ − 1459 {
+ − 1460 unset($keys[$i]);
+ − 1461 if(count($keys) > 0)
+ − 1462 {
+ − 1463 if ( strlen(getConfig('login_key_cache') ) > 64000 )
+ − 1464 {
+ − 1465 // This should only need to be done once every month or so for an average-size site
+ − 1466 setConfig('login_key_cache', '');
+ − 1467 }
+ − 1468 else
+ − 1469 {
+ − 1470 $keys = implode('', array_values($keys));
+ − 1471 setConfig('login_key_cache', $keys);
+ − 1472 }
+ − 1473 }
+ − 1474 else
+ − 1475 {
+ − 1476 setConfig('login_key_cache', '');
+ − 1477 }
+ − 1478 return $k;
+ − 1479 }
+ − 1480 }
+ − 1481 // Couldn't find the key...
+ − 1482 return false;
+ − 1483 }
+ − 1484
+ − 1485 /**
+ − 1486 * Adds a user to a group.
+ − 1487 * @param int User ID
+ − 1488 * @param int Group ID
+ − 1489 * @param bool Group moderator - defaults to false
+ − 1490 * @return bool True on success, false on failure
+ − 1491 */
+ − 1492
+ − 1493 function add_user_to_group($user_id, $group_id, $is_mod = false)
+ − 1494 {
+ − 1495 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1496
+ − 1497 // Validation
+ − 1498 if ( !is_int($user_id) || !is_int($group_id) || !is_bool($is_mod) )
+ − 1499 return false;
+ − 1500 if ( $user_id < 1 || $group_id < 1 )
+ − 1501 return false;
+ − 1502
+ − 1503 $mod_switch = ( $is_mod ) ? '1' : '0';
+ − 1504 $q = $this->sql('SELECT member_id,is_mod FROM '.table_prefix.'group_members WHERE user_id=' . $user_id . ' AND group_id=' . $group_id . ';');
+ − 1505 if ( !$q )
+ − 1506 $db->_die();
+ − 1507 if ( $db->numrows() < 1 )
+ − 1508 {
+ − 1509 // User is not in group
+ − 1510 $this->sql('INSERT INTO '.table_prefix.'group_members(user_id,group_id,is_mod) VALUES(' . $user_id . ', ' . $group_id . ', ' . $mod_switch . ');');
+ − 1511 return true;
+ − 1512 }
+ − 1513 else
+ − 1514 {
+ − 1515 $row = $db->fetchrow();
+ − 1516 // Update modship status
+ − 1517 if ( strval($row['is_mod']) == $mod_switch )
+ − 1518 {
+ − 1519 // Modship unchanged
+ − 1520 return true;
+ − 1521 }
+ − 1522 else
+ − 1523 {
+ − 1524 // Modship changed
+ − 1525 $this->sql('UPDATE '.table_prefix.'group_members SET is_mod=' . $mod_switch . ' WHERE member_id=' . $row['member_id'] . ';');
+ − 1526 return true;
+ − 1527 }
+ − 1528 }
+ − 1529 return false;
+ − 1530 }
+ − 1531
+ − 1532 /**
+ − 1533 * Removes a user from a group.
+ − 1534 * @param int User ID
+ − 1535 * @param int Group ID
+ − 1536 * @return bool True on success, false on failure
+ − 1537 * @todo put a little more error checking in...
+ − 1538 */
+ − 1539
+ − 1540 function remove_user_from_group($user_id, $group_id)
+ − 1541 {
+ − 1542 if ( !is_int($user_id) || !is_int($group_id) )
+ − 1543 return false;
+ − 1544 $this->sql('DELETE FROM '.table_prefix."group_members WHERE user_id=$user_id AND group_id=$group_id;");
+ − 1545 return true;
+ − 1546 }
+ − 1547
+ − 1548 /**
+ − 1549 * Checks the banlist to ensure that we're an allowed user. Doesn't return anything because it dies if the user is banned.
+ − 1550 */
+ − 1551
+ − 1552 function check_banlist()
+ − 1553 {
+ − 1554 global $db, $session, $paths, $template, $plugins; // Common objects
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1555 global $lang;
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1556
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1557 $col_reason = ( $this->compat ) ? '"No reason entered (session manager is in compatibility mode)" AS reason' : 'reason';
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1558 $banned = false;
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1559 if ( $this->user_logged_in )
1
+ − 1560 {
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1561 // check by IP, email, and username
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1562 if ( ENANO_DBLAYER == 'MYSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1563 {
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1564 $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1565 . " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1566 . " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1567 . " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1568 . " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' REGEXP ban_value ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1569 . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1570 . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' REGEXP ban_value ) \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1571 . " ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1572 }
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1573 else if ( ENANO_DBLAYER == 'PGSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1574 {
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1575 $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1576 . " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
322
+ − 1577 . " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value ) OR \n"
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1578 . " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
322
+ − 1579 . " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' ~ ban_value ) OR \n"
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1580 . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
322
+ − 1581 . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' ~ ban_value ) \n"
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1582 . " ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1583 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1584 $q = $this->sql($sql);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1585 if ( $db->numrows() > 0 )
1
+ − 1586 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1587 while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1588 {
425
+ − 1589 if ( $ban_type == BAN_IP && $is_regex != 1 )
1
+ − 1590 {
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1591 // check range
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1592 $regexp = parse_ip_range_regex($ban_value);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1593 if ( !$regexp )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1594 {
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1595 continue;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1596 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1597 if ( preg_match("/$regexp/", $_SERVER['REMOTE_ADDR']) )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1598 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1599 $reason = $reason_temp;
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1600 $banned = true;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1601 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1602 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1603 else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1604 {
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1605 // User is banned
1
+ − 1606 $banned = true;
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1607 $reason = $reason_temp;
1
+ − 1608 }
+ − 1609 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1610 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1611 $db->free_result();
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1612 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1613 else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1614 {
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1615 // check by IP only
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1616 if ( ENANO_DBLAYER == 'MYSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1617 {
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1618 $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1619 ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1620 ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1621 ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1622 }
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1623 else if ( ENANO_DBLAYER == 'PGSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1624 {
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1625 $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1626 ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
322
+ − 1627 ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value )
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1628 ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1629 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1630 $q = $this->sql($sql);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1631 if ( $db->numrows() > 0 )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1632 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1633 while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1634 {
495
+ − 1635 if ( $ban_type == BAN_IP && $is_regex != 1 )
1
+ − 1636 {
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1637 // check range
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1638 $regexp = parse_ip_range_regex($ban_value);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1639 if ( !$regexp )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1640 continue;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1641 if ( preg_match("/$regexp/", $_SERVER['REMOTE_ADDR']) )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1642 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1643 $reason = $reason_temp;
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1644 $banned = true;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1645 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1646 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1647 else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1648 {
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1649 // User is banned
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1650 $reason = $reason_temp;
1
+ − 1651 $banned = true;
+ − 1652 }
+ − 1653 }
+ − 1654 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1655 $db->free_result();
1
+ − 1656 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1657 if ( $banned && $paths->get_pageid_from_url() != $paths->nslist['Special'].'CSS' )
1
+ − 1658 {
+ − 1659 // This guy is banned - kill the session, kill the database connection, bail out, and be pretty about it
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1660 die_semicritical($lang->get('user_ban_msg_title'), '<p>' . $lang->get('user_ban_msg_body') . '</p><div class="error-box"><b>' . $lang->get('user_ban_lbl_reason') . '</b><br />' . $reason . '</div>');
1
+ − 1661 exit;
+ − 1662 }
+ − 1663 }
+ − 1664
+ − 1665 # Registration
+ − 1666
+ − 1667 /**
+ − 1668 * Registers a user. This does not perform any type of login.
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1669 * @param string New user's username
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1670 * @param string This should be unencrypted.
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1671 * @param string E-mail address.
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1672 * @param string Optional, defaults to ''.
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1673 * @param bool 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
+ − 1674 */
+ − 1675
30
+ − 1676 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
+ − 1677 {
1
+ − 1678 global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1679 global $lang;
1
+ − 1680
+ − 1681 // Initialize AES
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1682 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1683
359
+ − 1684 // Since we're recording IP addresses, make sure the user's IP is safe.
+ − 1685 $ip =& $_SERVER['REMOTE_ADDR'];
+ − 1686 if ( !is_valid_ip($ip) )
+ − 1687 return 'Invalid IP';
+ − 1688
+ − 1689 if ( !preg_match('#^'.$this->valid_username.'$#', $username) )
370
+ − 1690 return $lang->get('user_reg_err_username_banned_chars');
359
+ − 1691
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1692 $username = str_replace('_', ' ', $username);
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1693 $user_orig = $username;
1
+ − 1694 $username = $this->prepare_text($username);
+ − 1695 $email = $this->prepare_text($email);
+ − 1696 $real_name = $this->prepare_text($real_name);
+ − 1697
+ − 1698 $nameclause = ( $real_name != '' ) ? ' OR real_name=\''.$real_name.'\'' : '';
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1699 $q = $this->sql('SELECT * FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=\''.strtolower($username).'\' OR email=\''.$email.'\''.$nameclause.';');
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1700 if($db->numrows() > 0)
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1701 {
1
+ − 1702 $row = $db->fetchrow();
370
+ − 1703 $str = 'user_reg_err_dupe';
+ − 1704
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1705 if ( $row['username'] == $username )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1706 {
370
+ − 1707 $str .= '_username';
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1708 }
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1709 if ( $row['email'] == $email )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1710 {
370
+ − 1711 $str .= '_email';
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1712 }
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1713 if ( $row['real_name'] == $real_name && $real_name != '' )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1714 {
370
+ − 1715 $str .= '_realname';
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1716 }
370
+ − 1717
371
dc6026376919
Improved compatibility with PostgreSQL and fixed a number of installer bugs; fixed missing "meta" category declaration in language files
Dan
diff
changeset
+ − 1718 return $lang->get($str);
1
+ − 1719 }
+ − 1720
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1721 // Is the password strong enough?
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1722 if ( getConfig('pw_strength_enable') )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1723 {
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1724 $min_score = intval( getConfig('pw_strength_minimum') );
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1725 $pass_score = password_score($password);
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1726 if ( $pass_score < $min_score )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1727 {
370
+ − 1728 return $lang->get('user_reg_err_password_too_weak');
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1729 }
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1730 }
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1731
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1732 $password = $aes->encrypt($password, $this->private_key, ENC_HEX);
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1733
1
+ − 1734 // Require the account to be activated?
+ − 1735 switch(getConfig('account_activation'))
+ − 1736 {
+ − 1737 case 'none':
+ − 1738 default:
+ − 1739 $active = '1';
+ − 1740 break;
+ − 1741 case 'user':
+ − 1742 $active = '0';
+ − 1743 break;
+ − 1744 case 'admin':
+ − 1745 $active = '0';
+ − 1746 break;
+ − 1747 }
30
+ − 1748 if ( $coppa )
+ − 1749 $active = '0';
+ − 1750
+ − 1751 $coppa_col = ( $coppa ) ? '1' : '0';
1
+ − 1752
+ − 1753 // Generate a totally random activation key
+ − 1754 $actkey = sha1 ( microtime() . mt_rand() );
+ − 1755
30
+ − 1756 // We good, create the user
359
+ − 1757 $this->sql('INSERT INTO '.table_prefix.'users ( username, password, email, real_name, theme, style, reg_time, account_active, activation_key, user_level, user_coppa, user_registration_ip ) VALUES ( \''.$username.'\', \''.$password.'\', \''.$email.'\', \''.$real_name.'\', \''.$template->default_theme.'\', \''.$template->default_style.'\', '.time().', '.$active.', \''.$actkey.'\', '.USER_LEVEL_CHPREF.', ' . $coppa_col . ', \'' . $ip . '\' );');
1
+ − 1758
31
+ − 1759 // Get user ID and create users_extra entry
+ − 1760 $q = $this->sql('SELECT user_id FROM '.table_prefix."users WHERE username='$username';");
+ − 1761 if ( $db->numrows() > 0 )
+ − 1762 {
359
+ − 1763 list($user_id) = $db->fetchrow_num();
31
+ − 1764 $db->free_result();
+ − 1765
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
+ − 1766 $this->sql('INSERT INTO '.table_prefix.'users_extra(user_id) VALUES(' . $user_id . ');');
31
+ − 1767 }
+ − 1768
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1769 // Grant edit and very limited mod access to the userpage
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1770 $acl_data = array(
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1771 'read' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1772 'view_source' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1773 'edit_page' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1774 'post_comments' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1775 'edit_comments' => AUTH_ALLOW, // only allows editing own comments
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1776 'history_view' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1777 'history_rollback' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1778 'rename' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1779 'delete_page' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1780 'tag_create' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1781 'tag_delete_own' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1782 'tag_delete_other' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1783 'edit_cat' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1784 'create_page' => AUTH_ALLOW
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1785 );
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1786 $acl_data = $db->escape($this->perm_to_string($acl_data));
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1787 $userpage = $db->escape(sanitize_page_id($user_orig));
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1788 $cols = "target_type, target_id, page_id, namespace, rules";
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1789 $vals = ACL_TYPE_USER . ", $user_id, '$userpage', 'User', '$acl_data'";
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1790 $q = "INSERT INTO ".table_prefix."acl($cols) VALUES($vals);";
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1791 $this->sql($q);
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1792
1
+ − 1793 // Require the account to be activated?
30
+ − 1794 if ( $coppa )
+ − 1795 {
+ − 1796 $this->admin_activation_request($username);
+ − 1797 $this->send_coppa_mail($username,$email);
+ − 1798 }
+ − 1799 else
1
+ − 1800 {
30
+ − 1801 switch(getConfig('account_activation'))
+ − 1802 {
+ − 1803 case 'none':
+ − 1804 default:
+ − 1805 break;
+ − 1806 case 'user':
+ − 1807 $a = $this->send_activation_mail($username);
+ − 1808 if(!$a)
+ − 1809 {
+ − 1810 $this->admin_activation_request($username);
370
+ − 1811 return $lang->get('user_reg_err_actmail_failed') . ' ' . $a;
30
+ − 1812 }
+ − 1813 break;
+ − 1814 case 'admin':
1
+ − 1815 $this->admin_activation_request($username);
30
+ − 1816 break;
+ − 1817 }
1
+ − 1818 }
+ − 1819
+ − 1820 // Leave some data behind for the hook
+ − 1821 $code = $plugins->setHook('user_registered'); // , Array('username'=>$username));
+ − 1822 foreach ( $code as $cmd )
+ − 1823 {
+ − 1824 eval($cmd);
+ − 1825 }
+ − 1826
+ − 1827 // $this->register_session($username, $password);
+ − 1828 return 'success';
+ − 1829 }
+ − 1830
+ − 1831 /**
+ − 1832 * Attempts to send an e-mail to the specified user with activation instructions.
+ − 1833 * @param string $u The usernamd of the user requesting activation
+ − 1834 * @return bool true on success, false on failure
+ − 1835 */
+ − 1836
+ − 1837 function send_activation_mail($u, $actkey = false)
+ − 1838 {
+ − 1839 global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1840 global $lang;
131
+ − 1841 $q = $this->sql('SELECT username,email FROM '.table_prefix.'users WHERE user_id=2 OR user_level=' . USER_LEVEL_ADMIN . ' ORDER BY user_id ASC;');
1
+ − 1842 $un = $db->fetchrow();
+ − 1843 $admin_user = $un['username'];
+ − 1844 $q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1845 $r = $db->fetchrow();
+ − 1846 if ( empty($r['email']) )
+ − 1847 $db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1848
370
+ − 1849 $aklink = makeUrlComplete('Special', 'ActivateAccount/'.str_replace(' ', '_', $u).'/'. ( ( is_string($actkey) ) ? $actkey : $r['activation_key'] ) );
+ − 1850 $message = $lang->get('user_reg_activation_email', array(
+ − 1851 'activation_link' => $aklink,
+ − 1852 'admin_user' => $admin_user,
+ − 1853 'username' => $u
+ − 1854 ));
+ − 1855
1
+ − 1856 if(getConfig('smtp_enabled') == '1')
+ − 1857 {
370
+ − 1858 $result = smtp_send_email($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
1
+ − 1859 if($result == 'success') $result = true;
+ − 1860 else { echo $result; $result = false; }
+ − 1861 } else {
370
+ − 1862 $result = mail($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
1
+ − 1863 }
+ − 1864 return $result;
+ − 1865 }
+ − 1866
+ − 1867 /**
30
+ − 1868 * Attempts to send an e-mail to the specified user's e-mail address on file intended for the parents
+ − 1869 * @param string $u The usernamd of the user requesting activation
+ − 1870 * @return bool true on success, false on failure
+ − 1871 */
+ − 1872
+ − 1873 function send_coppa_mail($u, $actkey = false)
+ − 1874 {
+ − 1875 global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1876 global $lang;
30
+ − 1877
+ − 1878 $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;');
+ − 1879 $un = $db->fetchrow();
+ − 1880 $admin_user = $un['username'];
+ − 1881
+ − 1882 $q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1883 $r = $db->fetchrow();
+ − 1884 if ( empty($r['email']) )
+ − 1885 $db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1886
+ − 1887 if(isset($_SERVER['HTTPS'])) $prot = 'https';
+ − 1888 else $prot = 'http';
+ − 1889 if($_SERVER['SERVER_PORT'] == '80') $p = '';
+ − 1890 else $p = ':'.$_SERVER['SERVER_PORT'];
+ − 1891 $sidbak = false;
+ − 1892 if($this->sid_super)
+ − 1893 $sidbak = $this->sid_super;
+ − 1894 $this->sid_super = false;
+ − 1895 if($sidbak)
+ − 1896 $this->sid_super = $sidbak;
+ − 1897 unset($sidbak);
+ − 1898 $link = "$prot://".$_SERVER['HTTP_HOST'].scriptPath;
+ − 1899
370
+ − 1900 $message = $lang->get(
+ − 1901 'user_reg_activation_email_coppa',
+ − 1902 array(
+ − 1903 'username' => $u,
+ − 1904 'admin_user' => $admin_user,
+ − 1905 'site_link' => $link
+ − 1906 )
+ − 1907 );
30
+ − 1908
+ − 1909
+ − 1910 if(getConfig('smtp_enabled') == '1')
+ − 1911 {
+ − 1912 $result = smtp_send_email($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 1913 if($result == 'success')
+ − 1914 {
+ − 1915 $result = true;
+ − 1916 }
+ − 1917 else
+ − 1918 {
+ − 1919 echo $result;
+ − 1920 $result = false;
+ − 1921 }
+ − 1922 }
+ − 1923 else
+ − 1924 {
+ − 1925 $result = mail($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 1926 }
+ − 1927 return $result;
+ − 1928 }
+ − 1929
+ − 1930 /**
1
+ − 1931 * Sends an e-mail to a user so they can reset their password.
+ − 1932 * @param int $user The user ID, or username if it's a string
+ − 1933 * @return bool true on success, false on failure
+ − 1934 */
+ − 1935
+ − 1936 function mail_password_reset($user)
+ − 1937 {
+ − 1938 global $db, $session, $paths, $template, $plugins; // Common objects
335
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 1939 global $lang;
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 1940
1
+ − 1941 if(is_int($user))
+ − 1942 {
+ − 1943 $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
+ − 1944 }
+ − 1945 elseif(is_string($user))
+ − 1946 {
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1947 $q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=' . ENANO_SQLFUNC_LOWERCASE . '(\''.$db->escape($user).'\');');
1
+ − 1948 }
+ − 1949 else
+ − 1950 {
+ − 1951 return false;
+ − 1952 }
+ − 1953
+ − 1954 $row = $db->fetchrow();
+ − 1955 $temp_pass = $this->random_pass();
+ − 1956
+ − 1957 $this->register_temp_password($row['user_id'], $temp_pass);
+ − 1958
+ − 1959 $site_name = getConfig('site_name');
335
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 1960
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 1961 $message = $lang->get('userfuncs_passreset_email', array(
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 1962 'username' => $row['username'],
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 1963 'site_name' => $site_name,
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 1964 'remote_addr' => $_SERVER['REMOTE_ADDR'],
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 1965 'temp_pass' => $temp_pass
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 1966 ));
1
+ − 1967
+ − 1968 if(getConfig('smtp_enabled') == '1')
+ − 1969 {
+ − 1970 $result = smtp_send_email($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 1971 if($result == 'success')
+ − 1972 {
+ − 1973 $result = true;
+ − 1974 }
+ − 1975 else
+ − 1976 {
+ − 1977 echo '<p>'.$result.'</p>';
+ − 1978 $result = false;
+ − 1979 }
+ − 1980 } else {
+ − 1981 $result = mail($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 1982 }
+ − 1983 return $result;
+ − 1984 }
+ − 1985
+ − 1986 /**
+ − 1987 * Sets the temporary password for the specified user to whatever is specified.
+ − 1988 * @param int $user_id
+ − 1989 * @param string $password
+ − 1990 * @return bool
+ − 1991 */
+ − 1992
+ − 1993 function register_temp_password($user_id, $password)
+ − 1994 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1995 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1996 $temp_pass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 1997 $this->sql('UPDATE '.table_prefix.'users SET temp_password=\'' . $temp_pass . '\',temp_password_time='.time().' WHERE user_id='.intval($user_id).';');
+ − 1998 }
+ − 1999
+ − 2000 /**
+ − 2001 * Sends a request to the admin panel to have the username $u activated.
+ − 2002 * @param string $u The username of the user requesting activation
+ − 2003 */
+ − 2004
+ − 2005 function admin_activation_request($u)
+ − 2006 {
+ − 2007 global $db;
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2008 $this->sql('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, author, edit_summary) VALUES(\'admin\', \'activ_req\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$this->username.'\', \''.$db->escape($u).'\');');
1
+ − 2009 }
+ − 2010
+ − 2011 /**
+ − 2012 * Activates a user account. If the action fails, a report is sent to the admin.
+ − 2013 * @param string $user The username of the user requesting activation
+ − 2014 * @param string $key The activation key
+ − 2015 */
+ − 2016
+ − 2017 function activate_account($user, $key)
+ − 2018 {
+ − 2019 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2020 $this->sql('UPDATE '.table_prefix.'users SET account_active=1 WHERE username=\''.$db->escape($user).'\' AND activation_key=\''.$db->escape($key).'\';');
+ − 2021 $r = mysql_affected_rows();
+ − 2022 if ( $r > 0 )
+ − 2023 {
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2024 $e = $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
1
+ − 2025 }
+ − 2026 else
+ − 2027 {
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2028 $e = $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
1
+ − 2029 }
+ − 2030 return $r;
+ − 2031 }
+ − 2032
+ − 2033 /**
+ − 2034 * For a given user level identifier (USER_LEVEL_*), returns a string describing that user level.
+ − 2035 * @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
+ − 2036 * @param bool If true, returns a shorter string. Optional.
1
+ − 2037 * @return string
+ − 2038 */
+ − 2039
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
+ − 2040 function userlevel_to_string($user_level, $short = false)
1
+ − 2041 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2042 global $lang;
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2043
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2044 static $levels = array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2045 'short' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2046 USER_LEVEL_GUEST => 'Guest',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2047 USER_LEVEL_MEMBER => 'Member',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2048 USER_LEVEL_CHPREF => 'Sensitive preferences changeable',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2049 USER_LEVEL_MOD => 'Moderator',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2050 USER_LEVEL_ADMIN => 'Administrative'
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2051 ),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2052 'long' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2053 USER_LEVEL_GUEST => 'Low - guest privileges',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2054 USER_LEVEL_MEMBER => 'Standard - normal member level',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2055 USER_LEVEL_CHPREF => 'Medium - user can change his/her own e-mail address and password',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2056 USER_LEVEL_MOD => 'High - moderator privileges',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2057 USER_LEVEL_ADMIN => 'Highest - administrative privileges'
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2058 ),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2059 'l10n' => false
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2060 );
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2061
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2062 if ( is_object($lang) && !$levels['l10n'] )
1
+ − 2063 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2064 $levels = array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2065 'short' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2066 USER_LEVEL_GUEST => $lang->get('user_level_short_guest'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2067 USER_LEVEL_MEMBER => $lang->get('user_level_short_member'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2068 USER_LEVEL_CHPREF => $lang->get('user_level_short_chpref'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2069 USER_LEVEL_MOD => $lang->get('user_level_short_mod'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2070 USER_LEVEL_ADMIN => $lang->get('user_level_short_admin')
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2071 ),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2072 'long' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2073 USER_LEVEL_GUEST => $lang->get('user_level_long_guest'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2074 USER_LEVEL_MEMBER => $lang->get('user_level_long_member'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2075 USER_LEVEL_CHPREF => $lang->get('user_level_long_chpref'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2076 USER_LEVEL_MOD => $lang->get('user_level_long_mod'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2077 USER_LEVEL_ADMIN => $lang->get('user_level_long_admin')
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2078 ),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2079 'l10n' => true
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2080 );
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2081 }
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2082
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2083 $key = ( $short ) ? 'short' : 'long';
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2084 if ( isset($levels[$key][$user_level]) )
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2085 {
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2086 return $levels[$key][$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
+ − 2087 }
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
+ − 2088 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
+ − 2089 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2090 if ( $short )
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
+ − 2091 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2092 return ( is_object($lang) ) ? $lang->get('user_level_short_unknown', array('user_level' => $user_level)) : "Unknown - $user_level";
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2093 }
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2094 else
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2095 {
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2096 return ( is_object($lang) ) ? $lang->get('user_level_long_unknown', array('user_level' => $user_level)) : "Unknown level ($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
+ − 2097 }
1
+ − 2098 }
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2099
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2100 return 'Linux rocks!';
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2101
1
+ − 2102 }
+ − 2103
+ − 2104 /**
+ − 2105 * 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.
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2106 * Not localized because this really isn't used a whole lot anymore.
1
+ − 2107 * @param int $user_id The user ID of the user to update - this cannot be changed
+ − 2108 * @param string $username The new username
+ − 2109 * @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
+ − 2110 * @param string $password The new password
+ − 2111 * @param string $email The new e-mail address
+ − 2112 * @param string $realname The new real name
+ − 2113 * @param string $signature The updated forum/comment signature
+ − 2114 * @param int $user_level The updated user level
+ − 2115 * @return string 'success' if successful, or array of error strings on failure
+ − 2116 */
+ − 2117
+ − 2118 function update_user($user_id, $username = false, $old_pass = false, $password = false, $email = false, $realname = false, $signature = false, $user_level = false)
+ − 2119 {
+ − 2120 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2121
+ − 2122 // Create some arrays
+ − 2123
+ − 2124 $errors = Array(); // Used to hold error strings
+ − 2125 $strs = Array(); // Sub-query statements
+ − 2126
+ − 2127 // Scan the user ID for problems
+ − 2128 if(intval($user_id) < 1) $errors[] = 'SQL injection attempt';
+ − 2129
+ − 2130 // Instanciate the AES encryption class
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2131 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 2132
+ − 2133 // If all of our input vars are false, then we've effectively done our job so get out of here
+ − 2134 if($username === false && $password === false && $email === false && $realname === false && $signature === false && $user_level === false)
+ − 2135 {
+ − 2136 // echo 'debug: $session->update_user(): success (no changes requested)';
+ − 2137 return 'success';
+ − 2138 }
+ − 2139
+ − 2140 // Initialize our authentication check
+ − 2141 $authed = false;
+ − 2142
+ − 2143 // Verify the inputted password
+ − 2144 if(is_string($old_pass))
+ − 2145 {
+ − 2146 $q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2147 if($db->numrows() < 1)
+ − 2148 {
+ − 2149 $errors[] = 'The password data could not be selected for verification.';
+ − 2150 }
+ − 2151 else
+ − 2152 {
+ − 2153 $row = $db->fetchrow();
+ − 2154 $real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 2155 if($real == $old_pass)
+ − 2156 $authed = true;
+ − 2157 }
+ − 2158 }
+ − 2159
+ − 2160 elseif(is_array($old_pass))
+ − 2161 {
+ − 2162 $old_pass = $aes->decrypt($old_pass[0], $old_pass[1]);
+ − 2163 $q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2164 if($db->numrows() < 1)
+ − 2165 {
+ − 2166 $errors[] = 'The password data could not be selected for verification.';
+ − 2167 }
+ − 2168 else
+ − 2169 {
+ − 2170 $row = $db->fetchrow();
+ − 2171 $real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 2172 if($real == $old_pass)
+ − 2173 $authed = true;
+ − 2174 }
+ − 2175 }
+ − 2176
+ − 2177 // Initialize our query
+ − 2178 $q = 'UPDATE '.table_prefix.'users SET ';
+ − 2179
+ − 2180 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
+ − 2181 {
+ − 2182 // Username
+ − 2183 if(is_string($username))
+ − 2184 {
+ − 2185 // Check the username for problems
+ − 2186 if(!preg_match('#^'.$this->valid_username.'$#', $username))
+ − 2187 $errors[] = 'The username you entered contains invalid characters.';
+ − 2188 $strs[] = 'username=\''.$db->escape($username).'\'';
+ − 2189 }
+ − 2190 // Password
+ − 2191 if(is_string($password) && strlen($password) >= 6)
+ − 2192 {
+ − 2193 // Password needs to be encrypted before being stashed
+ − 2194 $encpass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 2195 if(!$encpass)
+ − 2196 $errors[] = 'The password could not be encrypted due to an internal error.';
+ − 2197 $strs[] = 'password=\''.$encpass.'\'';
+ − 2198 }
+ − 2199 // E-mail addy
+ − 2200 if(is_string($email))
+ − 2201 {
504
bc8e0e9ee01d
Added support for embedding language data into plugins; updated all version numbers on plugin files
Dan
diff
changeset
+ − 2202 if(!check_email_address($email))
1
+ − 2203 $errors[] = 'The e-mail address you entered is invalid.';
+ − 2204 $strs[] = 'email=\''.$db->escape($email).'\'';
+ − 2205 }
+ − 2206 }
+ − 2207 // Real name
+ − 2208 if(is_string($realname))
+ − 2209 {
+ − 2210 $strs[] = 'real_name=\''.$db->escape($realname).'\'';
+ − 2211 }
+ − 2212 // Forum/comment signature
+ − 2213 if(is_string($signature))
+ − 2214 {
+ − 2215 $strs[] = 'signature=\''.$db->escape($signature).'\'';
+ − 2216 }
+ − 2217 // User level
+ − 2218 if(is_int($user_level))
+ − 2219 {
+ − 2220 $strs[] = 'user_level='.$user_level;
+ − 2221 }
+ − 2222
+ − 2223 // Add our generated query to the query string
+ − 2224 $q .= implode(',', $strs);
+ − 2225
+ − 2226 // One last error check
+ − 2227 if(sizeof($strs) < 1) $errors[] = 'An internal error occured building the SQL query, this is a bug';
+ − 2228 if(sizeof($errors) > 0) return $errors;
+ − 2229
+ − 2230 // Free our temp arrays
+ − 2231 unset($strs, $errors);
+ − 2232
+ − 2233 // Finalize the query and run it
+ − 2234 $q .= ' WHERE user_id='.$user_id.';';
+ − 2235 $this->sql($q);
+ − 2236
+ − 2237 // We also need to trigger re-activation.
+ − 2238 if ( is_string($email) )
+ − 2239 {
+ − 2240 switch(getConfig('account_activation'))
+ − 2241 {
+ − 2242 case 'user':
+ − 2243 case 'admin':
+ − 2244
+ − 2245 if ( $session->user_level >= USER_LEVEL_MOD && getConfig('account_activation') == 'admin' )
+ − 2246 // Don't require re-activation by admins for admins
+ − 2247 break;
+ − 2248
+ − 2249 // retrieve username
+ − 2250 if ( !$username )
+ − 2251 {
+ − 2252 $q = $this->sql('SELECT username FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2253 if($db->numrows() < 1)
+ − 2254 {
+ − 2255 $errors[] = 'The username could not be selected.';
+ − 2256 }
+ − 2257 else
+ − 2258 {
+ − 2259 $row = $db->fetchrow();
+ − 2260 $username = $row['username'];
+ − 2261 }
+ − 2262 }
+ − 2263 if ( !$username )
+ − 2264 return $errors;
+ − 2265
+ − 2266 // Generate a totally random activation key
+ − 2267 $actkey = sha1 ( microtime() . mt_rand() );
+ − 2268 $a = $this->send_activation_mail($username, $actkey);
+ − 2269 if(!$a)
+ − 2270 {
+ − 2271 $this->admin_activation_request($username);
+ − 2272 }
+ − 2273 // Deactivate the account until e-mail is confirmed
+ − 2274 $q = $db->sql_query('UPDATE '.table_prefix.'users SET account_active=0,activation_key=\'' . $actkey . '\' WHERE user_id=' . $user_id . ';');
+ − 2275 break;
+ − 2276 }
+ − 2277 }
+ − 2278
+ − 2279 // Yay! We're done
+ − 2280 return 'success';
+ − 2281 }
+ − 2282
591
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2283 /**
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2284 * Encrypts a string using the site's private key.
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2285 * @param string
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2286 * @param int Return type - one of ENC_BINARY, ENC_HEX, ENC_BASE64
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2287 * @return string
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2288 */
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2289
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2290 function pk_encrypt($string, $return_type = ENC_HEX)
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2291 {
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2292 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2293 return $aes->encrypt($string, $this->private_key, $return_type);
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2294 }
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2295
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2296 /**
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2297 * Encrypts a string using the site's private key.
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2298 * @param string
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2299 * @param int Input type - one of ENC_BINARY, ENC_HEX, ENC_BASE64
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2300 * @return string
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2301 */
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2302
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2303 function pk_decrypt($string, $input_type = ENC_HEX)
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2304 {
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2305 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2306 return $aes->decrypt($string, $this->private_key, $input_type);
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2307 }
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
diff
changeset
+ − 2308
1
+ − 2309 #
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2310 # USER RANKS
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2311 #
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2312
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2313 /**
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2314 * SYNOPSIS OF THE RANK SYSTEM
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2315 * Enano's rank logic calculates a user's rank based on a precedence scale. The way things are checked is:
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2316 * 1. Check to see if the user has a specific rank assigned. Use that if possible.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2317 * 2. Check the user's primary group to see if it specifies a rank. Use that if possible.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2318 * 3. Check the other groups a user is in. If one that has a custom rank is encountered, use that rank.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2319 * 4. See if the user's user level has a specific rank hard-coded to be associated with it. (Always overrideable as can be seen above)
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2320 * 5. Use the "member" rank
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2321 */
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2322
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2323 /**
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2324 * Generates a textual SQL query for fetching rank data to be sent to calculate_user_rank().
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2325 * @param string Text to append, possibly a WHERE clause or so
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2326 * @return string
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2327 */
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2328
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2329 function generate_rank_sql($append = '')
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2330 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2331 // Generate level-to-rank associations
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2332 $assoc = array();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2333 foreach ( $this->level_rank_table as $level => $rank )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2334 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2335 $assoc[] = " ( u.user_level = $level AND rl.rank_id = $rank )";
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2336 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2337 $assoc = implode(" OR\n", $assoc) . "\n";
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2338
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2339 $gid_col = ( ENANO_DBLAYER == 'PGSQL' ) ?
618
+ − 2340 'array_to_string(' . table_prefix . 'array_accum(m.group_id), \',\') AS group_list' :
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2341 'GROUP_CONCAT(m.group_id) AS group_list';
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2342
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2343 // The actual query
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2344 $sql = "SELECT u.user_id, u.username, u.user_level, u.user_group, u.user_rank, u.user_title, g.group_rank,\n"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2345 . " COALESCE(ru.rank_id, rg.rank_id, rl.rank_id, rd.rank_id ) AS rank_id,\n"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2346 . " COALESCE(ru.rank_title, rg.rank_title, rl.rank_title, rd.rank_title) AS rank_title,\n"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2347 . " COALESCE(ru.rank_style, rg.rank_style, rl.rank_style, rd.rank_style) AS rank_style,\n"
618
+ − 2348 . " rg.rank_id AS group_rank_id,"
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2349 . " ( ru.rank_id IS NULL AND rg.rank_id IS NULL ) AS using_default,"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2350 . " ( ru.rank_id IS NULL AND rg.rank_id IS NOT NULL ) AS using_group,"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2351 . " $gid_col\n"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2352 . " FROM " . table_prefix . "users AS u\n"
584
+ − 2353 . " LEFT JOIN " . table_prefix . "groups AS g\n"
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2354 . " ON ( g.group_id = u.user_group )\n"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2355 . " LEFT JOIN " . table_prefix . "group_members AS m\n"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2356 . " ON ( u.user_id = m.user_id )\n"
584
+ − 2357 . " LEFT JOIN " . table_prefix . "ranks AS ru\n"
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2358 . " ON ( u.user_rank = ru.rank_id )\n"
584
+ − 2359 . " LEFT JOIN " . table_prefix . "ranks AS rg\n"
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2360 . " ON ( g.group_rank = rg.rank_id )\n"
584
+ − 2361 . " LEFT JOIN " . table_prefix . "ranks AS rl\n"
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2362 . " ON (\n"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2363 . $assoc
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2364 . " )\n"
584
+ − 2365 . " LEFT JOIN " . table_prefix . "ranks AS rd\n"
580
+ − 2366 . " ON ( rd.rank_id = 1 )$append\n"
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2367 . " GROUP BY u.user_id, u.username, u.user_level, u.user_group, u.user_rank, u.user_title, g.group_rank,\n"
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2368 . " ru.rank_id, ru.rank_title, ru.rank_style,rg.rank_id, rg.rank_title, rg.rank_style,\n"
580
+ − 2369 . " rl.rank_id, rl.rank_title, rl.rank_style,rd.rank_id, rd.rank_title, rd.rank_style;";
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2370
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2371 return $sql;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2372 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2373
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2374 /**
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2375 * Returns an associative array with a user's rank information.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2376 * The array will contain the following values:
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2377 * username: string The user's username
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2378 * user_id: integer Numerical user ID
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2379 * rank_id: integer Numerical rank ID
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2380 * rank: string The user's current rank
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2381 * title: string The user's custom user title if applicable; should be displayed one line below the rank
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2382 * style: string CSS for the username
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2383 * @param int|string Username *or* user ID
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2384 * @return array or false on failure
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2385 */
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2386
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2387 function get_user_rank($id)
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2388 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2389 global $db, $session, $paths, $template, $plugins; // Common objects
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2390 global $lang;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2391 global $user_ranks;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2392 // cache info if possible
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2393 static $_cache = array();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2394
593
4f9bec0d65c1
More optimization work. Moved special page init functions to common instead of common_post hook. Allowed paths to cache page metadata on filesystem. Phased out the redundancy in $paths->pages that paired a number with every urlname as foreach loops are allowed now (and have been for some time). Fixed missing includes for several functions. Rewrote str_replace_once to be a lot more efficient.
Dan
diff
changeset
+ − 2395 if ( is_int($id) && $id == 0 )
4f9bec0d65c1
More optimization work. Moved special page init functions to common instead of common_post hook. Allowed paths to cache page metadata on filesystem. Phased out the redundancy in $paths->pages that paired a number with every urlname as foreach loops are allowed now (and have been for some time). Fixed missing includes for several functions. Rewrote str_replace_once to be a lot more efficient.
Dan
diff
changeset
+ − 2396 $id = 1;
4f9bec0d65c1
More optimization work. Moved special page init functions to common instead of common_post hook. Allowed paths to cache page metadata on filesystem. Phased out the redundancy in $paths->pages that paired a number with every urlname as foreach loops are allowed now (and have been for some time). Fixed missing includes for several functions. Rewrote str_replace_once to be a lot more efficient.
Dan
diff
changeset
+ − 2397
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2398 if ( is_int($id) )
593
4f9bec0d65c1
More optimization work. Moved special page init functions to common instead of common_post hook. Allowed paths to cache page metadata on filesystem. Phased out the redundancy in $paths->pages that paired a number with every urlname as foreach loops are allowed now (and have been for some time). Fixed missing includes for several functions. Rewrote str_replace_once to be a lot more efficient.
Dan
diff
changeset
+ − 2399 $col = "u.user_id = $id";
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2400 else if ( is_string($id) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2401 $col = ENANO_SQLFUNC_LOWERCASE . "(username) = " . ENANO_SQLFUNC_LOWERCASE . "('" . $db->escape($id) . "')";
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2402 else
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2403 // invalid parameter
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2404 return false;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2405
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2406 // check the cache
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2407 if ( isset($_cache[$id]) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2408 return $_cache[$id];
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2409
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2410 // check the disk cache
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2411 if ( is_int($id) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2412 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2413 if ( isset($user_ranks[$id]) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2414 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2415 $_cache[$id] =& $user_ranks[$id];
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2416 return $user_ranks[$id];
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2417 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2418 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2419 else if ( is_string($id) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2420 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2421 foreach ( $user_ranks as $key => $valarray )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2422 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2423 if ( is_string($key) && strtolower($key) == strtolower($id) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2424 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2425 $_cache[$id] = $valarray;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2426 return $valarray;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2427 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2428 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2429 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2430
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2431 $sql = $this->generate_rank_sql("\n WHERE $col");
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2432
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2433 $q = $this->sql($sql);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2434 // any results?
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2435 if ( $db->numrows() < 1 )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2436 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2437 // nuttin'.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2438 $db->free_result();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2439 $_cache[$id] = false;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2440 return false;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2441 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2442
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2443 // Found something.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2444 $row = $db->fetchrow();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2445 $db->free_result();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2446
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2447 $row = $this->calculate_user_rank($row);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2448
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2449 $_cache[$id] = $row;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2450 return $row;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2451 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2452
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2453 /**
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2454 * Performs the actual rank calculation based on the contents of a row.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2455 * @param array
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2456 * @return array
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2457 */
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2458
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2459 function calculate_user_rank($row)
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2460 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2461 global $db, $session, $paths, $template, $plugins; // Common objects
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2462 global $lang;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2463
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2464 static $rank_cache = array();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2465 static $group_ranks = array();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2466
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2467 // try to cache that rank info
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2468 if ( !isset($rank_cache[ intval($row['rank_id']) ]) && $row['rank_id'] )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2469 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2470 $rank_cache[ intval($row['rank_id']) ] = array(
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2471 'rank_id' => intval($row['rank_id']),
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2472 'rank_title' => intval($row['rank_title']),
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2473 'rank_style' => intval($row['rank_style'])
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2474 );
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2475 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2476 // cache group info (if appropriate)
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2477 if ( $row['using_group'] && !isset($group_ranks[ intval($row['user_group']) ]) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2478 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2479 $group_ranks[ intval($row['user_group']) ] = intval($row['group_rank_id']);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2480 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2481
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2482 // sanitize and process the as-of-yet rank data
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2483 $row['rank_id'] = intval($row["rank_id"]);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2484 $row['rank_title'] = $row["rank_title"];
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2485
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2486 // if we're falling back to some default, then see if we can use one of the user's other groups
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2487 if ( $row['using_default'] && !empty($row['group_list']) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2488 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2489 $group_list = explode(',', $row['group_list']);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2490 if ( array_walk($group_list, 'intval') )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2491 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2492 // go through the group list and see if any of them has a rank assigned
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2493 foreach ( $group_list as $group_id )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2494 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2495 // cached in RAM? Preferably use that.
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2496 if ( !isset($group_ranks[$group_id]) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2497 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2498 // Not cached - grab it
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2499 $q = $this->sql('SELECT group_rank FROM ' . table_prefix . "groups WHERE group_id = $group_id;");
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2500 if ( $db->numrows() < 1 )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2501 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2502 $db->free_result();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2503 continue;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2504 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2505 list($result) = $db->fetchrow_num();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2506 $db->free_result();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2507
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2508 if ( $result === null || $result < 1 )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2509 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2510 $group_ranks[$group_id] = false;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2511 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2512 else
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2513 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2514 $group_ranks[$group_id] = intval($result);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2515 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2516 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2517 // we've got it now
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2518 if ( $group_ranks[$group_id] )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2519 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2520 // found a group with a rank assigned
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2521 // so get the rank info
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2522 $rank_id =& $group_ranks[$group_id];
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2523 if ( !isset($rank_cache[$rank_id]) )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2524 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2525 $q = $this->sql('SELECT rank_id, rank_title, rank_style FROM ' . table_prefix . "ranks WHERE rank_id = $rank_id;");
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2526 if ( $db->numrows() < 1 )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2527 {
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2528 $db->free_result();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2529 continue;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2530 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2531 $rank_cache[$rank_id] = $db->fetchrow();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2532 $db->free_result();
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2533 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2534 // set the final rank parameters
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2535 // die("found member-of-group exception with uid {$row['user_id']} gid $group_id rid $rank_id rt {$rank_cache[$rank_id]['rank_title']}");
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2536 $row['rank_id'] = $rank_id;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2537 $row['rank_title'] = $rank_cache[$rank_id]['rank_title'];
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2538 $row['rank_style'] = $rank_cache[$rank_id]['rank_style'];
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2539 break;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2540 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2541 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2542 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2543 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2544
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2545 if ( $row['user_title'] === NULL )
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2546 $row['user_title'] = false;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2547
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2548 $row['user_id'] = intval($row['user_id']);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2549 $row['user_level'] = intval($row['user_level']);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2550 $row['user_group'] = intval($row['user_group']);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2551
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2552 unset($row['user_rank'], $row['group_rank'], $row['group_list'], $row['using_default'], $row['using_group'], $row['user_level'], $row['user_group'], $row['username']);
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2553 return $row;
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2554 }
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2555
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 2556 #
1
+ − 2557 # Access Control Lists
+ − 2558 #
+ − 2559
+ − 2560 /**
+ − 2561 * Creates a new permission field in memory. If the permissions are set in the database, they are used. Otherwise, $default_perm is used.
+ − 2562 * @param string $acl_type An identifier for this field
+ − 2563 * @param int $default_perm Whether permission should be granted or not if it's not specified in the ACLs.
+ − 2564 * @param string $desc A human readable name for the permission type
+ − 2565 * @param array $deps The list of dependencies - this should be an array of ACL types
+ − 2566 * @param string $scope Which namespaces this field should apply to. This should be either a pipe-delimited list of namespace IDs or just "All".
+ − 2567 */
+ − 2568
+ − 2569 function register_acl_type($acl_type, $default_perm = AUTH_DISALLOW, $desc = false, $deps = Array(), $scope = 'All')
+ − 2570 {
+ − 2571 if(isset($this->acl_types[$acl_type]))
+ − 2572 return false;
+ − 2573 else
+ − 2574 {
+ − 2575 if(!$desc)
+ − 2576 {
+ − 2577 $desc = capitalize_first_letter(str_replace('_', ' ', $acl_type));
+ − 2578 }
+ − 2579 $this->acl_types[$acl_type] = $default_perm;
+ − 2580 $this->acl_descs[$acl_type] = $desc;
+ − 2581 $this->acl_deps[$acl_type] = $deps;
+ − 2582 $this->acl_scope[$acl_type] = explode('|', $scope);
+ − 2583 }
+ − 2584 return true;
+ − 2585 }
+ − 2586
+ − 2587 /**
+ − 2588 * Tells us whether permission $type is allowed or not based on the current rules.
+ − 2589 * @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 2590 * @param bool $no_deps If true, disables dependency checking
+ − 2591 * @return bool True if allowed, false if denied or if an error occured
+ − 2592 */
+ − 2593
+ − 2594 function get_permissions($type, $no_deps = false)
+ − 2595 {
+ − 2596 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2597 if ( isset( $this->perms[$type] ) )
+ − 2598 {
+ − 2599 if ( $this->perms[$type] == AUTH_DENY )
+ − 2600 $ret = false;
+ − 2601 else if ( $this->perms[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2602 $ret = true;
+ − 2603 else if ( $this->perms[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2604 $ret = false;
+ − 2605 else if ( $this->perms[$type] == AUTH_ALLOW )
+ − 2606 $ret = true;
+ − 2607 else if ( $this->perms[$type] == AUTH_DISALLOW )
+ − 2608 $ret = false;
+ − 2609 }
+ − 2610 else if(isset($this->acl_types[$type]))
+ − 2611 {
+ − 2612 if ( $this->acl_types[$type] == AUTH_DENY )
+ − 2613 $ret = false;
+ − 2614 else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2615 $ret = true;
+ − 2616 else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2617 $ret = false;
+ − 2618 else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 2619 $ret = true;
+ − 2620 else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 2621 $ret = false;
+ − 2622 }
+ − 2623 else
+ − 2624 {
+ − 2625 // ACL type is undefined
+ − 2626 trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
+ − 2627 return false; // Be on the safe side and deny access
+ − 2628 }
+ − 2629 if ( !$no_deps )
+ − 2630 {
+ − 2631 if ( !$this->acl_check_deps($type) )
+ − 2632 return false;
+ − 2633 }
+ − 2634 return $ret;
+ − 2635 }
+ − 2636
+ − 2637 /**
+ − 2638 * Fetch the permissions that apply to the current user for the page specified. The object you get will have the get_permissions method
+ − 2639 * and several other abilities.
+ − 2640 * @param string $page_id
+ − 2641 * @param string $namespace
+ − 2642 * @return object
+ − 2643 */
+ − 2644
+ − 2645 function fetch_page_acl($page_id, $namespace)
+ − 2646 {
+ − 2647 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2648
+ − 2649 if ( count ( $this->acl_base_cache ) < 1 )
+ − 2650 {
+ − 2651 // Permissions table not yet initialized
+ − 2652 return false;
+ − 2653 }
+ − 2654
156
+ − 2655 // cache of permission objects (to save RAM and SQL queries)
+ − 2656 static $objcache = array();
+ − 2657
+ − 2658 if ( count($objcache) == 0 )
+ − 2659 {
+ − 2660 foreach ( $paths->nslist as $key => $_ )
+ − 2661 {
+ − 2662 $objcache[$key] = array();
+ − 2663 }
+ − 2664 }
+ − 2665
+ − 2666 if ( isset($objcache[$namespace][$page_id]) )
+ − 2667 {
+ − 2668 return $objcache[$namespace][$page_id];
+ − 2669 }
+ − 2670
1
+ − 2671 //if ( !isset( $paths->pages[$paths->nslist[$namespace] . $page_id] ) )
+ − 2672 //{
+ − 2673 // // Page does not exist
+ − 2674 // return false;
+ − 2675 //}
+ − 2676
156
+ − 2677 $objcache[$namespace][$page_id] = new Session_ACLPageInfo( $page_id, $namespace, $this->acl_types, $this->acl_descs, $this->acl_deps, $this->acl_base_cache );
+ − 2678 $object =& $objcache[$namespace][$page_id];
1
+ − 2679
592
+ − 2680 profiler_log("session: fetched ACLs for page {$namespace}:{$page_id}");
+ − 2681
1
+ − 2682 return $object;
554
+ − 2683 }
+ − 2684
+ − 2685 /**
+ − 2686 * Fetch the permissions that apply to an arbitrary user for the page specified. The object you get will have the get_permissions method
+ − 2687 * and several other abilities.
+ − 2688 * @param int|string $user_id_or_name; user ID *or* username of the user
+ − 2689 * @param string $page_id; if null, will be default effective permissions.
+ − 2690 * @param string $namespace; if null, will be default effective permissions.
+ − 2691 * @return object
+ − 2692 */
+ − 2693
+ − 2694 function fetch_page_acl_user($user_id_or_name, $page_id, $namespace)
+ − 2695 {
+ − 2696 global $db, $session, $paths, $template, $plugins; // Common objects
1
+ − 2697
554
+ − 2698 // cache user info
+ − 2699 static $user_info_cache = null;
+ − 2700
+ − 2701 if ( isset($user_info_cache[$user_id_or_name]) )
+ − 2702 {
+ − 2703 $user_id =& $user_info_cache[$user_id_or_name]['user_id'];
+ − 2704 $groups =& $user_info_cache[$user_id_or_name]['groups'];
+ − 2705 }
+ − 2706 else
+ − 2707 {
+ − 2708 $uid_column = ( is_int($user_id_or_name) ) ? "user_id = $user_id_or_name" : "username = '" . $db->escape($user_id_or_name) . "'";
+ − 2709 $q = $db->sql_query('SELECT u.user_id, m.group_id, g.group_name FROM ' . table_prefix . "users AS u\n"
+ − 2710 . " LEFT JOIN " . table_prefix . "group_members AS m\n"
+ − 2711 . " ON ( ( u.user_id = m.user_id AND m.pending = 0 ) OR m.member_id IS NULL )\n"
+ − 2712 . " LEFT JOIN " . table_prefix . "groups AS g\n"
+ − 2713 . " ON ( g.group_id = m.group_id )\n"
+ − 2714 . " WHERE $uid_column;");
+ − 2715 if ( !$q )
+ − 2716 $db->_die();
+ − 2717
711
+ − 2718 // The l10n engine takes care of this later.
+ − 2719 $groups = array(1 => 'Everyone');
554
+ − 2720
+ − 2721 if ( $row = $db->fetchrow() )
+ − 2722 {
+ − 2723 $user_id = intval($row['user_id']);
+ − 2724 if ( $row['group_id'] )
+ − 2725 {
+ − 2726 do
+ − 2727 {
+ − 2728 $groups[ intval($row['group_id'] ) ] = $row['group_name'];
+ − 2729 }
+ − 2730 while ( $row = $db->fetchrow() );
+ − 2731 }
+ − 2732 $db->free_result();
+ − 2733 }
+ − 2734 else
+ − 2735 {
+ − 2736 $db->free_result();
+ − 2737 throw new Exception('Unknown user ID or username');
+ − 2738 }
+ − 2739
+ − 2740 $user_info_cache[$user_id_or_name] = array(
+ − 2741 'user_id' => $user_id,
+ − 2742 'groups' => $groups
+ − 2743 );
+ − 2744 }
+ − 2745
+ − 2746 // cache base permissions
+ − 2747 static $base_cache = array();
+ − 2748 if ( !isset($base_cache[$user_id_or_name]) )
+ − 2749 {
+ − 2750 $base_cache[$user_id_or_name] = $this->acl_types;
+ − 2751 $current_perms =& $base_cache[$user_id_or_name];
+ − 2752 $current_perms['__resolve_table'] = array();
+ − 2753
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2754 $bs = 'SELECT rules, target_type, target_id, rule_id, page_id, namespace, g.group_name FROM '.table_prefix."acl AS a\n"
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2755 . " LEFT JOIN " . table_prefix . "groups AS g\n"
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2756 . " ON ( ( a.target_type = " . ACL_TYPE_GROUP . " AND a.target_id = g.group_id ) OR ( a.target_type != " . ACL_TYPE_GROUP . " ) )\n"
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2757 . ' WHERE page_id IS NULL AND namespace IS NULL AND' . "\n"
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2758 . ' ( ';
554
+ − 2759
+ − 2760 $q = Array();
+ − 2761 $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id= ' . $user_id . ' )';
+ − 2762 if(count($groups) > 0)
+ − 2763 {
+ − 2764 foreach($groups as $g_id => $g_name)
+ − 2765 {
+ − 2766 $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2767 }
+ − 2768 }
+ − 2769 $bs .= implode(" OR \n ", $q) . " ) \n ORDER BY target_type ASC, target_id ASC;";
+ − 2770 $q = $this->sql($bs);
+ − 2771 foreach ( $this->acl_types as $perm_type => $_ )
+ − 2772 {
+ − 2773 // init the resolver table with blanks
+ − 2774 $current_perms['__resolve_table'][$perm_type] = array(
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2775 'src' => ACL_INHERIT_ENANO_DEFAULT,
554
+ − 2776 'rule_id' => -1
+ − 2777 );
+ − 2778 }
+ − 2779 if ( $row = $db->fetchrow() )
+ − 2780 {
+ − 2781 do {
+ − 2782 $rules = $this->string_to_perm($row['rules']);
+ − 2783 $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2784 // track where these rulings are coming from
+ − 2785 $src = ( $is_everyone ) ? ACL_INHERIT_GLOBAL_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_GLOBAL_GROUP : ACL_INHERIT_GLOBAL_USER );
+ − 2786 foreach ( $rules as $perm_type => $_ )
+ − 2787 {
+ − 2788 $current_perms['__resolve_table'][$perm_type] = array(
+ − 2789 'src' => $src,
+ − 2790 'rule_id' => $row['rule_id']
+ − 2791 );
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2792 if ( $row['group_name'] )
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2793 {
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2794 $current_perms['__resolve_table'][$perm_type]['group_name'] = $row['group_name'];
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 2795 }
554
+ − 2796 }
+ − 2797 // merge it in
+ − 2798 $current_perms = $this->acl_merge($current_perms, $rules, $is_everyone, $_defaults_used);
+ − 2799 } while ( $row = $db->fetchrow() );
+ − 2800 }
+ − 2801 }
+ − 2802
+ − 2803 // cache of permission objects (to save RAM and SQL queries)
+ − 2804 static $objcache = array();
+ − 2805
+ − 2806 if ( count($objcache) == 0 )
+ − 2807 {
+ − 2808 foreach ( $paths->nslist as $key => $_ )
+ − 2809 {
+ − 2810 $objcache[$key] = array();
+ − 2811 }
+ − 2812 }
+ − 2813
+ − 2814 if ( !isset($objcache[$namespace][$page_id]) )
+ − 2815 {
+ − 2816 $objcache[$namespace][$page_id] = array();
+ − 2817 }
+ − 2818
+ − 2819 if ( isset($objcache[$namespace][$page_id][$user_id_or_name]) )
+ − 2820 {
+ − 2821 return $objcache[$namespace][$page_id][$user_id_or_name];
+ − 2822 }
+ − 2823
+ − 2824 //if ( !isset( $paths->pages[$paths->nslist[$namespace] . $page_id] ) )
+ − 2825 //{
+ − 2826 // // Page does not exist
+ − 2827 // return false;
+ − 2828 //}
+ − 2829
+ − 2830 $objcache[$namespace][$page_id][$user_id_or_name] = new Session_ACLPageInfo(
+ − 2831 $page_id, // $page_id,
+ − 2832 $namespace, // $namespace,
+ − 2833 $this->acl_types, // $acl_types,
+ − 2834 $this->acl_descs, // $acl_descs,
+ − 2835 $this->acl_deps, // $acl_deps,
+ − 2836 $base_cache[$user_id_or_name], // $base,
+ − 2837 $user_info_cache[$user_id_or_name]['user_id'], // $user_id = null,
+ − 2838 $user_info_cache[$user_id_or_name]['groups'], // $groups = null,
+ − 2839 $base_cache[$user_id_or_name]['__resolve_table'] // $resolve_table = array()
+ − 2840 );
+ − 2841 $object =& $objcache[$namespace][$page_id][$user_id_or_name];
+ − 2842
+ − 2843 return $object;
1
+ − 2844 }
+ − 2845
+ − 2846 /**
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2847 * Checks if the given ACL rule type applies to a namespace.
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2848 * @param string ACL rule type
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2849 * @param string Namespace
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2850 * @return bool
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2851 */
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2852
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2853 function check_acl_scope($acl_rule, $namespace)
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2854 {
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2855 if ( !isset($this->acl_scope[$acl_rule]) )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2856 return false;
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2857 if ( $this->acl_scope[$acl_rule] === array('All') )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2858 return true;
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2859 return ( in_array($namespace, $this->acl_scope[$acl_rule]) ) ? true : false;
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2860 }
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2861
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2862 /**
1
+ − 2863 * Read all of our permissions from the database and process/apply them. This should be called after the page is determined.
+ − 2864 * @access private
+ − 2865 */
+ − 2866
+ − 2867 function init_permissions()
+ − 2868 {
+ − 2869 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2870 // Initialize the permissions list with some defaults
+ − 2871 $this->perms = $this->acl_types;
+ − 2872 $this->acl_defaults_used = $this->perms;
+ − 2873
+ − 2874 // Fetch sitewide defaults from the permissions table
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2875 $bs = 'SELECT rules, target_type, target_id FROM '.table_prefix.'acl' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2876 . ' WHERE page_id IS NULL AND namespace IS NULL AND' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2877 . ' ( ';
1
+ − 2878
+ − 2879 $q = Array();
+ − 2880 $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 2881 if(count($this->groups) > 0)
+ − 2882 {
+ − 2883 foreach($this->groups as $g_id => $g_name)
+ − 2884 {
+ − 2885 $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2886 }
+ − 2887 }
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2888 $bs .= implode(" OR \n ", $q) . " ) \n ORDER BY target_type ASC, target_id ASC;";
1
+ − 2889 $q = $this->sql($bs);
+ − 2890 if ( $row = $db->fetchrow() )
+ − 2891 {
+ − 2892 do {
+ − 2893 $rules = $this->string_to_perm($row['rules']);
+ − 2894 $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2895 $this->acl_merge_with_current($rules, $is_everyone);
+ − 2896 } while ( $row = $db->fetchrow() );
+ − 2897 }
+ − 2898
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
+ − 2899 // 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
+ − 2900 $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
+ − 2901
592
+ − 2902 profiler_log('session: base ACL set calculated');
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
+ − 2903
592
+ − 2904 // Load and calculate permissions for the current page
+ − 2905 $page_acl = $this->fetch_page_acl($paths->page_id, $paths->namespace);
+ − 2906 $this->perms = $page_acl->perms;
+ − 2907 $this->acl_defaults_used = $page_acl->acl_defaults_used;
1
+ − 2908 }
+ − 2909
+ − 2910 /**
+ − 2911 * Extends the scope of a permission type.
+ − 2912 * @param string The name of the permission type
+ − 2913 * @param string The namespace(s) that should be covered. This can be either one namespace ID or a pipe-delimited list.
+ − 2914 * @param object Optional - the current $paths object, in case we're doing this from the acl_rule_init hook
+ − 2915 */
+ − 2916
+ − 2917 function acl_extend_scope($perm_type, $namespaces, &$p_in)
+ − 2918 {
+ − 2919 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2920 $p_obj = ( is_object($p_in) ) ? $p_in : $paths;
+ − 2921 $nslist = explode('|', $namespaces);
+ − 2922 foreach ( $nslist as $i => $ns )
+ − 2923 {
+ − 2924 if ( !isset($p_obj->nslist[$ns]) )
+ − 2925 {
+ − 2926 unset($nslist[$i]);
+ − 2927 }
+ − 2928 else
+ − 2929 {
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2930 if ( $this->acl_scope[$perm_type] !== array('All') )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 2931 $this->acl_scope[$perm_type][] = $ns;
1
+ − 2932 if ( isset($this->acl_types[$perm_type]) && !isset($this->perms[$perm_type]) )
+ − 2933 {
+ − 2934 $this->perms[$perm_type] = $this->acl_types[$perm_type];
+ − 2935 }
+ − 2936 }
+ − 2937 }
+ − 2938 }
+ − 2939
+ − 2940 /**
+ − 2941 * Converts a permissions field into a string for database insertion. Similar in spirit to serialize().
+ − 2942 * @param array $perms An associative array with only integers as values
+ − 2943 * @return string
+ − 2944 */
+ − 2945
+ − 2946 function perm_to_string($perms)
+ − 2947 {
+ − 2948 $s = '';
+ − 2949 foreach($perms as $perm => $ac)
+ − 2950 {
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2951 if ( $ac == 'i' )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2952 continue;
1
+ − 2953 $s .= "$perm=$ac;";
+ − 2954 }
+ − 2955 return $s;
+ − 2956 }
+ − 2957
+ − 2958 /**
+ − 2959 * Converts a permissions string back to an array.
+ − 2960 * @param string $perms The result from sessionManager::perm_to_string()
+ − 2961 * @return array
+ − 2962 */
+ − 2963
+ − 2964 function string_to_perm($perms)
+ − 2965 {
+ − 2966 $ret = Array();
+ − 2967 preg_match_all('#([a-z0-9_-]+)=([0-9]+);#i', $perms, $matches);
+ − 2968 foreach($matches[1] as $i => $t)
+ − 2969 {
+ − 2970 $ret[$t] = intval($matches[2][$i]);
+ − 2971 }
+ − 2972 return $ret;
+ − 2973 }
+ − 2974
+ − 2975 /**
+ − 2976 * Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence over the first, but AUTH_DENY always prevails.
+ − 2977 * @param array $perm1 The first set of permissions
+ − 2978 * @param array $perm2 The second set of permissions
554
+ − 2979 * @param bool $is_everyone If true, applies exceptions for "Everyone" group
+ − 2980 * @param array|reference $defaults_used Array that will be filled with default usage data
1
+ − 2981 * @return array
+ − 2982 */
+ − 2983
570
+ − 2984 function acl_merge($perm1, $perm2, $is_everyone = false, &$defaults_used = array())
1
+ − 2985 {
+ − 2986 $ret = $perm1;
554
+ − 2987 if ( !is_array(@$defaults_used) )
+ − 2988 {
+ − 2989 $defaults_used = array();
+ − 2990 }
+ − 2991 foreach ( $perm1 as $i => $p )
1
+ − 2992 {
554
+ − 2993 if ( isset($perm2[$i]) )
1
+ − 2994 {
711
+ − 2995 if ( $is_everyone && isset($defaults_used[$i]) && $defaults_used[$i] === false )
554
+ − 2996 continue;
+ − 2997 // Decide precedence
+ − 2998 if ( isset($defaults_used[$i]) )
+ − 2999 {
+ − 3000 // echo "$i: default in use, overriding to: {$perm2[$i]}<br />";
+ − 3001 // Defaults are in use, override
+ − 3002
+ − 3003 // CHANGED - 1.1.4:
+ − 3004 // For some time this has been intentionally relaxed so that the following
+ − 3005 // exception is available to Deny permissions:
+ − 3006 // If the rule applies to the group "Everyone" on the entire site,
+ − 3007 // Deny settings could be overriden.
+ − 3008 // This is documented at: http://docs.enanocms.org/Help:4.2
+ − 3009 if ( $perm1[$i] != AUTH_DENY )
+ − 3010 {
+ − 3011 $perm1[$i] = $perm2[$i];
+ − 3012 $defaults_used[$i] = ( $is_everyone );
+ − 3013 }
+ − 3014 }
+ − 3015 else
+ − 3016 {
+ − 3017 // echo "$i: default NOT in use";
+ − 3018 // Defaults are not in use, merge as normal
+ − 3019 if ( $perm1[$i] != AUTH_DENY )
+ − 3020 {
+ − 3021 // echo ", but overriding";
+ − 3022 $perm1[$i] = $perm2[$i];
+ − 3023 }
+ − 3024 // echo "<br />";
+ − 3025 }
1
+ − 3026 }
+ − 3027 }
554
+ − 3028 return $perm1;
1
+ − 3029 }
+ − 3030
+ − 3031 /**
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3032 * Merges two ACL arrays, but instead of calculating inheritance for missing permission types, just returns 'i' for that type. Useful
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3033 * for explicitly requiring inheritance in ACL editing interfaces
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3034 * @param array $perm1 The first set of permissions
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3035 * @param array $perm2 The second, authoritative set of permissions
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3036 */
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3037
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3038 function acl_merge_inherit($perm1, $perm2)
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3039 {
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3040 foreach ( $perm1 as $type => $level )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3041 {
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3042 $perm1[$type][$level] = 'i';
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3043 }
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3044 $ret = $perm1;
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3045 foreach ( $perm2 as $type => $level )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3046 {
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3047 if ( isset( $ret[$type] ) )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3048 {
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3049 if ( $ret[$type] != AUTH_DENY )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3050 $ret[$type] = $level;
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3051 }
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3052 }
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3053 return $ret;
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3054 }
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3055
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 3056 /**
1
+ − 3057 * Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
+ − 3058 * @param array The array to merge into the master ACL list
+ − 3059 * @param bool If true, $perm is treated as the "new default"
+ − 3060 * @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
+ − 3061 */
+ − 3062
+ − 3063 function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
+ − 3064 {
554
+ − 3065 $this->perms = $this->acl_merge($this->perms, $perm, $is_everyone, $this->acl_defaults_used);
1
+ − 3066 }
+ − 3067
+ − 3068 /**
+ − 3069 * Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence
+ − 3070 * over the first, without exceptions. This is used to merge the hardcoded defaults with admin-specified
+ − 3071 * defaults, which take precedence.
+ − 3072 * @param array $perm1 The first set of permissions
+ − 3073 * @param array $perm2 The second set of permissions
+ − 3074 * @return array
+ − 3075 */
+ − 3076
+ − 3077 function acl_merge_complete($perm1, $perm2)
+ − 3078 {
+ − 3079 $ret = $perm1;
+ − 3080 foreach ( $perm2 as $type => $level )
+ − 3081 {
+ − 3082 $ret[$type] = $level;
+ − 3083 }
+ − 3084 return $ret;
+ − 3085 }
+ − 3086
+ − 3087 /**
+ − 3088 * Tell us if the dependencies for a given permission are met.
+ − 3089 * @param string The ACL permission ID
+ − 3090 * @return bool
+ − 3091 */
+ − 3092
+ − 3093 function acl_check_deps($type)
+ − 3094 {
+ − 3095 if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 3096 return true;
+ − 3097 if(sizeof($this->acl_deps[$type]) < 1)
+ − 3098 return true;
+ − 3099 $deps = $this->acl_deps[$type];
+ − 3100 while(true)
+ − 3101 {
+ − 3102 $full_resolved = true;
+ − 3103 $j = sizeof($deps);
+ − 3104 for ( $i = 0; $i < $j; $i++ )
+ − 3105 {
+ − 3106 $b = $deps;
+ − 3107 $deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 3108 if( $b == $deps )
+ − 3109 {
+ − 3110 break 2;
+ − 3111 }
+ − 3112 $j = sizeof($deps);
+ − 3113 }
+ − 3114 }
+ − 3115 //die('<pre>'.print_r($deps, true).'</pre>');
+ − 3116 foreach($deps as $d)
+ − 3117 {
+ − 3118 if ( !$this->get_permissions($d) )
+ − 3119 {
+ − 3120 return false;
+ − 3121 }
+ − 3122 }
+ − 3123 return true;
+ − 3124 }
+ − 3125
+ − 3126 /**
+ − 3127 * Makes a CAPTCHA code and caches the code in the database
+ − 3128 * @param int $len The length of the code, in bytes
402
+ − 3129 * @param string Optional, the hash to reuse
1
+ − 3130 * @return string A unique identifier assigned to the code. This hash should be passed to sessionManager::getCaptcha() to retrieve the code.
+ − 3131 */
+ − 3132
402
+ − 3133 function make_captcha($len = 7, $hash = '')
1
+ − 3134 {
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3135 global $db, $session, $paths, $template, $plugins; // Common objects
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3136 $code = $this->generate_captcha_code($len);
402
+ − 3137 if ( !preg_match('/^[a-f0-9]{32}([a-z0-9]{8})?$/', $hash) )
+ − 3138 $hash = md5(microtime() . mt_rand());
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3139 $session_data = $db->escape(serialize(array()));
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3140
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3141 // sanity check
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3142 if ( !is_valid_ip(@$_SERVER['REMOTE_ADDR']) || !is_int($this->user_id) )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3143 return false;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3144
402
+ − 3145 $this->sql('DELETE FROM ' . table_prefix . "captcha WHERE session_id = '$hash';");
+ − 3146 $this->sql('INSERT INTO ' . table_prefix . 'captcha(session_id, code, session_data, source_ip, user_id)' . " VALUES('$hash', '$code', '$session_data', '{$_SERVER['REMOTE_ADDR']}', {$this->user_id});");
1
+ − 3147 return $hash;
+ − 3148 }
+ − 3149
+ − 3150 /**
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3151 * Generates a "pronouncable" or "human-friendly" word using various phonics rules
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3152 * @param int Optional. The length of the word.
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3153 * @return string
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3154 */
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3155
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3156 function generate_captcha_code($len = 7)
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3157 {
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3158 // don't use k and x, they get mixed up a lot
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3159 $consonants = 'bcdfghmnpqrsvwyz';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3160 $vowels = 'aeiou';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3161 $prev = 'vowel';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3162 $prev_l = '';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3163 $word = '';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3164 $allow_next_vowel = true;
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3165 for ( $i = 0; $i < $len; $i++ )
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3166 {
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3167 if ( $prev == 'vowel' )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3168 {
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3169 $allow_next_vowel = false;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3170 if ( $prev_l == 'o' && mt_rand(0, 3) == 3 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3171 $word .= 'i';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3172 else if ( $prev_l == 'q' && mt_rand(0, 3) != 1 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3173 $word .= 'u';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3174 else if ( $prev_l == 'o' && mt_rand(0, 3) == 2 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3175 $word .= 'u';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3176 else if ( $prev_l == 'a' && mt_rand(0, 3) == 3 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3177 $word .= 'i';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3178 else if ( $prev_l == 'a' && mt_rand(0, 10) == 7 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3179 $word .= 'o';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3180 else if ( $prev_l == 'a' && mt_rand(0, 7) == 2 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3181 $word .= 'u';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3182 else
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3183 {
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3184 $allow_next_vowel = true;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3185 $word .= $consonants{mt_rand(0, (strlen($consonants)-1))};
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3186 }
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3187 }
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3188 else if ( $prev == 'consonant' )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3189 {
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3190 if ( $prev_l == 'p' && mt_rand(0, 7) == 4 )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3191 $word .= 't';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3192 else if ( $prev_l == 'p' && mt_rand(0, 5) == 1 )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3193 $word .= 'h';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3194 else
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3195 $word .= $vowels{mt_rand(0, (strlen($vowels)-1))};
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3196 }
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3197 $prev_l = substr($word, -1);
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3198 $l = ( mt_rand(0, 1) == 1 ) ? strtoupper($prev_l) : strtolower($prev_l);
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3199 $word = substr($word, 0, -1) . $l;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3200 if ( strstr('aeiou', $prev_l) )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3201 $prev = 'vowel';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3202 else
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3203 $prev = 'consonant';
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3204 }
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3205 return $word;
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3206 }
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3207
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3208 /**
1
+ − 3209 * For the given code ID, returns the correct CAPTCHA code, or false on failure
+ − 3210 * @param string $hash The unique ID assigned to the code
+ − 3211 * @return string The correct confirmation code
+ − 3212 */
+ − 3213
+ − 3214 function get_captcha($hash)
+ − 3215 {
+ − 3216 global $db, $session, $paths, $template, $plugins; // Common objects
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3217
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3218 if ( !preg_match('/^[a-f0-9]{32}([a-z0-9]{8})?$/', $hash) )
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3219 {
436
+ − 3220 die("session manager: bad captcha_hash $hash");
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3221 return false;
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3222 }
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3223
402
+ − 3224 // sanity check
436
+ − 3225 if ( !is_valid_ip(@$_SERVER['REMOTE_ADDR']) )
+ − 3226 {
+ − 3227 die("session manager insanity: bad REMOTE_ADDR or invalid UID");
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3228 return false;
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3229 }
402
+ − 3230
436
+ − 3231 $q = $this->sql('SELECT code_id, code FROM ' . table_prefix . "captcha WHERE session_id = '$hash' AND source_ip = '{$_SERVER['REMOTE_ADDR']}';");
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3232 if ( $db->numrows() < 1 )
436
+ − 3233 {
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3234 return false;
436
+ − 3235 }
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3236
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3237 list($code_id, $code) = $db->fetchrow_num();
436
+ − 3238
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3239 $db->free_result();
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3240 $this->sql('DELETE FROM ' . table_prefix . "captcha WHERE code_id = $code_id;");
436
+ − 3241
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 3242 return $code;
1
+ − 3243 }
+ − 3244
+ − 3245 /**
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3246 * (AS OF 1.0.2: Deprecated. Captcha codes are now killed on first fetch for security.) Deletes all CAPTCHA codes cached in the DB for this user.
1
+ − 3247 */
+ − 3248
+ − 3249 function kill_captcha()
+ − 3250 {
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 3251 return true;
1
+ − 3252 }
+ − 3253
+ − 3254 /**
+ − 3255 * Generates a random password.
+ − 3256 * @param int $length Optional - length of password
+ − 3257 * @return string
+ − 3258 */
+ − 3259
+ − 3260 function random_pass($length = 10)
+ − 3261 {
+ − 3262 $valid_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_+@#%&<>';
+ − 3263 $valid_chars = enano_str_split($valid_chars);
+ − 3264 $ret = '';
+ − 3265 for ( $i = 0; $i < $length; $i++ )
+ − 3266 {
+ − 3267 $ret .= $valid_chars[mt_rand(0, count($valid_chars)-1)];
+ − 3268 }
+ − 3269 return $ret;
+ − 3270 }
+ − 3271
+ − 3272 /**
+ − 3273 * Generates some Javascript that calls the AES encryption library.
+ − 3274 * @param string The name of the form
+ − 3275 * @param string The name of the password field
+ − 3276 * @param string The name of the field that switches encryption on or off
+ − 3277 * @param string The name of the field that contains the encryption key
+ − 3278 * @param string The name of the field that will contain the encrypted password
+ − 3279 * @param string The name of the field that handles MD5 challenge data
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3280 * @param string The name of the field that tells if the server supports DiffieHellman
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3281 * @param string The name of the field with the DiffieHellman public key
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3282 * @param string The name of the field that the client should populate with its public key
1
+ − 3283 * @return string
+ − 3284 */
+ − 3285
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3286 function aes_javascript($form_name, $pw_field, $use_crypt, $crypt_key, $crypt_data, $challenge, $dh_supported = false, $dh_pubkey = false, $dh_client_pubkey = false)
1
+ − 3287 {
+ − 3288 $code = '
+ − 3289 <script type="text/javascript">
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3290
1
+ − 3291 function runEncryption()
+ − 3292 {
691
+ − 3293 var frm = document.forms.'.$form_name.';
+ − 3294 whiteOutForm(frm);
+ − 3295
586
234ddd896555
Made encryption work in form-based logon again; modified load_component() to fetch compressed versions when possible
Dan
diff
changeset
+ − 3296 load_component(\'crypto\');
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3297 var testpassed = ' . ( ( isset($_GET['use_crypt']) && $_GET['use_crypt']=='0') ? 'false; // CRYPTO-AUTH DISABLED ON USER REQUEST // ' : '' ) . '( aes_self_test() && md5_vm_test() );
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3298 var use_diffiehellman = false;' . "\n";
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3299 if ( $dh_supported && $dh_pubkey )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3300 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3301 $code .= <<<EOF
542
5841df0ab575
Added ETag support and increased caching settings to try and speed the system up. Result of a YSlow audit.
Dan
diff
changeset
+ − 3302 if ( frm.$dh_supported.value == 'true' && !is_iPhone )
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3303 use_diffiehellman = true;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3304 EOF;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3305 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3306 $code .= '
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3307
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3308 if ( frm[\'' . $dh_supported . '\'] )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3309 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3310 frm[\'' . $dh_supported . '\'].value = ( use_diffiehellman ) ? "true" : "false";
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3311 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3312
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3313 if ( testpassed && use_diffiehellman )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3314 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3315 // try to blank out the table to prevent double submits and what have you
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3316 var el = frm.' . $pw_field . ';
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3317 while ( el.tagName != "BODY" && el.tagName != "TABLE" )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3318 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3319 el = el.parentNode;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3320 }
691
+ − 3321 /*
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3322 if ( el.tagName == "TABLE" )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3323 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3324 whiteOutElement(el);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3325 }
691
+ − 3326 */
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3327
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3328 frm.'.$use_crypt.'.value = \'yes_dh\';
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3329
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3330 // Perform Diffie Hellman stuff
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3331 // console.info("DiffieHellman: started keygen process");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3332 var dh_priv = dh_gen_private();
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3333 var dh_pub = dh_gen_public(dh_priv);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3334 var secret = dh_gen_shared_secret(dh_priv, frm.' . $dh_pubkey . '.value);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3335 // console.info("DiffieHellman: finished keygen process");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3336
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3337 // secret_hash is used to verify that the server guesses the correct secret
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3338 var secret_hash = hex_sha1(secret);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3339
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3340 // give the server our values
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3341 frm.' . $crypt_key . '.value = secret_hash;
629
+ − 3342 ' . ( $dh_supported ? 'frm.' . $dh_client_pubkey . '.value = dh_pub;' : '' ) . '
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3343
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3344 // console.info("DiffieHellman: set public values");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3345
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3346 // crypt_key is the actual AES key
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3347 var crypt_key = (hex_sha256(secret)).substr(0, (keySizeInBits / 4));
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3348
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3349 // Perform encryption
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3350 crypt_key = hexToByteArray(crypt_key);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3351 var pass = frm.'.$pw_field.'.value;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3352 pass = stringToByteArray(pass);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3353 var cryptstring = rijndaelEncrypt(pass, crypt_key, \'ECB\');
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3354 if(!cryptstring)
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3355 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3356 return false;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3357 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3358 cryptstring = byteArrayToHex(cryptstring);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3359 // console.info("DiffieHellman: finished AES");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3360 frm.'.$crypt_data.'.value = cryptstring;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3361 frm.'.$pw_field.'.value = \'\';
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3362 // console.info("DiffieHellman: ready to submit");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3363 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3364 else if ( testpassed && !use_diffiehellman )
1
+ − 3365 {
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
+ − 3366 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
+ − 3367 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
+ − 3368 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
+ − 3369 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
+ − 3370 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
+ − 3371 {
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
+ − 3372 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
+ − 3373 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
+ − 3374 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
+ − 3375 }
1
+ − 3376 pass = frm.'.$pw_field.'.value;
+ − 3377 chal = frm.'.$challenge.'.value;
+ − 3378 challenge = hex_md5(pass + chal) + chal;
+ − 3379 frm.'.$challenge.'.value = challenge;
+ − 3380 pass = stringToByteArray(pass);
+ − 3381 cryptstring = rijndaelEncrypt(pass, cryptkey, \'ECB\');
+ − 3382 if(!cryptstring)
+ − 3383 {
+ − 3384 return false;
+ − 3385 }
+ − 3386 cryptstring = byteArrayToHex(cryptstring);
+ − 3387 frm.'.$crypt_data.'.value = cryptstring;
+ − 3388 frm.'.$pw_field.'.value = \'\';
+ − 3389 }
+ − 3390 return false;
+ − 3391 }
+ − 3392 </script>
+ − 3393 ';
+ − 3394 return $code;
+ − 3395 }
+ − 3396
436
+ − 3397 /**
+ − 3398 * Backend code for the JSON login interface. Basically a frontend to the session API that takes all parameters in one huge array.
+ − 3399 * @param array LoginAPI request
+ − 3400 * @return array LoginAPI response
+ − 3401 */
+ − 3402
725
+ − 3403 function process_login_request($req, $_dbgtmp = false)
436
+ − 3404 {
+ − 3405 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 3406
+ − 3407 // Setup EnanoMath and Diffie-Hellman
+ − 3408 global $dh_supported;
725
+ − 3409 if ( !function_exists('dh_gen_private') )
436
+ − 3410 {
725
+ − 3411 require_once(ENANO_ROOT.'/includes/math.php');
+ − 3412
+ − 3413 $dh_supported = true;
+ − 3414 try
+ − 3415 {
+ − 3416 require_once(ENANO_ROOT . '/includes/diffiehellman.php');
+ − 3417 }
+ − 3418 catch ( Exception $e )
+ − 3419 {
+ − 3420 $dh_supported = false;
+ − 3421 }
436
+ − 3422 }
+ − 3423 global $_math;
+ − 3424
+ − 3425 // Check for the mode
+ − 3426 if ( !isset($req['mode']) )
+ − 3427 {
+ − 3428 return array(
+ − 3429 'mode' => 'error',
+ − 3430 'error' => 'ERR_JSON_NO_MODE'
+ − 3431 );
+ − 3432 }
+ − 3433
+ − 3434 // Main processing switch
+ − 3435 switch ( $req['mode'] )
+ − 3436 {
+ − 3437 default:
+ − 3438 return array(
+ − 3439 'mode' => 'error',
+ − 3440 'error' => 'ERR_JSON_INVALID_MODE'
+ − 3441 );
+ − 3442 break;
+ − 3443 case 'getkey':
+ − 3444
+ − 3445 $this->start();
+ − 3446
+ − 3447 // Query database for lockout info
+ − 3448 $locked_out = false;
+ − 3449 // are we locked out?
+ − 3450 $threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
+ − 3451 $duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
+ − 3452 // convert to minutes
+ − 3453 $duration = $duration * 60;
+ − 3454 $policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
+ − 3455 if ( $policy != 'disable' )
+ − 3456 {
+ − 3457 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
+ − 3458 $timestamp_cutoff = time() - $duration;
+ − 3459 $q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
+ − 3460 $fails = $db->numrows();
+ − 3461 $row = $db->fetchrow();
+ − 3462 $locked_out = ( $fails >= $threshold );
+ − 3463 $lockdata = array(
+ − 3464 'locked_out' => $locked_out,
+ − 3465 'lockout_threshold' => $threshold,
+ − 3466 'lockout_duration' => ( $duration / 60 ),
+ − 3467 'lockout_fails' => $fails,
+ − 3468 'lockout_policy' => $policy,
+ − 3469 'lockout_last_time' => $row['timestamp'],
+ − 3470 'time_rem' => ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ),
+ − 3471 'captcha' => ''
+ − 3472 );
+ − 3473 $db->free_result();
+ − 3474 }
+ − 3475
+ − 3476 $response = array('mode' => 'build_box');
+ − 3477 $response['allow_diffiehellman'] = $dh_supported;
+ − 3478
+ − 3479 $response['username'] = ( $this->user_logged_in ) ? $this->username : false;
+ − 3480 $response['aes_key'] = $this->rijndael_genkey();
+ − 3481
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 3482 $response['extended_time'] = intval(getConfig('session_remember_time', '30'));
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 3483
436
+ − 3484 // Lockout info
+ − 3485 $response['locked_out'] = $locked_out;
+ − 3486
+ − 3487 $response['lockout_info'] = $lockdata;
+ − 3488 if ( $policy == 'captcha' && $locked_out )
+ − 3489 {
+ − 3490 $response['lockout_info']['captcha'] = $this->make_captcha();
+ − 3491 }
+ − 3492
+ − 3493 // Can we do Diffie-Hellman? If so, generate and stash a public/private key pair.
+ − 3494 if ( $dh_supported )
+ − 3495 {
+ − 3496 $dh_key_priv = dh_gen_private();
+ − 3497 $dh_key_pub = dh_gen_public($dh_key_priv);
+ − 3498 $dh_key_priv = $_math->str($dh_key_priv);
+ − 3499 $dh_key_pub = $_math->str($dh_key_pub);
+ − 3500 $response['dh_public_key'] = $dh_key_pub;
+ − 3501 // store the keys in the DB
+ − 3502 $q = $db->sql_query('INSERT INTO ' . table_prefix . "diffiehellman( public_key, private_key ) VALUES ( '$dh_key_pub', '$dh_key_priv' );");
+ − 3503 if ( !$q )
+ − 3504 $db->die_json();
+ − 3505 }
+ − 3506
+ − 3507 return $response;
+ − 3508 break;
+ − 3509 case 'login_dh':
+ − 3510 // User is requesting a login and has sent Diffie-Hellman data.
+ − 3511
+ − 3512 //
+ − 3513 // KEY RECONSTRUCTION
+ − 3514 //
+ − 3515
+ − 3516 $userinfo_crypt = $req['userinfo'];
+ − 3517 $dh_public = $req['dh_public_key'];
+ − 3518 $dh_hash = $req['dh_secret_hash'];
+ − 3519
+ − 3520 // Check the key
+ − 3521 if ( !preg_match('/^[0-9]+$/', $dh_public) || !preg_match('/^[0-9]+$/', $req['dh_client_key']) )
+ − 3522 {
+ − 3523 return array(
+ − 3524 'mode' => 'error',
+ − 3525 'error' => 'ERR_DH_KEY_NOT_NUMERIC'
+ − 3526 );
+ − 3527 }
+ − 3528
+ − 3529 // Fetch private key
+ − 3530 $q = $db->sql_query('SELECT private_key, key_id FROM ' . table_prefix . "diffiehellman WHERE public_key = '$dh_public';");
+ − 3531 if ( !$q )
+ − 3532 $db->die_json();
+ − 3533
+ − 3534 if ( $db->numrows() < 1 )
+ − 3535 {
+ − 3536 return array(
+ − 3537 'mode' => 'error',
+ − 3538 'error' => 'ERR_DH_KEY_NOT_FOUND'
+ − 3539 );
+ − 3540 }
+ − 3541
+ − 3542 list($dh_private, $dh_key_id) = $db->fetchrow_num();
+ − 3543 $db->free_result();
+ − 3544
+ − 3545 // We have the private key, now delete the key pair, we no longer need it
+ − 3546 $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE key_id = $dh_key_id;");
+ − 3547 if ( !$q )
+ − 3548 $db->die_json();
+ − 3549
+ − 3550 // Generate the shared secret
+ − 3551 $dh_secret = dh_gen_shared_secret($dh_private, $req['dh_client_key']);
+ − 3552 $dh_secret = $_math->str($dh_secret);
+ − 3553
+ − 3554 // Did we get all our math right?
+ − 3555 $dh_secret_check = sha1($dh_secret);
+ − 3556 if ( $dh_secret_check !== $dh_hash )
+ − 3557 {
+ − 3558 return array(
+ − 3559 'mode' => 'error',
+ − 3560 'error' => 'ERR_DH_HASH_NO_MATCH'
+ − 3561 );
+ − 3562 }
+ − 3563
+ − 3564 // All good! Generate the AES key
+ − 3565 $aes_key = substr(sha256($dh_secret), 0, ( AES_BITS / 4 ));
+ − 3566 case 'login_aes':
+ − 3567 if ( $req['mode'] == 'login_aes' )
+ − 3568 {
+ − 3569 // login_aes-specific code
+ − 3570 $aes_key = $this->fetch_public_key($req['key_aes']);
+ − 3571 if ( !$aes_key )
+ − 3572 {
+ − 3573 return array(
+ − 3574 'mode' => 'error',
+ − 3575 'error' => 'ERR_AES_LOOKUP_FAILED'
+ − 3576 );
+ − 3577 }
+ − 3578 $userinfo_crypt = $req['userinfo'];
+ − 3579 }
+ − 3580 // shared between the two systems from here on out
+ − 3581
+ − 3582 // decrypt user info
+ − 3583 $aes_key = hexdecode($aes_key);
+ − 3584 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
518
+ − 3585 // using "true" here disables caching of the decrypted login info (which includes the password)
+ − 3586 $userinfo_json = $aes->decrypt($userinfo_crypt, $aes_key, ENC_HEX, true);
436
+ − 3587 if ( !$userinfo_json )
+ − 3588 {
+ − 3589 return array(
+ − 3590 'mode' => 'error',
+ − 3591 'error' => 'ERR_AES_DECRYPT_FAILED'
+ − 3592 );
+ − 3593 }
+ − 3594 // de-JSON user info
+ − 3595 try
+ − 3596 {
+ − 3597 $userinfo = enano_json_decode($userinfo_json);
+ − 3598 }
+ − 3599 catch ( Exception $e )
+ − 3600 {
+ − 3601 return array(
+ − 3602 'mode' => 'error',
+ − 3603 'error' => 'ERR_USERINFO_DECODE_FAILED'
+ − 3604 );
+ − 3605 }
+ − 3606
+ − 3607 if ( !isset($userinfo['username']) || !isset($userinfo['password']) )
+ − 3608 {
+ − 3609 return array(
+ − 3610 'mode' => 'error',
+ − 3611 'error' => 'ERR_USERINFO_MISSING_VALUES'
+ − 3612 );
+ − 3613 }
+ − 3614
+ − 3615 $username =& $userinfo['username'];
+ − 3616 $password =& $userinfo['password'];
+ − 3617
472
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3618 // If we're logging in with a temp password, attach to the login_password_reset hook to send our JSON response
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3619 // A bit hackish since it just dies with the response :-(
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3620 $plugins->attachHook('login_password_reset', '$this->process_login_request(array(\'mode\' => \'respond_password_reset\', \'user_id\' => $row[\'user_id\'], \'temp_password\' => $row[\'temp_password\']));');
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3621
436
+ − 3622 // attempt the login
+ − 3623 // function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false)
688
f2a824ce5f18
Added customizable parameters for session length and the long-missing "remember me" option (or rather, the ability to turn it off and make sessions temporary)
Dan
diff
changeset
+ − 3624 $login_result = $this->login_without_crypto($username, $password, false, intval($req['level']), @$req['captcha_hash'], @$req['captcha_code'], @$req['remember']);
436
+ − 3625
+ − 3626 if ( $login_result['success'] )
+ − 3627 {
+ − 3628 return array(
+ − 3629 'mode' => 'login_success',
+ − 3630 'key' => ( $this->sid_super ) ? $this->sid_super : false
+ − 3631 );
+ − 3632 }
+ − 3633 else
+ − 3634 {
+ − 3635 return array(
+ − 3636 'mode' => 'login_failure',
+ − 3637 'error_code' => $login_result['error'],
+ − 3638 // Use this to provide a way to respawn the login box
+ − 3639 'respawn_info' => $this->process_login_request(array('mode' => 'getkey'))
+ − 3640 );
+ − 3641 }
+ − 3642
+ − 3643 break;
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3644 case 'clean_key':
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3645 // Clean out a key, since it won't be used.
472
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3646 // This is called when the user clicks Cancel in the AJAX login interface.
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3647 if ( !empty($req['key_aes']) )
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3648 {
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3649 $this->fetch_public_key($req['key_aes']);
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3650 }
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3651 if ( !empty($req['key_dh']) )
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3652 {
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3653 $pk = $db->escape($req['key_dh']);
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3654 $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE public_key = '$pk';");
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3655 if ( !$q )
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3656 $db->die_json();
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3657 }
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3658 return array(
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3659 'mode' => 'noop'
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3660 );
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3661 break;
472
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3662 case 'respond_password_reset':
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3663 die(enano_json_encode(array(
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3664 'mode' => 'login_success_reset',
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3665 'user_id' => $req['user_id'],
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3666 'temp_password' => $req['temp_password'],
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3667 'respawn_info' => $this->process_login_request(array('mode' => 'getkey'))
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3668 )));
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3669 break;
436
+ − 3670 }
+ − 3671
+ − 3672 }
+ − 3673
1
+ − 3674 }
+ − 3675
+ − 3676 /**
+ − 3677 * Class used to fetch permissions for a specific page. Used internally by SessionManager.
+ − 3678 * @package Enano
+ − 3679 * @subpackage Session manager
+ − 3680 * @license http://www.gnu.org/copyleft/gpl.html
+ − 3681 * @access private
+ − 3682 */
+ − 3683
+ − 3684 class Session_ACLPageInfo {
+ − 3685
+ − 3686 /**
+ − 3687 * The page ID of this ACL info package
+ − 3688 * @var string
+ − 3689 */
+ − 3690
+ − 3691 var $page_id;
+ − 3692
+ − 3693 /**
+ − 3694 * The namespace of the page being checked
+ − 3695 * @var string
+ − 3696 */
+ − 3697
+ − 3698 var $namespace;
+ − 3699
+ − 3700 /**
+ − 3701 * Our list of permission types.
+ − 3702 * @access private
+ − 3703 * @var array
+ − 3704 */
+ − 3705
+ − 3706 var $acl_types = Array();
+ − 3707
+ − 3708 /**
+ − 3709 * The list of descriptions for the permission types
+ − 3710 * @var array
+ − 3711 */
+ − 3712
+ − 3713 var $acl_descs = Array();
+ − 3714
+ − 3715 /**
+ − 3716 * A list of dependencies for ACL types.
+ − 3717 * @var array
+ − 3718 */
+ − 3719
+ − 3720 var $acl_deps = Array();
+ − 3721
+ − 3722 /**
246
+ − 3723 * Our tell-all list of permissions. Do not even try to change this.
+ − 3724 * @access private
1
+ − 3725 * @var array
+ − 3726 */
+ − 3727
+ − 3728 var $perms = Array();
+ − 3729
+ − 3730 /**
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
+ − 3731 * 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
+ − 3732 * @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
+ − 3733 * @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
+ − 3734 */
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
+ − 3735
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
+ − 3736 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
+ − 3737
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
+ − 3738 /**
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3739 * Tracks whether Wiki Mode is on for the page we're operating on.
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3740 * @var bool
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3741 */
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3742
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3743 var $wiki_mode = false;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3744
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3745 /**
554
+ − 3746 * Tracks where permissions were calculated using the ACL_INHERIT_* constants. Layout:
+ − 3747 * array(
+ − 3748 * [permission_name] => array(
+ − 3749 * [src] => ACL_INHERIT_*
+ − 3750 * [rule_id] => integer
+ − 3751 * ),
+ − 3752 * ...
+ − 3753 * )
+ − 3754 *
+ − 3755 * @var array
+ − 3756 */
+ − 3757
+ − 3758 var $perm_resolve_table = array();
+ − 3759
+ − 3760 #
+ − 3761 # USER PARAMETERS
+ − 3762 #
+ − 3763
+ − 3764 /**
+ − 3765 * User ID
+ − 3766 * @var int
+ − 3767 */
+ − 3768
+ − 3769 var $user_id = 1;
+ − 3770
+ − 3771 /**
+ − 3772 * Group membership associative array (group_id => group_name)
+ − 3773 * @var array
+ − 3774 */
+ − 3775
+ − 3776 var $groups = array();
+ − 3777
+ − 3778 /**
1
+ − 3779 * Constructor.
+ − 3780 * @param string $page_id The ID of the page to check
+ − 3781 * @param string $namespace The namespace of the page to check.
+ − 3782 * @param array $acl_types List of ACL types
+ − 3783 * @param array $acl_descs List of human-readable descriptions for permissions (associative)
+ − 3784 * @param array $acl_deps List of dependencies for permissions. For example, viewing history/diffs depends on the ability to read the page.
+ − 3785 * @param array $base What to start with - this is an attempt to reduce the number of SQL queries.
554
+ − 3786 * @param int|string $user_id_or_name Username or ID to search for, defaults to current user
+ − 3787 * @param array $resolve_table Debugging info for tracking where rules came from, defaults to a blank array.
1
+ − 3788 */
+ − 3789
554
+ − 3790 function __construct($page_id, $namespace, $acl_types, $acl_descs, $acl_deps, $base, $user_id = null, $groups = null, $resolve_table = array())
1
+ − 3791 {
+ − 3792 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 3793
554
+ − 3794 // hack
+ − 3795 if ( isset($base['__resolve_table']) )
+ − 3796 {
+ − 3797 unset($base['__resolve_table']);
+ − 3798 }
+ − 3799
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3800 foreach ( $acl_types as $perm_type => $_ )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3801 {
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3802 if ( !$session->check_acl_scope($perm_type, $namespace) )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3803 {
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3804 unset($acl_types[$perm_type]);
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3805 unset($acl_deps[$perm_type]);
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3806 unset($acl_descs[$perm_type]);
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3807 unset($base[$perm_type]);
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3808 }
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3809 }
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3810
1
+ − 3811 $this->acl_deps = $acl_deps;
+ − 3812 $this->acl_types = $acl_types;
+ − 3813 $this->acl_descs = $acl_descs;
+ − 3814
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
+ − 3815 $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
+ − 3816 $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
+ − 3817
554
+ − 3818 $this->perm_resolve_table = array();
+ − 3819 if ( is_array($resolve_table) )
+ − 3820 $this->perm_resolve_table = $resolve_table;
+ − 3821
+ − 3822 if ( is_int($user_id) && is_array($groups) )
+ − 3823 {
+ − 3824 $this->user_id = $user_id;
+ − 3825 $this->groups = $groups;
+ − 3826 }
+ − 3827 else
+ − 3828 {
+ − 3829 $this->user_id = $session->user_id;
+ − 3830 $this->groups = $session->groups;
+ − 3831 }
+ − 3832
+ − 3833 $this->page_id = $page_id;
+ − 3834 $this->namespace = $namespace;
+ − 3835
+ − 3836 $this->__calculate();
+ − 3837 }
+ − 3838
+ − 3839 /**
+ − 3840 * Performs the actual permission calculation.
+ − 3841 * @access private
+ − 3842 */
+ − 3843
+ − 3844 private function __calculate()
+ − 3845 {
+ − 3846 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 3847
+ − 3848 $page_id =& $this->page_id;
+ − 3849 $namespace =& $this->namespace;
+ − 3850
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
+ − 3851 // 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
+ − 3852 $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
+ − 3853 $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
+ − 3854 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
+ − 3855 {
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
+ − 3856 $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
+ − 3857 }
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
+ − 3858
1
+ − 3859 // Build a query to grab ACL info
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3860 $bs = 'SELECT rules,target_type,target_id,page_id,namespace,rule_id,pg.pg_name,g.group_name FROM '.table_prefix."acl AS a\n"
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3861 . " LEFT JOIN " . table_prefix . "page_groups AS pg\n"
618
+ − 3862 . " ON ( ( a.page_id = CAST(pg.pg_id AS char) AND a.namespace = '__PageGroup' ) OR ( a.namespace != '__PageGroup' ) )\n"
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3863 . " LEFT JOIN " . table_prefix . "groups AS g\n"
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3864 . " ON ( ( a.target_type = " . ACL_TYPE_GROUP . " AND a.target_id = g.group_id ) OR ( a.target_type != " . ACL_TYPE_GROUP . " ) )\n";
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3865
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3866 $bs .= ' WHERE ' . "\n"
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 3867 . ' ( ';
1
+ − 3868 $q = Array();
554
+ − 3869 $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 3870 if(count($this->groups) > 0)
1
+ − 3871 {
554
+ − 3872 foreach($this->groups as $g_id => $g_name)
1
+ − 3873 {
+ − 3874 $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 3875 }
+ − 3876 }
+ − 3877 // 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
+ − 3878 // permissions to override group permissions.
554
+ − 3879 $bs .= implode(" OR\n ", $q) . ' ) AND (' . $pg_info . ' ( page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\' ) )
1
+ − 3880 ORDER BY target_type ASC, page_id ASC, namespace ASC;';
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3881
1
+ − 3882 $q = $session->sql($bs);
+ − 3883 if ( $row = $db->fetchrow() )
+ − 3884 {
+ − 3885 do {
+ − 3886 $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
+ − 3887 $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
554
+ − 3888 // log where this comes from
+ − 3889 if ( $row['namespace'] == '__PageGroup' )
+ − 3890 {
+ − 3891 $src = ( $is_everyone ) ? ACL_INHERIT_PG_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_PG_GROUP : ACL_INHERIT_PG_USER );
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3892 $pg_name = $row['pg_name'];
554
+ − 3893 }
+ − 3894 else
+ − 3895 {
+ − 3896 $src = ( $is_everyone ) ? ACL_INHERIT_LOCAL_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_LOCAL_GROUP : ACL_INHERIT_LOCAL_USER );
+ − 3897 }
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3898 if ( $row['group_name'] )
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3899 {
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3900 $group_name = $row['group_name'];
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3901 }
554
+ − 3902 foreach ( $rules as $perm_type => $perm_value )
+ − 3903 {
576
+ − 3904 if ( !isset($this->perms[$perm_type]) )
+ − 3905 continue;
+ − 3906
554
+ − 3907 if ( $this->perms[$perm_type] == AUTH_DENY )
+ − 3908 continue;
+ − 3909
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3910 if ( !$session->check_acl_scope($perm_type, $this->namespace) )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3911 continue;
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 3912
554
+ − 3913 $this->perm_resolve_table[$perm_type] = array(
+ − 3914 'src' => $src,
+ − 3915 'rule_id' => $row['rule_id']
+ − 3916 );
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3917 if ( isset($pg_name) )
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3918 {
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3919 $this->perm_resolve_table[$perm_type]['pg_name'] = $pg_name;
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3920 }
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3921 if ( isset($group_name) )
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3922 {
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3923 $this->perm_resolve_table[$perm_type]['group_name'] = $group_name;
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
diff
changeset
+ − 3924 }
554
+ − 3925 }
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
+ − 3926 $this->acl_merge_with_current($rules, $is_everyone);
1
+ − 3927 } while ( $row = $db->fetchrow() );
+ − 3928 }
+ − 3929
+ − 3930 $this->page_id = $page_id;
+ − 3931 $this->namespace = $namespace;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3932
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3933 $pathskey = $paths->nslist[$this->namespace].$this->page_id;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3934 $ppwm = 2;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3935 if ( isset($paths->pages[$pathskey]) )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3936 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3937 if ( isset($paths->pages[$pathskey]['wiki_mode']) )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3938 $ppwm = $paths->pages[$pathskey]['wiki_mode'];
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3939 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3940 if ( $ppwm == 1 && ( $session->user_logged_in || getConfig('wiki_mode_require_login') != '1' ) )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3941 $this->wiki_mode = true;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3942 else if ( $ppwm == 1 && !$session->user_logged_in && getConfig('wiki_mode_require_login') == '1' )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3943 $this->wiki_mode = true;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3944 else if ( $ppwm == 0 )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3945 $this->wiki_mode = false;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3946 else if ( $ppwm == 2 )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3947 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3948 if ( $session->user_logged_in )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3949 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3950 $this->wiki_mode = ( getConfig('wiki_mode') == '1' );
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3951 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3952 else
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3953 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3954 $this->wiki_mode = ( getConfig('wiki_mode') == '1' && getConfig('wiki_mode_require_login') != '1' );
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3955 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3956 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3957 else
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3958 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3959 // Ech. Internal logic failure, this should never happen.
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3960 return false;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3961 }
1
+ − 3962 }
+ − 3963
+ − 3964 /**
+ − 3965 * Tells us whether permission $type is allowed or not based on the current rules.
+ − 3966 * @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 3967 * @param bool $no_deps If true, disables dependency checking
+ − 3968 * @return bool True if allowed, false if denied or if an error occured
+ − 3969 */
+ − 3970
+ − 3971 function get_permissions($type, $no_deps = false)
+ − 3972 {
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
+ − 3973 // echo '<pre>' . print_r($this->perms, true) . '</pre>';
1
+ − 3974 global $db, $session, $paths, $template, $plugins; // Common objects
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3975
1
+ − 3976 if ( isset( $this->perms[$type] ) )
+ − 3977 {
+ − 3978 if ( $this->perms[$type] == AUTH_DENY )
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3979 {
1
+ − 3980 $ret = false;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3981 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3982 else if ( $this->perms[$type] == AUTH_WIKIMODE && $this->wiki_mode )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3983 {
1
+ − 3984 $ret = true;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3985 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3986 else if ( $this->perms[$type] == AUTH_WIKIMODE && !$this->wiki_mode )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3987 {
1
+ − 3988 $ret = false;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3989 }
1
+ − 3990 else if ( $this->perms[$type] == AUTH_ALLOW )
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3991 {
1
+ − 3992 $ret = true;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3993 }
1
+ − 3994 else if ( $this->perms[$type] == AUTH_DISALLOW )
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3995 {
1
+ − 3996 $ret = false;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3997 }
1
+ − 3998 }
+ − 3999 else if(isset($this->acl_types[$type]))
+ − 4000 {
+ − 4001 if ( $this->acl_types[$type] == AUTH_DENY )
+ − 4002 $ret = false;
+ − 4003 else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 4004 $ret = true;
+ − 4005 else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 4006 $ret = false;
+ − 4007 else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 4008 $ret = true;
+ − 4009 else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 4010 $ret = false;
+ − 4011 }
+ − 4012 else
+ − 4013 {
+ − 4014 // ACL type is undefined
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4015 $caller = 'unknown';
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4016 if ( function_exists('debug_backtrace') )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4017 {
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4018 if ( $bt = @debug_backtrace() )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4019 {
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4020 foreach ( $bt as $trace )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4021 {
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4022 $file = basename($trace['file']);
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4023 if ( $file != 'sessions.php' )
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4024 {
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4025 $caller = $file . ':' . $trace['line'];
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4026 break;
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4027 }
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4028 }
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4029 }
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4030 }
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
diff
changeset
+ − 4031 trigger_error('Unknown access type "' . $type . '", called from ' . $caller . '', E_USER_WARNING);
1
+ − 4032 return false; // Be on the safe side and deny access
+ − 4033 }
+ − 4034 if ( !$no_deps )
+ − 4035 {
+ − 4036 if ( !$this->acl_check_deps($type) )
+ − 4037 return false;
+ − 4038 }
+ − 4039 return $ret;
+ − 4040 }
+ − 4041
+ − 4042 /**
+ − 4043 * Tell us if the dependencies for a given permission are met.
+ − 4044 * @param string The ACL permission ID
+ − 4045 * @return bool
+ − 4046 */
+ − 4047
+ − 4048 function acl_check_deps($type)
+ − 4049 {
+ − 4050 if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 4051 return true;
+ − 4052 if(sizeof($this->acl_deps[$type]) < 1)
+ − 4053 return true;
+ − 4054 $deps = $this->acl_deps[$type];
+ − 4055 while(true)
+ − 4056 {
+ − 4057 $full_resolved = true;
+ − 4058 $j = sizeof($deps);
+ − 4059 for ( $i = 0; $i < $j; $i++ )
+ − 4060 {
+ − 4061 $b = $deps;
+ − 4062 $deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 4063 if( $b == $deps )
+ − 4064 {
+ − 4065 break 2;
+ − 4066 }
+ − 4067 $j = sizeof($deps);
+ − 4068 }
+ − 4069 }
+ − 4070 //die('<pre>'.print_r($deps, true).'</pre>');
+ − 4071 foreach($deps as $d)
+ − 4072 {
+ − 4073 if ( !$this->get_permissions($d) )
+ − 4074 {
+ − 4075 return false;
+ − 4076 }
+ − 4077 }
+ − 4078 return true;
+ − 4079 }
+ − 4080
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
+ − 4081 /**
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
+ − 4082 * 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
+ − 4083 * @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
+ − 4084 * @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
+ − 4085 * @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
+ − 4086 */
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
+ − 4087
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
+ − 4088 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
+ − 4089 {
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
+ − 4090 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
+ − 4091 {
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
+ − 4092 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
+ − 4093 {
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 4094 if ( $is_everyone && !@$this->acl_defaults_used[$i] )
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
+ − 4095 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
+ − 4096 // 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
+ − 4097 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
+ − 4098 {
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
+ − 4099 //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
+ − 4100 // 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
+ − 4101 $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
+ − 4102 $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
+ − 4103 }
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
+ − 4104 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
+ − 4105 {
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
+ − 4106 //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
+ − 4107 // 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
+ − 4108 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
+ − 4109 {
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
+ − 4110 //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
+ − 4111 $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
+ − 4112 }
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
+ − 4113 //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
+ − 4114 }
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
+ − 4115 }
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
+ − 4116 }
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
+ − 4117 }
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
+ − 4118
1
+ − 4119 }
+ − 4120
466
+ − 4121 /**
+ − 4122 * Cron task - clears out the database of Diffie-Hellman keys
+ − 4123 */
+ − 4124
+ − 4125 function cron_clean_login_cache()
+ − 4126 {
+ − 4127 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 4128
+ − 4129 if ( !$db->sql_query('DELETE FROM ' . table_prefix . 'diffiehellman;') )
+ − 4130 $db->_die();
+ − 4131
+ − 4132 setConfig('login_key_cache', '');
+ − 4133 }
+ − 4134
+ − 4135 register_cron_task('cron_clean_login_cache', 72);
+ − 4136
480
+ − 4137 /**
+ − 4138 * Cron task - clears out outdated high-auth session keys
+ − 4139 */
+ − 4140
+ − 4141 function cron_clean_old_admin_keys()
+ − 4142 {
+ − 4143 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 4144
+ − 4145 $threshold = time() - ( 15 * 60 );
+ − 4146 $ul_member = USER_LEVEL_MEMBER;
+ − 4147 if ( !$db->sql_query('DELETE FROM ' . table_prefix . "session_keys WHERE time < $threshold AND auth_level > $ul_member;") )
+ − 4148 $db->_die();
+ − 4149 }
+ − 4150
+ − 4151 // Once a week
+ − 4152 register_cron_task('cron_clean_old_admin_keys', 168);
+ − 4153
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 4154 /**
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 4155 * Cron task - regenerate cached user rank information
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 4156 */
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 4157
573
43e7254afdb4
Renamed some functions (that were new in this release anyway) due to compatibility broken with PunBB bridge
Dan
diff
changeset
+ − 4158 register_cron_task('generate_cache_userranks', 0.25);
541
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
diff
changeset
+ − 4159
1
+ − 4160 ?>