author | Dan |
Fri, 26 Feb 2010 12:59:24 -0500 | |
changeset 1229 | 17f206fe1d2e |
parent 1216 | 4125e19d3b27 |
child 1227 | bdac73ed481e |
permissions | -rw-r--r-- |
1 | 1 |
<?php |
2 |
||
3 |
/* |
|
4 |
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between |
|
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
5 |
* Copyright (C) 2006-2009 Dan Fuhry |
1 | 6 |
* sessions.php - everything related to security and user management |
7 |
* |
|
8 |
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License |
|
9 |
* as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. |
|
10 |
* |
|
11 |
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied |
|
12 |
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. |
|
13 |
*/ |
|
14 |
||
15 |
/** |
|
16 |
* Anything and everything related to security and user management. This includes AES encryption, which is illegal in some countries. |
|
17 |
* Documenting the API was not easy - I hope you folks enjoy it. |
|
18 |
* @package Enano |
|
19 |
* @subpackage Session manager |
|
20 |
* @category security, user management, logins, etc. |
|
21 |
*/ |
|
22 |
||
23 |
class sessionManager { |
|
24 |
||
25 |
# Variables |
|
26 |
||
27 |
/** |
|
28 |
* Whether we're logged in or not |
|
29 |
* @var bool |
|
30 |
*/ |
|
31 |
||
32 |
var $user_logged_in = false; |
|
33 |
||
34 |
/** |
|
35 |
* Our current low-privilege session key |
|
36 |
* @var string |
|
37 |
*/ |
|
38 |
||
39 |
var $sid; |
|
40 |
||
41 |
/** |
|
42 |
* Username of currently logged-in user, or IP address if not logged in |
|
43 |
* @var string |
|
44 |
*/ |
|
45 |
||
46 |
var $username; |
|
47 |
||
48 |
/** |
|
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
49 |
* User ID of currently logged-in user, or 1 if not logged in |
1 | 50 |
* @var int |
51 |
*/ |
|
52 |
||
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
53 |
var $user_id = 1; |
1 | 54 |
|
55 |
/** |
|
56 |
* Real name of currently logged-in user, or blank if not logged in |
|
57 |
* @var string |
|
58 |
*/ |
|
59 |
||
60 |
var $real_name; |
|
61 |
||
62 |
/** |
|
63 |
* E-mail address of currently logged-in user, or blank if not logged in |
|
64 |
* @var string |
|
65 |
*/ |
|
66 |
||
67 |
var $email; |
|
68 |
||
69 |
/** |
|
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
70 |
* List of "extra" user information fields (IM handles, etc.) |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
71 |
* @var array (associative) |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
72 |
*/ |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
73 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
74 |
var $user_extra; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
75 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
76 |
/** |
1 | 77 |
* User level of current user |
78 |
* USER_LEVEL_GUEST: guest |
|
79 |
* USER_LEVEL_MEMBER: regular user |
|
80 |
* USER_LEVEL_CHPREF: default - pseudo-level that allows changing password and e-mail address (requires re-authentication) |
|
81 |
* USER_LEVEL_MOD: moderator |
|
82 |
* USER_LEVEL_ADMIN: administrator |
|
83 |
* @var int |
|
84 |
*/ |
|
85 |
||
86 |
var $user_level; |
|
87 |
||
88 |
/** |
|
89 |
* High-privilege session key |
|
90 |
* @var string or false if not running on high-level authentication |
|
91 |
*/ |
|
92 |
||
93 |
var $sid_super; |
|
94 |
||
95 |
/** |
|
96 |
* The user's theme preference, defaults to $template->default_theme |
|
97 |
* @var string |
|
98 |
*/ |
|
99 |
||
100 |
var $theme; |
|
101 |
||
102 |
/** |
|
103 |
* The user's style preference, or style auto-detected based on theme if not logged in |
|
104 |
* @var string |
|
105 |
*/ |
|
106 |
||
107 |
var $style; |
|
108 |
||
109 |
/** |
|
110 |
* Signature of current user - appended to comments, etc. |
|
111 |
* @var string |
|
112 |
*/ |
|
113 |
||
114 |
var $signature; |
|
115 |
||
116 |
/** |
|
117 |
* UNIX timestamp of when we were registered, or 0 if not logged in |
|
118 |
* @var int |
|
119 |
*/ |
|
120 |
||
121 |
var $reg_time; |
|
122 |
||
123 |
/** |
|
124 |
* The number of unread private messages this user has. |
|
125 |
* @var int |
|
126 |
*/ |
|
127 |
||
128 |
var $unread_pms = 0; |
|
129 |
||
130 |
/** |
|
591
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
131 |
* AES key used to encrypt passwords and session key info. |
1 | 132 |
* @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
parents:
590
diff
changeset
|
133 |
* @access private |
1 | 134 |
*/ |
135 |
||
591
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
136 |
protected $private_key; |
1 | 137 |
|
138 |
/** |
|
139 |
* Regex that defines a valid username, minus the ^ and $, these are added later |
|
140 |
* @var string |
|
141 |
*/ |
|
142 |
||
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
143 |
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
parents:
536
diff
changeset
|
144 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
145 |
/** |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
146 |
* 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
parents:
536
diff
changeset
|
147 |
* @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
parents:
536
diff
changeset
|
148 |
*/ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
149 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
150 |
var $user_title = null; |
1 | 151 |
|
152 |
/** |
|
153 |
* What we're allowed to do as far as permissions go. This changes based on the value of the "auth" URI param. |
|
154 |
* @var string |
|
155 |
*/ |
|
156 |
||
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
157 |
var $auth_level = 1; |
1 | 158 |
|
159 |
/** |
|
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
160 |
* Preference for date formatting |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
161 |
* @var string |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
162 |
*/ |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
163 |
|
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
164 |
var $date_format = DATE_4; |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
165 |
|
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
166 |
/** |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
167 |
* Preference for time formatting |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
168 |
* @var string |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
169 |
*/ |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
170 |
|
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
171 |
var $time_format = TIME_24_NS; |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
172 |
|
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
173 |
/** |
1 | 174 |
* State variable to track if a session timed out |
175 |
* @var bool |
|
176 |
*/ |
|
177 |
||
178 |
var $sw_timed_out = false; |
|
179 |
||
180 |
/** |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
181 |
* Token appended to some important forms to prevent CSRF. |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
182 |
* @var string |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
183 |
*/ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
184 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
185 |
var $csrf_token = false; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
186 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
187 |
/** |
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
188 |
* Password change disabled, for auth plugins |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
189 |
* @var bool |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
190 |
*/ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
191 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
192 |
var $password_change_disabled = false; |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
193 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
194 |
/** |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
195 |
* Password change page URL + title, for auth plugins |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
196 |
* @var array |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
197 |
*/ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
198 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
199 |
var $password_change_dest = array('url' => '', 'title' => ''); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
200 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
201 |
/** |
1 | 202 |
* Switch to track if we're started or not. |
203 |
* @access private |
|
204 |
* @var bool |
|
205 |
*/ |
|
206 |
||
207 |
var $started = false; |
|
208 |
||
209 |
/** |
|
210 |
* Switch to control compatibility mode (for older Enano websites being upgraded) |
|
211 |
* @access private |
|
212 |
* @var bool |
|
213 |
*/ |
|
214 |
||
215 |
var $compat = false; |
|
216 |
||
217 |
/** |
|
218 |
* Our list of permission types. |
|
219 |
* @access private |
|
220 |
* @var array |
|
221 |
*/ |
|
222 |
||
223 |
var $acl_types = Array(); |
|
224 |
||
225 |
/** |
|
226 |
* The list of descriptions for the permission types |
|
227 |
* @var array |
|
228 |
*/ |
|
229 |
||
230 |
var $acl_descs = Array(); |
|
231 |
||
232 |
/** |
|
233 |
* A list of dependencies for ACL types. |
|
234 |
* @var array |
|
235 |
*/ |
|
236 |
||
237 |
var $acl_deps = Array(); |
|
238 |
||
239 |
/** |
|
246
c9fd175289aa
Cleaned up some HTML in the installer; corrected some phpDoc syntax errors
Dan
parents:
203
diff
changeset
|
240 |
* Our tell-all list of permissions. Do not even try to change this. |
c9fd175289aa
Cleaned up some HTML in the installer; corrected some phpDoc syntax errors
Dan
parents:
203
diff
changeset
|
241 |
* @access private |
1 | 242 |
* @var array |
243 |
*/ |
|
244 |
||
245 |
var $perms = Array(); |
|
246 |
||
247 |
/** |
|
248 |
* A cache variable - saved after sitewide permissions are checked but before page-specific permissions. |
|
249 |
* @var array |
|
250 |
* @access private |
|
251 |
*/ |
|
252 |
||
253 |
var $acl_base_cache = Array(); |
|
254 |
||
255 |
/** |
|
256 |
* Stores the scope information for ACL types. |
|
257 |
* @var array |
|
258 |
* @access private |
|
259 |
*/ |
|
260 |
||
261 |
var $acl_scope = Array(); |
|
262 |
||
263 |
/** |
|
264 |
* Array to track which default permissions are being used |
|
265 |
* @var array |
|
266 |
* @access private |
|
267 |
*/ |
|
268 |
||
269 |
var $acl_defaults_used = Array(); |
|
270 |
||
271 |
/** |
|
272 |
* Array to track group membership. |
|
273 |
* @var array |
|
274 |
*/ |
|
275 |
||
276 |
var $groups = Array(); |
|
277 |
||
278 |
/** |
|
279 |
* Associative array to track group modship. |
|
280 |
* @var array |
|
281 |
*/ |
|
282 |
||
283 |
var $group_mod = Array(); |
|
284 |
||
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
parents:
536
diff
changeset
|
285 |
/** |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
286 |
* 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
parents:
536
diff
changeset
|
287 |
* @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
parents:
536
diff
changeset
|
288 |
*/ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
289 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
290 |
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
parents:
536
diff
changeset
|
291 |
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
parents:
536
diff
changeset
|
292 |
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
parents:
536
diff
changeset
|
293 |
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
parents:
536
diff
changeset
|
294 |
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
parents:
536
diff
changeset
|
295 |
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
parents:
536
diff
changeset
|
296 |
); |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
297 |
|
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
298 |
/** |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
299 |
* 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
parents:
555
diff
changeset
|
300 |
* @var array |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
301 |
*/ |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
302 |
|
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
303 |
var $acl_inherit_lang_table = array( |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
304 |
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
parents:
555
diff
changeset
|
305 |
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
parents:
555
diff
changeset
|
306 |
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
parents:
555
diff
changeset
|
307 |
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
parents:
555
diff
changeset
|
308 |
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
parents:
555
diff
changeset
|
309 |
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
parents:
555
diff
changeset
|
310 |
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
parents:
555
diff
changeset
|
311 |
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
parents:
555
diff
changeset
|
312 |
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
parents:
555
diff
changeset
|
313 |
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
parents:
555
diff
changeset
|
314 |
); |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
315 |
|
1 | 316 |
# Basic functions |
317 |
||
318 |
/** |
|
319 |
* Constructor. |
|
320 |
*/ |
|
321 |
||
322 |
function __construct() |
|
323 |
{ |
|
324 |
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
parents:
263
diff
changeset
|
325 |
|
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
parents:
286
diff
changeset
|
326 |
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
parents:
263
diff
changeset
|
327 |
{ |
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
parents:
263
diff
changeset
|
328 |
@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
parents:
263
diff
changeset
|
329 |
} |
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
parents:
263
diff
changeset
|
330 |
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
parents:
263
diff
changeset
|
331 |
{ |
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
parents:
263
diff
changeset
|
332 |
@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
parents:
263
diff
changeset
|
333 |
} |
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
parents:
263
diff
changeset
|
334 |
|
1 | 335 |
unset($dbhost, $dbname, $dbuser, $dbpasswd); |
336 |
if(isset($crypto_key)) |
|
337 |
{ |
|
338 |
$this->private_key = $crypto_key; |
|
339 |
$this->private_key = hexdecode($this->private_key); |
|
340 |
} |
|
341 |
else |
|
342 |
{ |
|
343 |
if(is_writable(ENANO_ROOT.'/config.php')) |
|
344 |
{ |
|
345 |
// Generate and stash a private key |
|
346 |
// 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
parents:
270
diff
changeset
|
347 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
1 | 348 |
$this->private_key = $aes->gen_readymade_key(); |
349 |
||
350 |
$config = file_get_contents(ENANO_ROOT.'/config.php'); |
|
351 |
if(!$config) |
|
352 |
{ |
|
353 |
die('$session->__construct(): can\'t get the contents of config.php'); |
|
354 |
} |
|
355 |
||
356 |
$config = str_replace("?>", "\$crypto_key = '{$this->private_key}';\n?>", $config); |
|
357 |
// And while we're at it... |
|
358 |
$config = str_replace('MIDGET_INSTALLED', 'ENANO_INSTALLED', $config); |
|
359 |
$fh = @fopen(ENANO_ROOT.'/config.php', 'w'); |
|
360 |
if ( !$fh ) |
|
361 |
{ |
|
362 |
die('$session->__construct(): Couldn\'t open config file for writing to store the private key, I tried to avoid something like this...'); |
|
363 |
} |
|
364 |
||
365 |
fwrite($fh, $config); |
|
366 |
fclose($fh); |
|
367 |
} |
|
368 |
else |
|
369 |
{ |
|
370 |
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>'); |
|
371 |
} |
|
372 |
} |
|
373 |
// Check for compatibility mode |
|
374 |
if(defined('IN_ENANO_INSTALL')) |
|
375 |
{ |
|
376 |
$q = $db->sql_query('SELECT old_encryption FROM '.table_prefix.'users LIMIT 1;'); |
|
377 |
if(!$q) |
|
378 |
{ |
|
379 |
$error = mysql_error(); |
|
380 |
if(strstr($error, "Unknown column 'old_encryption'")) |
|
381 |
$this->compat = true; |
|
382 |
else |
|
383 |
$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)'); |
|
384 |
} |
|
385 |
$db->free_result(); |
|
386 |
} |
|
387 |
} |
|
388 |
||
389 |
/** |
|
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
parents:
340
diff
changeset
|
390 |
* PHP 4 compatible constructor. Deprecated in 1.1.x. |
1 | 391 |
*/ |
392 |
||
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
parents:
340
diff
changeset
|
393 |
/* |
1 | 394 |
function sessionManager() |
395 |
{ |
|
396 |
$this->__construct(); |
|
397 |
} |
|
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
parents:
340
diff
changeset
|
398 |
*/ |
1 | 399 |
|
400 |
/** |
|
401 |
* Wrapper function to sanitize strings for MySQL and HTML |
|
402 |
* @param string $text The text to sanitize |
|
403 |
* @return string |
|
404 |
*/ |
|
405 |
||
406 |
function prepare_text($text) |
|
407 |
{ |
|
408 |
global $db; |
|
409 |
return $db->escape(htmlspecialchars($text)); |
|
410 |
} |
|
411 |
||
412 |
/** |
|
413 |
* Makes a SQL query and handles error checking |
|
414 |
* @param string $query The SQL query to make |
|
415 |
* @return resource |
|
416 |
*/ |
|
417 |
||
418 |
function sql($query) |
|
419 |
{ |
|
420 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
421 |
$result = $db->sql_query($query); |
|
422 |
if(!$result) |
|
423 |
{ |
|
424 |
$db->_die('The error seems to have occurred somewhere in the session management code.'); |
|
425 |
} |
|
426 |
return $result; |
|
427 |
} |
|
428 |
||
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
429 |
/** |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
430 |
* Returns true if we're currently on a page that shouldn't be blocked even if we have an inactive or banned account |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
431 |
* @param bool strict - if true, whitelist of pages is even stricter (Login, Logout and CSS only). if false (default), admin access is allowed, assuming other factors allow it |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
432 |
* @return bool |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
433 |
*/ |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
434 |
|
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
435 |
function on_critical_page($strict = false) |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
436 |
{ |
1205
c922ef08167a
Sessions: fixed on_critical_page(), it referenced the wrong global; enabled better extensible behavior in the account_active column
Dan
parents:
1176
diff
changeset
|
437 |
global $urlname; |
c922ef08167a
Sessions: fixed on_critical_page(), it referenced the wrong global; enabled better extensible behavior in the account_active column
Dan
parents:
1176
diff
changeset
|
438 |
list($page_id, $namespace) = RenderMan::strToPageID($urlname); |
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
439 |
list($page_id) = explode('/', $page_id); |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
440 |
|
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
441 |
if ( $strict ) |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
442 |
{ |
1206
50f6c144ec68
Fixed some bugs with account activation, especially if you're a half-logged-in vegetable.
Dan
parents:
1205
diff
changeset
|
443 |
return $namespace == 'Special' && in_array($page_id, array('CSS', 'Login', 'Logout', 'LangExportJSON', 'ActivateAccount')); |
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
444 |
} |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
445 |
else |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
446 |
{ |
1206
50f6c144ec68
Fixed some bugs with account activation, especially if you're a half-logged-in vegetable.
Dan
parents:
1205
diff
changeset
|
447 |
return $namespace == 'Admin' || ($namespace == 'Special' && in_array($page_id, array('CSS', 'Login', 'Logout', 'Administration', 'LangExportJSON', 'ActivateAccount'))); |
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
448 |
} |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
449 |
} |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
450 |
|
1 | 451 |
# Session restoration and permissions |
452 |
||
453 |
/** |
|
454 |
* Initializes the basic state of things, including most user prefs, login data, cookie stuff |
|
455 |
*/ |
|
456 |
||
457 |
function start() |
|
458 |
{ |
|
459 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
209 | 460 |
global $lang; |
406
7468a663315f
Added some basic timezone support; DST support is still to come.
Dan
parents:
402
diff
changeset
|
461 |
global $timezone; |
1 | 462 |
if($this->started) return; |
463 |
$this->started = true; |
|
464 |
$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
parents:
586
diff
changeset
|
465 |
if ( isset($_COOKIE['sid']) ) |
1 | 466 |
{ |
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
parents:
586
diff
changeset
|
467 |
if ( $this->compat ) |
1 | 468 |
{ |
469 |
$userdata = $this->compat_validate_session($_COOKIE['sid']); |
|
470 |
} |
|
471 |
else |
|
472 |
{ |
|
473 |
$userdata = $this->validate_session($_COOKIE['sid']); |
|
474 |
} |
|
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
parents:
586
diff
changeset
|
475 |
if ( is_array($userdata) ) |
1 | 476 |
{ |
477 |
$this->sid = $_COOKIE['sid']; |
|
478 |
$this->user_logged_in = true; |
|
479 |
$this->user_id = intval($userdata['user_id']); |
|
480 |
$this->username = $userdata['username']; |
|
481 |
$this->user_level = intval($userdata['user_level']); |
|
482 |
$this->real_name = $userdata['real_name']; |
|
483 |
$this->email = $userdata['email']; |
|
484 |
$this->unread_pms = $userdata['num_pms']; |
|
568
3700f7124c2b
A bit of UX improvement to upgrade UI; updated readme for 1.1.4
Dan
parents:
557
diff
changeset
|
485 |
$this->user_title = ( isset($userdata['user_title']) ) ? $userdata['user_title'] : null; |
1 | 486 |
if(!$this->compat) |
487 |
{ |
|
488 |
$this->theme = $userdata['theme']; |
|
489 |
$this->style = $userdata['style']; |
|
490 |
$this->signature = $userdata['signature']; |
|
491 |
$this->reg_time = $userdata['reg_time']; |
|
492 |
} |
|
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
493 |
$this->auth_level = USER_LEVEL_MEMBER; |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
494 |
// generate an anti-CSRF token |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
495 |
$this->csrf_token = sha1($this->username . $this->sid . $this->user_id); |
1 | 496 |
if(!isset($template->named_theme_list[$this->theme])) |
497 |
{ |
|
498 |
if($this->compat || !is_object($template)) |
|
499 |
{ |
|
500 |
$this->theme = 'oxygen'; |
|
501 |
$this->style = 'bleu'; |
|
502 |
} |
|
503 |
else |
|
504 |
{ |
|
505 |
$this->theme = $template->default_theme; |
|
506 |
$this->style = $template->default_style; |
|
507 |
} |
|
508 |
} |
|
509 |
$user = true; |
|
711
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
510 |
|
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
511 |
// set timezone params |
406
7468a663315f
Added some basic timezone support; DST support is still to come.
Dan
parents:
402
diff
changeset
|
512 |
$GLOBALS['timezone'] = $userdata['user_timezone']; |
711
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
513 |
$GLOBALS['dst_params'] = explode(';', $userdata['user_dst']); |
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
514 |
foreach ( $GLOBALS['dst_params'] as &$parm ) |
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
515 |
{ |
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
516 |
if ( substr($parm, -1) != 'd' ) |
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
517 |
$parm = intval($parm); |
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
518 |
} |
1 | 519 |
|
209 | 520 |
// Set language |
521 |
if ( !defined('ENANO_ALLOW_LOAD_NOLANG') ) |
|
522 |
{ |
|
523 |
$lang_id = intval($userdata['user_lang']); |
|
524 |
$lang = new Language($lang_id); |
|
406
7468a663315f
Added some basic timezone support; DST support is still to come.
Dan
parents:
402
diff
changeset
|
525 |
@setlocale(LC_ALL, $lang->lang_code); |
209 | 526 |
} |
1 | 527 |
|
528 |
if(isset($_REQUEST['auth']) && !$this->sid_super) |
|
529 |
{ |
|
530 |
// Now he thinks he's a moderator. Or maybe even an administrator. Let's find out if he's telling the truth. |
|
531 |
if($this->compat) |
|
532 |
{ |
|
533 |
$key = $_REQUEST['auth']; |
|
534 |
$super = $this->compat_validate_session($key); |
|
535 |
} |
|
536 |
else |
|
537 |
{ |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
538 |
$key = $_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
parents:
270
diff
changeset
|
539 |
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
parents:
270
diff
changeset
|
540 |
{ |
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
parents:
270
diff
changeset
|
541 |
$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
parents:
270
diff
changeset
|
542 |
} |
1 | 543 |
} |
518
2b826f2640e9
SECURITY: Disabled caching of decrypted DiffieHellman login requests
Dan
parents:
511
diff
changeset
|
544 |
if(is_array(@$super)) |
1 | 545 |
{ |
546 |
$this->auth_level = intval($super['auth_level']); |
|
547 |
$this->sid_super = $_REQUEST['auth']; |
|
548 |
} |
|
549 |
} |
|
550 |
} |
|
551 |
} |
|
552 |
if(!$user) |
|
553 |
{ |
|
554 |
//exit; |
|
555 |
$this->register_guest_session(); |
|
556 |
} |
|
557 |
if(!$this->compat) |
|
558 |
{ |
|
559 |
// 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
parents:
270
diff
changeset
|
560 |
$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
parents:
270
diff
changeset
|
561 |
. ' 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
parents:
270
diff
changeset
|
562 |
. ' 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
parents:
270
diff
changeset
|
563 |
. ' 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
parents:
270
diff
changeset
|
564 |
. ' OR g.group_name=\'Everyone\')' . "\n" |
592 | 565 |
. ' ' . ( /* quick hack for upgrade compatibility reasons */ enano_version() == '1.0RC1' ? '' : 'AND ( m.pending != 1 OR m.pending IS NULL )' ) . '' . "\n" |
566 |
. ' ORDER BY group_id ASC;'); // The ORDER BY is to make sure "Everyone" comes first so the permissions can be overridden |
|
1 | 567 |
if($row = $db->fetchrow()) |
568 |
{ |
|
569 |
do { |
|
570 |
$this->groups[$row['group_id']] = $row['group_name']; |
|
571 |
$this->group_mod[$row['group_id']] = ( intval($row['is_mod']) == 1 ); |
|
572 |
} while($row = $db->fetchrow()); |
|
573 |
} |
|
574 |
else |
|
575 |
{ |
|
576 |
die('No group info'); |
|
577 |
} |
|
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
parents:
586
diff
changeset
|
578 |
profiler_log('Fetched group memberships'); |
1 | 579 |
} |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
466
diff
changeset
|
580 |
|
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
466
diff
changeset
|
581 |
// make sure we aren't banned |
1 | 582 |
$this->check_banlist(); |
583 |
||
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
584 |
// make sure the account is active |
1205
c922ef08167a
Sessions: fixed on_critical_page(), it referenced the wrong global; enabled better extensible behavior in the account_active column
Dan
parents:
1176
diff
changeset
|
585 |
if ( !$this->compat && $this->user_logged_in && $userdata['account_active'] < 1 && !$this->on_critical_page() ) |
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
586 |
{ |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
587 |
$this->show_inactive_error($userdata); |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
588 |
} |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
589 |
|
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
466
diff
changeset
|
590 |
// 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
parents:
466
diff
changeset
|
591 |
// 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
parents:
466
diff
changeset
|
592 |
// do what you ask it to do, which isn't always what we want |
1 | 593 |
if ( isset ( $_GET['printable'] ) ) |
594 |
{ |
|
595 |
$this->theme = 'printable'; |
|
596 |
$this->style = 'default'; |
|
597 |
} |
|
598 |
||
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
466
diff
changeset
|
599 |
// 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
parents:
466
diff
changeset
|
600 |
$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
parents:
466
diff
changeset
|
601 |
|
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
parents:
586
diff
changeset
|
602 |
profiler_log('Sessions started. Banlist and theme ACLs initialized'); |
1 | 603 |
} |
604 |
||
605 |
# Logins |
|
606 |
||
607 |
/** |
|
608 |
* Attempts to perform a login using crypto functions |
|
609 |
* @param string $username The username |
|
610 |
* @param string $aes_data The encrypted password, hex-encoded |
|
611 |
* @param string $aes_key The MD5 hash of the encryption key, hex-encoded |
|
612 |
* @param string $challenge The 256-bit MD5 challenge string - first 128 bits should be the hash, the last 128 should be the challenge salt |
|
613 |
* @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
parents:
685
diff
changeset
|
614 |
* @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
parents:
685
diff
changeset
|
615 |
* @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
parents:
685
diff
changeset
|
616 |
* @param bool $remember Optional. If true, remembers the session for X days. Otherwise, assigns a short session. Defaults to false. |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
617 |
* @param bool $lookup_key Optional. If true (default) this queries the database for the "real" encryption key. Else, uses what is given. |
1 | 618 |
* @return string 'success' on success, or error string on failure |
619 |
*/ |
|
620 |
||
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
parents:
685
diff
changeset
|
621 |
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 | 622 |
{ |
623 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
624 |
||
625 |
// 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
parents:
270
diff
changeset
|
626 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
1 | 627 |
|
628 |
// Fetch our decryption key |
|
629 |
||
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
630 |
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
parents:
289
diff
changeset
|
631 |
{ |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
632 |
$aes_key = $this->fetch_public_key($aes_key_id); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
633 |
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
parents:
289
diff
changeset
|
634 |
{ |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
635 |
// It could be that our key cache is full. If it seems larger than 65KB, clear it |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
636 |
if ( strlen(getConfig('login_key_cache')) > 65000 ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
637 |
{ |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
638 |
setConfig('login_key_cache', ''); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
639 |
return array( |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
640 |
'success' => false, |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
641 |
'error' => 'key_not_found_cleared', |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
642 |
); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
643 |
} |
304 | 644 |
return array( |
645 |
'success' => false, |
|
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
646 |
'error' => 'key_not_found' |
304 | 647 |
); |
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
parents:
289
diff
changeset
|
648 |
} |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
649 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
650 |
else |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
651 |
{ |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
652 |
$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
parents:
289
diff
changeset
|
653 |
} |
1 | 654 |
|
655 |
// Convert the key to a binary string |
|
656 |
$bin_key = hexdecode($aes_key); |
|
657 |
||
658 |
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
parents:
178
diff
changeset
|
659 |
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
parents:
178
diff
changeset
|
660 |
'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
parents:
178
diff
changeset
|
661 |
'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
parents:
178
diff
changeset
|
662 |
); |
1 | 663 |
|
664 |
// Decrypt our password |
|
665 |
$password = $aes->decrypt($aes_data, $bin_key, ENC_HEX); |
|
666 |
||
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
parents:
685
diff
changeset
|
667 |
// 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
parents:
685
diff
changeset
|
668 |
return $this->login_without_crypto($username, $password, false, $level, $captcha_hash, $captcha_code, $remember); |
1 | 669 |
} |
670 |
||
671 |
/** |
|
672 |
* Attempts to login without using crypto stuff, mainly for use when the other side doesn't like Javascript |
|
673 |
* 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 |
|
674 |
* Technically it still uses crypto, but it only decrypts the password already stored, which is (obviously) required for authentication |
|
675 |
* @param string $username The username |
|
676 |
* @param string $password The password -OR- the MD5 hash of the password if $already_md5ed is true |
|
677 |
* @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. |
|
678 |
* @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
parents:
685
diff
changeset
|
679 |
* @param bool $remember Optional. If true, remembers the session for X days. Otherwise, assigns a short session. Defaults to false. |
1 | 680 |
*/ |
681 |
||
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
682 |
function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER, $remember = false) |
1 | 683 |
{ |
684 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
685 |
||
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
686 |
if ( $already_md5ed ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
687 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
688 |
// No longer supported |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
689 |
return array( |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
690 |
'mode' => 'error', |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
691 |
'error' => '$already_md5ed is no longer supported (set this parameter to false and make sure the password you send to $session->login_without_crypto() is not hashed)' |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
692 |
); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
693 |
} |
1 | 694 |
|
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
695 |
// 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
parents:
268
diff
changeset
|
696 |
// (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
parents:
268
diff
changeset
|
697 |
$username = str_replace('_', ' ', $username); |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
698 |
|
1 | 699 |
// Perhaps we're upgrading Enano? |
700 |
if($this->compat) |
|
701 |
{ |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
702 |
return $this->login_compat($username, md5($password), $level); |
1 | 703 |
} |
704 |
||
705 |
// 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
parents:
270
diff
changeset
|
706 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
1 | 707 |
|
708 |
// Initialize our success switch |
|
709 |
$success = false; |
|
710 |
||
711 |
// Retrieve the real password from the database |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
712 |
$username_db = $db->escape(strtolower($username)); |
1063
46e08815594e
Fixed logins with usernames containing Unicode characters
Dan
parents:
1032
diff
changeset
|
713 |
$username_db_upper = $db->escape($username); |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
714 |
if ( !$db->sql_query('SELECT password,password_salt,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix."users\n" |
1063
46e08815594e
Fixed logins with usernames containing Unicode characters
Dan
parents:
1032
diff
changeset
|
715 |
. " WHERE ( " . ENANO_SQLFUNC_LOWERCASE . "(username) = '$username_db' OR username = '$username_db_upper' );") ) |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
716 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
717 |
$this->sql('SELECT password,\'\' AS password_salt,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix."users\n" |
1063
46e08815594e
Fixed logins with usernames containing Unicode characters
Dan
parents:
1032
diff
changeset
|
718 |
. " WHERE ( " . ENANO_SQLFUNC_LOWERCASE . "(username) = '$username_db' OR username = '$username_db_upper' );"); |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
719 |
} |
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
720 |
if ( $db->numrows() < 1 ) |
188
b4aaca42c8a4
SECURITY: Fix failure to log login failure on no row match
Dan
parents:
174
diff
changeset
|
721 |
{ |
b4aaca42c8a4
SECURITY: Fix failure to log login failure on no row match
Dan
parents:
174
diff
changeset
|
722 |
// This wasn't logged in <1.0.2, dunno how it slipped through |
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
723 |
if ( $level > USER_LEVEL_MEMBER ) |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
724 |
$this->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES\n" |
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
725 |
. ' (\'security\', \'admin_auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', ' |
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
726 |
. '\''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')'); |
188
b4aaca42c8a4
SECURITY: Fix failure to log login failure on no row match
Dan
parents:
174
diff
changeset
|
727 |
else |
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
728 |
$this->sql('INSERT INTO ' . table_prefix . "logs(log_type,action,time_id,date_string,author,edit_summary) VALUES\n" |
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
729 |
. ' (\'security\', \'auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', ' |
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
730 |
. '\''.$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
parents:
178
diff
changeset
|
731 |
|
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
parents:
178
diff
changeset
|
732 |
// Do we also need to increment the lockout countdown? |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
733 |
if ( !defined('IN_ENANO_INSTALL') ) |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
734 |
$lockout_data = $this->get_lockout_info(); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
735 |
else |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
736 |
$lockout_data = array( |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
737 |
'lockout_policy' => 'disable' |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
738 |
); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
739 |
|
1170 | 740 |
if ( $lockout_data['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
parents:
178
diff
changeset
|
741 |
{ |
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
parents:
178
diff
changeset
|
742 |
$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
parents:
178
diff
changeset
|
743 |
// increment fail count |
1170 | 744 |
$this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action, username) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\', \'' . $db->escape($username) . '\');'); |
745 |
$lockout_data['fails']++; |
|
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
parents:
178
diff
changeset
|
746 |
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
parents:
178
diff
changeset
|
747 |
'success' => false, |
1170 | 748 |
'error' => ( $lockout_data['fails'] >= $lockout_data['threshold'] ) ? 'locked_out' : 'invalid_credentials', |
749 |
'lockout_threshold' => $lockout_data['threshold'], |
|
750 |
'lockout_duration' => ( $lockout_data['duration'] ), |
|
751 |
'lockout_fails' => $lockout_data['fails'], |
|
752 |
'lockout_policy' => $lockout_data['policy'] |
|
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
parents:
178
diff
changeset
|
753 |
); |
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
parents:
178
diff
changeset
|
754 |
} |
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
parents:
178
diff
changeset
|
755 |
|
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
parents:
178
diff
changeset
|
756 |
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
parents:
178
diff
changeset
|
757 |
'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
parents:
178
diff
changeset
|
758 |
'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
parents:
178
diff
changeset
|
759 |
); |
188
b4aaca42c8a4
SECURITY: Fix failure to log login failure on no row match
Dan
parents:
174
diff
changeset
|
760 |
} |
1 | 761 |
$row = $db->fetchrow(); |
762 |
||
763 |
// Check to see if we're logging in using a temporary password |
|
764 |
||
765 |
if((intval($row['temp_password_time']) + 3600*24) > time() ) |
|
766 |
{ |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
767 |
$temp_pass = hmac_sha1($password, $row['password_salt']); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
768 |
if( $temp_pass === $row['temp_password'] ) |
1 | 769 |
{ |
770 |
$code = $plugins->setHook('login_password_reset'); |
|
771 |
foreach ( $code as $cmd ) |
|
772 |
{ |
|
773 |
eval($cmd); |
|
774 |
} |
|
775 |
||
521
d264784355e5
Implemented the password-reset redirect _properly_ instead of the hackish direct header() call in sessions.php
Dan
parents:
511
diff
changeset
|
776 |
return array( |
d264784355e5
Implemented the password-reset redirect _properly_ instead of the hackish direct header() call in sessions.php
Dan
parents:
511
diff
changeset
|
777 |
'success' => false, |
d264784355e5
Implemented the password-reset redirect _properly_ instead of the hackish direct header() call in sessions.php
Dan
parents:
511
diff
changeset
|
778 |
'error' => 'valid_reset', |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
779 |
'redirect_url' => makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $this->pk_encrypt($password)) |
521
d264784355e5
Implemented the password-reset redirect _properly_ instead of the hackish direct header() call in sessions.php
Dan
parents:
511
diff
changeset
|
780 |
); |
1 | 781 |
} |
782 |
} |
|
783 |
||
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
784 |
if ( $row['old_encryption'] == 1 ) |
1 | 785 |
{ |
786 |
// The user's password is stored using the obsolete and insecure MD5 algorithm - we'll update the field with the new password |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
787 |
if(md5($password) === $row['password']) |
1 | 788 |
{ |
802 | 789 |
if ( !defined('IN_ENANO_UPGRADE') ) |
790 |
{ |
|
791 |
$hmac_secret = hexencode(AESCrypt::randkey(20), '', ''); |
|
792 |
$password_hmac = hmac_sha1($password, $hmac_secret); |
|
793 |
$this->sql('UPDATE '.table_prefix."users SET password = '$password_hmac', password_salt = '$hmac_secret', old_encryption = 0 WHERE user_id={$row['user_id']};"); |
|
794 |
} |
|
1 | 795 |
$success = true; |
796 |
} |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
797 |
} |
941
9be6dba92adf
Upgrader: UX: Added welcome page, different between Caoineag and Banshee
Dan
parents:
915
diff
changeset
|
798 |
else if ( $row['old_encryption'] == 2 || ( defined('ENANO_UPGRADE_USE_AES_PASSWORDS') ) && strlen($row['password']) != 40 ) |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
799 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
800 |
// Our password field uses the 1.0RC1-1.1.5 encryption format |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
801 |
$real_pass = $aes->decrypt($row['password'], $this->private_key); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
802 |
if($password === $real_pass) |
1 | 803 |
{ |
802 | 804 |
if ( !defined('IN_ENANO_UPGRADE') ) |
805 |
{ |
|
806 |
$hmac_secret = hexencode(AESCrypt::randkey(20), '', ''); |
|
807 |
$password_hmac = hmac_sha1($password, $hmac_secret); |
|
808 |
$this->sql('UPDATE '.table_prefix."users SET password = '$password_hmac', password_salt = '$hmac_secret', old_encryption = 0 WHERE user_id={$row['user_id']};"); |
|
809 |
} |
|
1 | 810 |
$success = true; |
811 |
} |
|
812 |
} |
|
813 |
else |
|
814 |
{ |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
815 |
// Password uses HMAC-SHA1 |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
816 |
$user_challenge = hmac_sha1($password, $row['password_salt']); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
817 |
$password_hmac =& $row['password']; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
818 |
if ( $user_challenge === $password_hmac ) |
1 | 819 |
{ |
820 |
$success = true; |
|
821 |
} |
|
822 |
} |
|
823 |
if($success) |
|
824 |
{ |
|
825 |
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
parents:
178
diff
changeset
|
826 |
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
parents:
178
diff
changeset
|
827 |
'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
parents:
178
diff
changeset
|
828 |
'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
parents:
178
diff
changeset
|
829 |
); |
1089
16a1e8626dd9
User ACP: redirect to Special:Login on own account deletion
Dan
parents:
1084
diff
changeset
|
830 |
|
16a1e8626dd9
User ACP: redirect to Special:Login on own account deletion
Dan
parents:
1084
diff
changeset
|
831 |
// grant session |
802 | 832 |
$sess = $this->register_session($row['user_id'], $username, ( isset($password_hmac) ? $password_hmac : $password ), $level, $remember); |
1089
16a1e8626dd9
User ACP: redirect to Special:Login on own account deletion
Dan
parents:
1084
diff
changeset
|
833 |
|
1 | 834 |
if($sess) |
835 |
{ |
|
836 |
if($level > USER_LEVEL_MEMBER) |
|
1216 | 837 |
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,author_uid,edit_summary,page_text) VALUES(\'security\', \'admin_auth_good\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', ' . $row['user_id'] . ', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')'); |
1 | 838 |
else |
1216 | 839 |
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,author_uid,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', ' . $row['user_id'] . ', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')'); |
1 | 840 |
|
841 |
$code = $plugins->setHook('login_success'); |
|
842 |
foreach ( $code as $cmd ) |
|
843 |
{ |
|
844 |
eval($cmd); |
|
845 |
} |
|
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
846 |
|
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
parents:
178
diff
changeset
|
847 |
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
parents:
178
diff
changeset
|
848 |
'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
parents:
178
diff
changeset
|
849 |
); |
1 | 850 |
} |
851 |
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
parents:
178
diff
changeset
|
852 |
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
parents:
178
diff
changeset
|
853 |
'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
parents:
178
diff
changeset
|
854 |
'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
parents:
178
diff
changeset
|
855 |
); |
1 | 856 |
} |
857 |
else |
|
858 |
{ |
|
859 |
if($level > USER_LEVEL_MEMBER) |
|
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
860 |
$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(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')'); |
1 | 861 |
else |
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
862 |
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')'); |
1 | 863 |
|
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
parents:
178
diff
changeset
|
864 |
// Do we also need to increment the lockout countdown? |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
865 |
if ( !defined('IN_ENANO_INSTALL') && getConfig('lockout_policy', 'lockout') !== '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
parents:
178
diff
changeset
|
866 |
{ |
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
parents:
178
diff
changeset
|
867 |
$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
parents:
178
diff
changeset
|
868 |
// increment fail count |
1176
5c98b9f181f0
AJAX login: Fixed error box failure to destroy upon cancel. Fixes issue 8.
Dan
parents:
1175
diff
changeset
|
869 |
$this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action, username) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\', \'' . $db->escape($username) . '\');'); |
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
parents:
178
diff
changeset
|
870 |
} |
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
parents:
178
diff
changeset
|
871 |
|
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
parents:
178
diff
changeset
|
872 |
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
parents:
178
diff
changeset
|
873 |
'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
parents:
178
diff
changeset
|
874 |
'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
parents:
178
diff
changeset
|
875 |
); |
1 | 876 |
} |
877 |
} |
|
878 |
||
879 |
/** |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
880 |
* Attempts to log in using the old table structure and algorithm. This is for upgrades from old 1.0.x releases. |
1 | 881 |
* @param string $username |
882 |
* @param string $password This should be an MD5 hash |
|
883 |
* @return string 'success' if successful, or error message on failure |
|
884 |
*/ |
|
885 |
||
886 |
function login_compat($username, $password, $level = 0) |
|
887 |
{ |
|
888 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
889 |
$pass_hashed =& $password; |
|
890 |
$this->sql('SELECT password,user_id,user_level FROM '.table_prefix.'users WHERE username=\''.$this->prepare_text($username).'\';'); |
|
891 |
if($db->numrows() < 1) |
|
892 |
return 'The username and/or password is incorrect.'; |
|
893 |
$row = $db->fetchrow(); |
|
894 |
if($row['password'] == $password) |
|
895 |
{ |
|
896 |
if((int)$level > (int)$row['user_level']) |
|
897 |
return 'You are not authorized for this level of access.'; |
|
898 |
$sess = $this->register_session_compat(intval($row['user_id']), $username, $password, $level); |
|
899 |
if($sess) |
|
900 |
return 'success'; |
|
901 |
else |
|
902 |
return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.'; |
|
903 |
} |
|
904 |
else |
|
905 |
{ |
|
906 |
return 'The username and/or password is incorrect.'; |
|
907 |
} |
|
908 |
} |
|
909 |
||
910 |
/** |
|
911 |
* 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
parents:
268
diff
changeset
|
912 |
* 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 | 913 |
* @param int $user_id |
914 |
* @param string $username |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
915 |
* @param string $password_hmac The HMAC of the user's password, right from the database |
1 | 916 |
* @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
parents:
685
diff
changeset
|
917 |
* @param bool $remember Whether the session should be long-term (true) or not (false). Defaults to short-term. |
1 | 918 |
* @return bool |
919 |
*/ |
|
920 |
||
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
921 |
function register_session($user_id, $username, $password_hmac, $level = USER_LEVEL_MEMBER, $remember = false) |
1 | 922 |
{ |
697
8e9ba8b131fa
Made upgrades from 1.1.4 -> 1.1.5 work if keyhash is not present
Dan
parents:
691
diff
changeset
|
923 |
global $db, $session, $paths, $template, $plugins; // Common objects |
8e9ba8b131fa
Made upgrades from 1.1.4 -> 1.1.5 work if keyhash is not present
Dan
parents:
691
diff
changeset
|
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
parents:
31
diff
changeset
|
925 |
// Random key identifier |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
926 |
$salt = ''; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
927 |
for ( $i = 0; $i < 32; $i++ ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
928 |
{ |
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
929 |
$salt .= chr(mt_rand(32, 126)); |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
930 |
} |
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
931 |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
932 |
// Session key |
802 | 933 |
if ( defined('ENANO_UPGRADE_USE_AES_PASSWORDS') ) |
934 |
{ |
|
935 |
$session_key = $this->pk_encrypt("u=$username;p=" . sha1($password_hmac) . ";s=$salt"); |
|
936 |
} |
|
937 |
else |
|
938 |
{ |
|
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
939 |
$key_pieces = array($password_hmac); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
940 |
$sk_mode = 'generate'; |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
941 |
$code = $plugins->setHook('session_key_calc'); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
942 |
foreach ( $code as $cmd ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
943 |
{ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
944 |
eval($cmd); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
945 |
} |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
946 |
$key_pieces = implode("\xFF", $key_pieces); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
947 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
948 |
$session_key = hmac_sha1($key_pieces, $salt); |
802 | 949 |
} |
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
950 |
|
1001
79770fb4132a
Sped up AJAX de-auth a little; added a little extra info to login_success JSON responses
Dan
parents:
985
diff
changeset
|
951 |
// Minimum level |
79770fb4132a
Sped up AJAX de-auth a little; added a little extra info to login_success JSON responses
Dan
parents:
985
diff
changeset
|
952 |
$level = max(array($level, USER_LEVEL_MEMBER)); |
79770fb4132a
Sped up AJAX de-auth a little; added a little extra info to login_success JSON responses
Dan
parents:
985
diff
changeset
|
953 |
|
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
parents:
685
diff
changeset
|
954 |
// 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
parents:
685
diff
changeset
|
955 |
$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
parents:
685
diff
changeset
|
956 |
|
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
957 |
// If we're registering an elevated-privilege key, it needs to be on GET |
1 | 958 |
if($level > USER_LEVEL_MEMBER) |
959 |
{ |
|
802 | 960 |
$this->sid_super = $session_key; |
961 |
$_GET['auth'] = $session_key; |
|
1 | 962 |
} |
963 |
else |
|
964 |
{ |
|
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
965 |
// 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
parents:
31
diff
changeset
|
966 |
// For now, make the cookie last forever, we can change this in 1.1.x |
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
967 |
setcookie( 'sid', $session_key, time()+15552000, scriptPath.'/', null, $GLOBALS['is_https']); |
1 | 968 |
$_COOKIE['sid'] = $session_key; |
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
969 |
$this->sid = $session_key; |
1 | 970 |
} |
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
971 |
// $keyhash is stored in the database, this is for compatibility with the older DB structure |
1 | 972 |
$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
parents:
31
diff
changeset
|
973 |
// Record the user's IP |
466
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
974 |
$ip = $_SERVER['REMOTE_ADDR']; |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
975 |
if(!is_valid_ip($ip)) |
1 | 976 |
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
parents:
31
diff
changeset
|
977 |
// The time needs to be stashed to enforce the 15-minute limit on elevated session keys |
1 | 978 |
$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
parents:
31
diff
changeset
|
979 |
|
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
980 |
// Sanity check |
1 | 981 |
if(!is_int($user_id)) |
982 |
die('Somehow an SQL injection attempt crawled into our session registrar! (1)'); |
|
983 |
if(!is_int($level)) |
|
1170 | 984 |
die(var_dump($level) . '<br />Somehow an SQL injection attempt crawled into our session registrar! (2)'); |
1 | 985 |
|
1001
79770fb4132a
Sped up AJAX de-auth a little; added a little extra info to login_success JSON responses
Dan
parents:
985
diff
changeset
|
986 |
// Update RAM |
79770fb4132a
Sped up AJAX de-auth a little; added a little extra info to login_success JSON responses
Dan
parents:
985
diff
changeset
|
987 |
$this->user_id = $user_id; |
79770fb4132a
Sped up AJAX de-auth a little; added a little extra info to login_success JSON responses
Dan
parents:
985
diff
changeset
|
988 |
$this->user_level = max(array($this->user_level, $level)); |
79770fb4132a
Sped up AJAX de-auth a little; added a little extra info to login_success JSON responses
Dan
parents:
985
diff
changeset
|
989 |
|
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
990 |
// All done! |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
991 |
$query = $db->sql_query('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time, key_type) VALUES(\''.$keyhash.'\', \''.$db->escape($salt).'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.', ' . $key_type . ');'); |
697
8e9ba8b131fa
Made upgrades from 1.1.4 -> 1.1.5 work if keyhash is not present
Dan
parents:
691
diff
changeset
|
992 |
if ( !$query && defined('IN_ENANO_UPGRADE') ) |
8e9ba8b131fa
Made upgrades from 1.1.4 -> 1.1.5 work if keyhash is not present
Dan
parents:
691
diff
changeset
|
993 |
// we're trying to upgrade so the key_type column is probably missing - try it again without specifying the key type |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
994 |
$this->sql('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time) VALUES(\''.$keyhash.'\', \''.$db->escape($salt).'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.');'); |
697
8e9ba8b131fa
Made upgrades from 1.1.4 -> 1.1.5 work if keyhash is not present
Dan
parents:
691
diff
changeset
|
995 |
|
1 | 996 |
return true; |
997 |
} |
|
998 |
||
999 |
/** |
|
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1000 |
* 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 | 1001 |
* @see sessionManager::register_session() |
1002 |
* @access private |
|
1003 |
*/ |
|
1004 |
||
1005 |
function register_session_compat($user_id, $username, $password, $level = 0) |
|
1006 |
{ |
|
1007 |
$salt = md5(microtime() . mt_rand()); |
|
1008 |
$thekey = md5($password . $salt); |
|
1009 |
if($level > 0) |
|
1010 |
{ |
|
1011 |
$this->sid_super = $thekey; |
|
1012 |
} |
|
1013 |
else |
|
1014 |
{ |
|
1015 |
setcookie( 'sid', $thekey, time()+315360000, scriptPath.'/' ); |
|
1016 |
$_COOKIE['sid'] = $thekey; |
|
1017 |
} |
|
1018 |
$ip = ip2hex($_SERVER['REMOTE_ADDR']); |
|
1019 |
if(!$ip) |
|
1020 |
die('$session->register_session: Remote-Addr was spoofed'); |
|
1021 |
$time = time(); |
|
1022 |
if(!is_int($user_id)) |
|
1023 |
die('Somehow an SQL injection attempt crawled into our session registrar! (1)'); |
|
1024 |
if(!is_int($level)) |
|
1025 |
die('Somehow an SQL injection attempt crawled into our session registrar! (2)'); |
|
1026 |
$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.');'); |
|
1027 |
return true; |
|
1028 |
} |
|
1029 |
||
1030 |
/** |
|
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1031 |
* Tells us if we're locked out from logging in or not. |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1032 |
* @param reference will be filled with information regarding in-progress lockout |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1033 |
* @return bool True if locked out, false otherwise |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1034 |
*/ |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1035 |
|
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1036 |
function get_lockout_info() |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1037 |
{ |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1038 |
global $db; |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1039 |
|
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1040 |
// this has to be initialized to hide warnings |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1041 |
$lockdata = null; |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1042 |
|
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1043 |
// Query database for lockout info |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1044 |
$locked_out = false; |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1045 |
$threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5; |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1046 |
$duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15; |
1065
18d013f98fd0
AJAX Login: Fixed all known issues with lockout (and some unknown ones)
Dan
parents:
1032
diff
changeset
|
1047 |
// convert to seconds |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1048 |
$duration = $duration * 60; |
1065
18d013f98fd0
AJAX Login: Fixed all known issues with lockout (and some unknown ones)
Dan
parents:
1032
diff
changeset
|
1049 |
// decide on policy |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1050 |
$policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout'; |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1051 |
if ( $policy != 'disable' ) |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1052 |
{ |
1065
18d013f98fd0
AJAX Login: Fixed all known issues with lockout (and some unknown ones)
Dan
parents:
1032
diff
changeset
|
1053 |
// enabled; make decision |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1054 |
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']); |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1055 |
$timestamp_cutoff = time() - $duration; |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1056 |
$q = $this->sql('SELECT timestamp FROM ' . table_prefix . 'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;'); |
1032
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1057 |
$fails = $db->numrows($q); |
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1058 |
$row = $db->fetchrow($q); |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1059 |
$locked_out = ( $fails >= $threshold ); |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1060 |
$lockdata = array( |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1061 |
'active' => $locked_out, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1062 |
'threshold' => $threshold, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1063 |
'duration' => ( $duration / 60 ), |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1064 |
'fails' => $fails, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1065 |
'policy' => $policy, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1066 |
'last_time' => $row['timestamp'], |
1065
18d013f98fd0
AJAX Login: Fixed all known issues with lockout (and some unknown ones)
Dan
parents:
1032
diff
changeset
|
1067 |
'time_rem' => $locked_out ? ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ) : 0, |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1068 |
'captcha' => $policy == 'captcha' ? $this->make_captcha() : '' |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1069 |
); |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1070 |
$db->free_result(); |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1071 |
} |
1032
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1072 |
else |
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1073 |
{ |
1065
18d013f98fd0
AJAX Login: Fixed all known issues with lockout (and some unknown ones)
Dan
parents:
1032
diff
changeset
|
1074 |
// disabled; send back default dataset |
1032
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1075 |
$lockdata = array( |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1076 |
'active' => false, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1077 |
'threshold' => $threshold, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1078 |
'duration' => ( $duration / 60 ), |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1079 |
'fails' => 0, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1080 |
'policy' => $policy, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
1081 |
'last_time' => 0, |
1032
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1082 |
'time_rem' => 0, |
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1083 |
'captcha' => '' |
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1084 |
); |
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1085 |
} |
9e61f16a8e47
Login and sessions: fixed some improper handling of the config for lockout logic
Dan
parents:
1026
diff
changeset
|
1086 |
return $lockdata; |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1087 |
} |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1088 |
|
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1089 |
/** |
1 | 1090 |
* Creates/restores a guest session |
1091 |
* @todo implement real session management for guests |
|
1092 |
*/ |
|
1093 |
||
1094 |
function register_guest_session() |
|
1095 |
{ |
|
1096 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
209 | 1097 |
global $lang; |
1 | 1098 |
$this->username = $_SERVER['REMOTE_ADDR']; |
1099 |
$this->user_level = USER_LEVEL_GUEST; |
|
1100 |
if($this->compat || defined('IN_ENANO_INSTALL')) |
|
1101 |
{ |
|
1102 |
$this->theme = 'oxygen'; |
|
1103 |
$this->style = 'bleu'; |
|
1104 |
} |
|
1105 |
else |
|
1106 |
{ |
|
1107 |
$this->theme = ( isset($_GET['theme']) && isset($template->named_theme_list[$_GET['theme']])) ? $_GET['theme'] : $template->default_theme; |
|
466
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
1108 |
$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 | 1109 |
} |
1110 |
$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
parents:
375
diff
changeset
|
1111 |
// This is a VERY special case we are allowing. It lets the installer create languages using the Enano API. |
209 | 1112 |
if ( !defined('ENANO_ALLOW_LOAD_NOLANG') ) |
1113 |
{ |
|
782
96848f04bbba
Corrected a few issues with languages and client-side code
Dan
parents:
776
diff
changeset
|
1114 |
$language = ( isset($_GET['lang']) && preg_match('/^[a-z0-9-_]+$/', @$_GET['lang']) ) ? $_GET['lang'] : intval(getConfig('default_language')); |
209 | 1115 |
$lang = new Language($language); |
406
7468a663315f
Added some basic timezone support; DST support is still to come.
Dan
parents:
402
diff
changeset
|
1116 |
@setlocale(LC_ALL, $lang->lang_code); |
209 | 1117 |
} |
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
parents:
556
diff
changeset
|
1118 |
// make a CSRF token |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
1119 |
$this->csrf_token = hmac_sha1($_SERVER['REMOTE_ADDR'], sha1($this->private_key)); |
1 | 1120 |
} |
1121 |
||
1122 |
/** |
|
1123 |
* Validates a session key, and returns the userdata associated with the key or false |
|
1124 |
* @param string $key The session key to validate |
|
1125 |
* @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. |
|
1126 |
*/ |
|
1127 |
||
1128 |
function validate_session($key) |
|
1129 |
{ |
|
1130 |
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
parents:
377
diff
changeset
|
1131 |
profiler_log("SessionManager: checking session: " . sha1($key)); |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1132 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1133 |
if ( strlen($key) > 48 ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1134 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1135 |
return $this->validate_aes_session($key); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1136 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1137 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1138 |
profiler_log("SessionManager: checking session: " . $key); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1139 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1140 |
return $this->validate_session_shared($key, ''); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1141 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1142 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1143 |
/** |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1144 |
* Validates an old-format AES session key. DO NOT USE THIS. Will return false if called outside of an upgrade. |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1145 |
* @param string Session key |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1146 |
* @return array |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1147 |
*/ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1148 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1149 |
protected function validate_aes_session($key) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1150 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1151 |
global $db, $session, $paths, $template, $plugins; // Common objects |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1152 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1153 |
// No valid use except during upgrades |
802 | 1154 |
if ( !preg_match('/^upg-/', enano_version()) && !defined('IN_ENANO_UPGRADE') ) |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1155 |
return false; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1156 |
|
802 | 1157 |
$decrypted_key = $this->pk_decrypt($key); |
1 | 1158 |
if ( !$decrypted_key ) |
1159 |
{ |
|
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
parents:
270
diff
changeset
|
1160 |
// 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
parents:
270
diff
changeset
|
1161 |
return false; |
1 | 1162 |
} |
1163 |
||
802 | 1164 |
$n = preg_match('/^u='.$this->valid_username.';p=([A-Fa-f0-9]+?);s=(.{32})$/', $decrypted_key, $keydata); |
1 | 1165 |
if($n < 1) |
1166 |
{ |
|
802 | 1167 |
echo '(debug) $session->validate_session: Key does not match regex<br />Decrypted key: '.$decrypted_key; |
1 | 1168 |
return false; |
1169 |
} |
|
1170 |
$keyhash = md5($key); |
|
1171 |
$salt = $db->escape($keydata[3]); |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1172 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1173 |
return $this->validate_session_shared($keyhash, $salt, true); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1174 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1175 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1176 |
/** |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1177 |
* Shared portion of session validation. Do not try to call this. |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1178 |
* @return array |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1179 |
* @access private |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1180 |
*/ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1181 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1182 |
protected function validate_session_shared($key, $salt, $loose_call = false) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1183 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1184 |
global $db, $session, $paths, $template, $plugins; // Common objects |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1185 |
|
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
parents:
270
diff
changeset
|
1186 |
// using a normal call to $db->sql_query to avoid failing on errors here |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1187 |
$columns_select = "u.user_id AS uid, u.username, u.password, u.password_salt, u.email, u.real_name, u.user_level, u.theme,\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1188 |
. " u.style,u.signature, u.reg_time, u.account_active, u.activation_key, u.user_lang, u.user_title, k.salt, k.source_ip,\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1189 |
. " k.time, k.auth_level, k.key_type, COUNT(p.message_id) AS num_pms, u.user_timezone, u.user_dst, x.*"; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1190 |
|
857
f3a5a276208c
Added support for alternate port numbers on database servers. Also in install-cli, merged in new sysreqs functionality.
Dan
parents:
843
diff
changeset
|
1191 |
$columns_groupby = "u.user_id, u.username, u.password, u.password_salt, u.email, u.real_name, u.user_level, u.theme, u.style, u.signature,\n" |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1192 |
. " u.reg_time, u.account_active, u.activation_key, u.user_lang, u.user_timezone, u.user_title, u.user_dst,\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1193 |
. " k.salt, k.source_ip, k.time, k.auth_level, k.key_type, x.user_id, x.user_aim, x.user_yahoo, x.user_msn,\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1194 |
. " x.user_xmpp, x.user_homepage, x.user_location, x.user_job, x.user_hobbies, x.email_public,\n" |
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1195 |
. " x.disable_js_fx, x.date_format, x.time_format"; |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1196 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1197 |
$joins = " LEFT JOIN " . table_prefix . "users AS u\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1198 |
. " ON ( u.user_id=k.user_id )\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1199 |
. " LEFT JOIN " . table_prefix . "users_extra AS x\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1200 |
. " ON ( u.user_id=x.user_id OR x.user_id IS NULL )\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1201 |
. " LEFT JOIN " . table_prefix . "privmsgs AS p\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1202 |
. " ON ( p.message_to=u.username AND p.message_read=0 )\n"; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1203 |
if ( !$loose_call ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1204 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1205 |
$key_md5 = md5($key); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1206 |
$query = $db->sql_query("SELECT $columns_select\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1207 |
. "FROM " . table_prefix . "session_keys AS k\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1208 |
. $joins |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1209 |
. " WHERE k.session_key='$key_md5'\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1210 |
. " GROUP BY $columns_groupby;"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1211 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1212 |
else |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1213 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1214 |
$query = $db->sql_query("SELECT $columns_select\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1215 |
. "FROM " . table_prefix . "session_keys AS k\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1216 |
. $joins |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1217 |
. " WHERE k.session_key='$key'\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1218 |
. " AND k.salt='$salt'\n" |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1219 |
. " GROUP BY $columns_groupby;"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1220 |
} |
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
parents:
317
diff
changeset
|
1221 |
|
603
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1222 |
if ( !$query && ( defined('IN_ENANO_INSTALL') or defined('IN_ENANO_UPGRADE') ) ) |
18 | 1223 |
{ |
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1224 |
$key_md5 = $loose_call ? $key : md5($key); |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1225 |
$query = $this->sql('SELECT u.user_id AS uid,u.username,u.password,\'\' AS password_salt,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, k.salt FROM '.table_prefix.'session_keys AS k |
18 | 1226 |
LEFT JOIN '.table_prefix.'users AS u |
1227 |
ON ( u.user_id=k.user_id ) |
|
1228 |
LEFT JOIN '.table_prefix.'privmsgs AS p |
|
1229 |
ON ( p.message_to=u.username AND p.message_read=0 ) |
|
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1230 |
WHERE k.session_key=\''.$key_md5.'\' |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1231 |
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,k.salt;'); |
18 | 1232 |
} |
603
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1233 |
else if ( !$query ) |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1234 |
{ |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1235 |
$db->_die(); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1236 |
} |
1 | 1237 |
if($db->numrows() < 1) |
1238 |
{ |
|
1084
742cb0f10766
Sessions: whoops, left a debug message in by accident, broke a few redirects
Dan
parents:
1081
diff
changeset
|
1239 |
// echo '(debug) $session->validate_session: Key was not found in database: ' . $key_md5 . '<br />'; |
1 | 1240 |
return false; |
1241 |
} |
|
1242 |
$row = $db->fetchrow(); |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1243 |
profiler_log("SessionManager: session check: selected and fetched results"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1244 |
|
1 | 1245 |
$row['user_id'] =& $row['uid']; |
466
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
1246 |
$ip = $_SERVER['REMOTE_ADDR']; |
1 | 1247 |
if($row['auth_level'] > $row['user_level']) |
1248 |
{ |
|
1249 |
// Failed authorization check |
|
1250 |
// echo '(debug) $session->validate_session: access to this auth level denied<br />'; |
|
1251 |
return false; |
|
1252 |
} |
|
1253 |
if($ip != $row['source_ip']) |
|
1254 |
{ |
|
484
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
480
diff
changeset
|
1255 |
// Special exception for 1.1.x upgrade - the 1.1.3 upgrade changes the size of the column and this is what validate_session |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
480
diff
changeset
|
1256 |
// expects, but if the column size hasn't changed yet just check the first 10 digits of the IP. |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
480
diff
changeset
|
1257 |
$fail = true; |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
480
diff
changeset
|
1258 |
if ( defined('IN_ENANO_UPGRADE') ) |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
480
diff
changeset
|
1259 |
{ |
568
3700f7124c2b
A bit of UX improvement to upgrade UI; updated readme for 1.1.4
Dan
parents:
557
diff
changeset
|
1260 |
if ( substr($ip, 0, 10) == substr($row['source_ip'], 0, 10) ) |
484
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
480
diff
changeset
|
1261 |
$fail = false; |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
480
diff
changeset
|
1262 |
} |
1 | 1263 |
// Failed IP address check |
1264 |
// echo '(debug) $session->validate_session: IP address mismatch<br />'; |
|
484
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
480
diff
changeset
|
1265 |
if ( $fail ) |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
480
diff
changeset
|
1266 |
return false; |
1 | 1267 |
} |
1268 |
||
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1269 |
// $loose_call is turned on only from validate_aes_session |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1270 |
if ( !$loose_call ) |
1 | 1271 |
{ |
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1272 |
$key_pieces = array($row['password']); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1273 |
$user_id =& $row['uid']; |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1274 |
$sk_mode = 'validate'; |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1275 |
$code = $plugins->setHook('session_key_calc'); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1276 |
foreach ( $code as $cmd ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1277 |
{ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1278 |
eval($cmd); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1279 |
} |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1280 |
$key_pieces = implode("\xFF", $key_pieces); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1281 |
$correct_key = hexdecode(hmac_sha1($key_pieces, $row['salt'])); |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1282 |
$user_key = hexdecode($key); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1283 |
if ( $correct_key !== $user_key || !is_string($user_key) ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1284 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1285 |
return false; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1286 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1287 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1288 |
else |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1289 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1290 |
// if this is a "loose call", this only works once (during the final upgrade stage). Destroy the contents of session_keys. |
802 | 1291 |
if ( $row['auth_level'] == USER_LEVEL_ADMIN && preg_match('/^upg-/', enano_version()) ) |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1292 |
$this->sql('DELETE FROM ' . table_prefix . "session_keys;"); |
1 | 1293 |
} |
1294 |
||
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
parents:
685
diff
changeset
|
1295 |
// 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
parents:
685
diff
changeset
|
1296 |
switch ( $row['key_type'] ) |
1 | 1297 |
{ |
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
parents:
685
diff
changeset
|
1298 |
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
parents:
685
diff
changeset
|
1299 |
$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
parents:
685
diff
changeset
|
1300 |
$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
parents:
685
diff
changeset
|
1301 |
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
parents:
685
diff
changeset
|
1302 |
{ |
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
parents:
685
diff
changeset
|
1303 |
// 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
parents:
685
diff
changeset
|
1304 |
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
parents:
685
diff
changeset
|
1305 |
} |
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
parents:
685
diff
changeset
|
1306 |
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
parents:
685
diff
changeset
|
1307 |
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
parents:
685
diff
changeset
|
1308 |
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
parents:
685
diff
changeset
|
1309 |
{ |
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
parents:
685
diff
changeset
|
1310 |
// 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
parents:
685
diff
changeset
|
1311 |
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
parents:
685
diff
changeset
|
1312 |
} |
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
parents:
685
diff
changeset
|
1313 |
$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
parents:
685
diff
changeset
|
1314 |
$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
parents:
685
diff
changeset
|
1315 |
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
parents:
685
diff
changeset
|
1316 |
{ |
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
parents:
685
diff
changeset
|
1317 |
// 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
parents:
685
diff
changeset
|
1318 |
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
parents:
685
diff
changeset
|
1319 |
} |
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
parents:
685
diff
changeset
|
1320 |
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
parents:
685
diff
changeset
|
1321 |
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
parents:
685
diff
changeset
|
1322 |
$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
parents:
685
diff
changeset
|
1323 |
$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
parents:
685
diff
changeset
|
1324 |
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
parents:
685
diff
changeset
|
1325 |
{ |
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
parents:
685
diff
changeset
|
1326 |
// 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
parents:
685
diff
changeset
|
1327 |
// 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
parents:
685
diff
changeset
|
1328 |
$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
parents:
685
diff
changeset
|
1329 |
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
parents:
685
diff
changeset
|
1330 |
} |
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
parents:
685
diff
changeset
|
1331 |
break; |
1 | 1332 |
} |
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
parents:
685
diff
changeset
|
1333 |
|
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
parents:
685
diff
changeset
|
1334 |
// 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
parents:
685
diff
changeset
|
1335 |
if( $row['key_type'] == SK_ELEV || $row['key_type'] == SK_SHORT ) |
1 | 1336 |
{ |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1337 |
$this->sql('UPDATE '.table_prefix.'session_keys SET time='.time().' WHERE session_key=\''.md5($key).'\';'); |
1 | 1338 |
} |
1339 |
||
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1340 |
$user_extra = array(); |
555
ac4c6a7f01d8
Added user preference for disabling visual effects in Javascript applets; added re-import button to installed plugins
Dan
parents:
554
diff
changeset
|
1341 |
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
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1342 |
{ |
375
8d0e3a5a6990
[minor] Trying to be a little more careful with values from users_extra in validate_session()
Dan
parents:
372
diff
changeset
|
1343 |
if ( isset($row[$column]) ) |
8d0e3a5a6990
[minor] Trying to be a little more careful with values from users_extra in validate_session()
Dan
parents:
372
diff
changeset
|
1344 |
$user_extra[$column] = $row[$column]; |
985
4ecf46e5eeab
Fixed undefined indices for user_extra in various places
Dan
parents:
953
diff
changeset
|
1345 |
else |
4ecf46e5eeab
Fixed undefined indices for user_extra in various places
Dan
parents:
953
diff
changeset
|
1346 |
$user_extra[$column] = ''; |
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1347 |
} |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1348 |
|
1081
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1349 |
if ( isset($row['date_format']) ) |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1350 |
$this->date_format = $row['date_format']; |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1351 |
if ( isset($row['time_format']) ) |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1352 |
$this->time_format = $row['time_format']; |
745200a9cc2a
Fixed some upgrade bugs; added support for choosing one's own date/time formats; rebrand as 1.1.7
Dan
parents:
1079
diff
changeset
|
1353 |
|
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1354 |
$this->user_extra = $user_extra; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1355 |
// Leave the rest to PHP's automatic garbage collector ;-) |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1356 |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1357 |
$row['password'] = ''; |
406
7468a663315f
Added some basic timezone support; DST support is still to come.
Dan
parents:
402
diff
changeset
|
1358 |
$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
parents:
377
diff
changeset
|
1359 |
|
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
parents:
377
diff
changeset
|
1360 |
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
parents:
377
diff
changeset
|
1361 |
|
1 | 1362 |
return $row; |
1363 |
} |
|
1364 |
||
1365 |
/** |
|
1366 |
* Validates a session key, and returns the userdata associated with the key or false. Optimized for compatibility with the old MD5-based auth system. |
|
1367 |
* @param string $key The session key to validate |
|
1368 |
* @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. |
|
1369 |
*/ |
|
1370 |
||
1371 |
function compat_validate_session($key) |
|
1372 |
{ |
|
1373 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
1374 |
$key = $db->escape($key); |
|
1375 |
||
406
7468a663315f
Added some basic timezone support; DST support is still to come.
Dan
parents:
402
diff
changeset
|
1376 |
$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 | 1377 |
LEFT JOIN '.table_prefix.'users AS u |
1378 |
ON u.user_id=k.user_id |
|
1379 |
WHERE k.session_key=\''.$key.'\';'); |
|
1380 |
if($db->numrows() < 1) |
|
1381 |
{ |
|
1382 |
// echo '(debug) $session->validate_session: Key '.$key.' was not found in database<br />'; |
|
1383 |
return false; |
|
1384 |
} |
|
1385 |
$row = $db->fetchrow(); |
|
1386 |
$ip = ip2hex($_SERVER['REMOTE_ADDR']); |
|
1387 |
if($row['auth_level'] > $row['user_level']) |
|
1388 |
{ |
|
1389 |
// Failed authorization check |
|
1390 |
// echo '(debug) $session->validate_session: user not authorized for this access level'; |
|
1391 |
return false; |
|
1392 |
} |
|
1393 |
if($ip != $row['source_ip']) |
|
1394 |
{ |
|
1395 |
// Failed IP address check |
|
1396 |
// echo '(debug) $session->validate_session: IP address mismatch; IP in table: '.$row['source_ip'].'; reported IP: '.$ip.''; |
|
1397 |
return false; |
|
1398 |
} |
|
1399 |
||
1400 |
// Do the password validation |
|
1401 |
$real_key = md5($row['password'] . $row['salt']); |
|
1402 |
||
1403 |
//die('<pre>'.print_r($keydata, true).'</pre>'); |
|
1404 |
if($real_key != $key) |
|
1405 |
{ |
|
1406 |
// Failed password check |
|
1407 |
// echo '(debug) $session->validate_session: supplied password is wrong<br />Real key: '.$real_key.'<br />User key: '.$key; |
|
1408 |
return false; |
|
1409 |
} |
|
1410 |
||
1411 |
$time_now = time(); |
|
1412 |
$time_key = $row['time'] + 900; |
|
1413 |
if($time_now > $time_key && $row['auth_level'] >= 1) |
|
1414 |
{ |
|
1415 |
$this->sw_timed_out = true; |
|
1416 |
// Session timed out |
|
1417 |
// echo '(debug) $session->validate_session: super session timed out<br />'; |
|
1418 |
return false; |
|
1419 |
} |
|
1420 |
||
406
7468a663315f
Added some basic timezone support; DST support is still to come.
Dan
parents:
402
diff
changeset
|
1421 |
$row['user_timezone'] = intval($row['user_timezone']) - 1440; |
7468a663315f
Added some basic timezone support; DST support is still to come.
Dan
parents:
402
diff
changeset
|
1422 |
|
1 | 1423 |
return $row; |
1424 |
} |
|
1425 |
||
1426 |
/** |
|
1427 |
* Demotes us to one less than the specified auth level. AKA destroys elevated authentication and/or logs out the user, depending on $level |
|
1428 |
* @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 |
|
1429 |
* @return string 'success' if successful, or error on failure |
|
1430 |
*/ |
|
1431 |
||
1432 |
function logout($level = USER_LEVEL_MEMBER) |
|
1433 |
{ |
|
1434 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
1435 |
$ou = $this->username; |
|
1436 |
$oid = $this->user_id; |
|
1071
f374801eb775
Sessions: fixed logout() destroying normal session (instead of elevated) if $level = USER_LEVEL_CHPREF. Possible very minor security concern: elevated sessions were not fully destroyed, so if a normal session is opened from the same IP, the elevated one may be reusable for 15 minutes.
Dan
parents:
1069
diff
changeset
|
1437 |
if($level > USER_LEVEL_MEMBER) |
1 | 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
parents:
270
diff
changeset
|
1439 |
$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
parents:
377
diff
changeset
|
1440 |
if(!$this->user_logged_in || $this->auth_level < ( USER_LEVEL_MEMBER + 1)) |
221
e5302cb1945c
Localized a good part, if not all, of the registration page and a couple other things.
Dan
parents:
209
diff
changeset
|
1441 |
{ |
e5302cb1945c
Localized a good part, if not all, of the registration page and a couple other things.
Dan
parents:
209
diff
changeset
|
1442 |
return 'success'; |
e5302cb1945c
Localized a good part, if not all, of the registration page and a couple other things.
Dan
parents:
209
diff
changeset
|
1443 |
} |
1 | 1444 |
// Destroy elevated privileges |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
1445 |
$keyhash = md5($this->sid_super); |
1 | 1446 |
$this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.$keyhash.'\' AND user_id=\'' . $this->user_id . '\';'); |
1447 |
$this->sid_super = false; |
|
1448 |
$this->auth_level = USER_LEVEL_MEMBER; |
|
1449 |
} |
|
1450 |
else |
|
1451 |
{ |
|
1452 |
if($this->user_logged_in) |
|
1453 |
{ |
|
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
parents:
377
diff
changeset
|
1454 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
1 | 1455 |
// Completely destroy our session |
1071
f374801eb775
Sessions: fixed logout() destroying normal session (instead of elevated) if $level = USER_LEVEL_CHPREF. Possible very minor security concern: elevated sessions were not fully destroyed, so if a normal session is opened from the same IP, the elevated one may be reusable for 15 minutes.
Dan
parents:
1069
diff
changeset
|
1456 |
if($this->auth_level > USER_LEVEL_MEMBER) |
1 | 1457 |
{ |
1458 |
$this->logout(USER_LEVEL_ADMIN); |
|
1459 |
} |
|
1460 |
$this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.md5($this->sid).'\';'); |
|
1461 |
setcookie( 'sid', '', time()-(3600*24), scriptPath.'/' ); |
|
1462 |
} |
|
1463 |
} |
|
1464 |
$code = $plugins->setHook('logout_success'); // , Array('level'=>$level,'old_username'=>$ou,'old_user_id'=>$oid)); |
|
1465 |
foreach ( $code as $cmd ) |
|
1466 |
{ |
|
1467 |
eval($cmd); |
|
1468 |
} |
|
1469 |
return 'success'; |
|
1470 |
} |
|
1471 |
||
1472 |
# Miscellaneous stuff |
|
1473 |
||
1474 |
/** |
|
603
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1475 |
* Alerts the user that their account is inactive, and tells them appropriate steps to remedy the situation. Halts execution. |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1476 |
* @param array Return from validate_session() |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1477 |
*/ |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1478 |
|
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1479 |
function show_inactive_error($userdata) |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1480 |
{ |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1481 |
global $db, $session, $paths, $template, $plugins; // Common objects |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1482 |
global $lang; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1483 |
|
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1484 |
global $title; |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1485 |
$paths->init($title); |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1486 |
|
603
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1487 |
$language = intval(getConfig('default_language')); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1488 |
$lang = new Language($language); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1489 |
@setlocale(LC_ALL, $lang->lang_code); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1490 |
|
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1491 |
$a = getConfig('account_activation'); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1492 |
switch($a) |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1493 |
{ |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1494 |
case 'none': |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1495 |
default: |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1496 |
$solution = $lang->get('user_login_noact_solution_none'); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1497 |
break; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1498 |
case 'user': |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1499 |
$solution = $lang->get('user_login_noact_solution_user'); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1500 |
break; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1501 |
case 'admin': |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1502 |
$solution = $lang->get('user_login_noact_solution_admin'); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1503 |
break; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1504 |
} |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1505 |
|
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1506 |
// admin activation request opportunity |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1507 |
$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']) . '\';'); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1508 |
if ( !$q ) |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1509 |
$db->_die(); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1510 |
|
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1511 |
$can_request = ( $db->numrows() < 1 ); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1512 |
$db->free_result(); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1513 |
|
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1514 |
if ( isset($_POST['logout']) ) |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1515 |
{ |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1516 |
$this->sid = $_COOKIE['sid']; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1517 |
$this->user_logged_in = true; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1518 |
$this->user_id = intval($userdata['user_id']); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1519 |
$this->username = $userdata['username']; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1520 |
$this->auth_level = USER_LEVEL_MEMBER; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1521 |
$this->user_level = USER_LEVEL_MEMBER; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1522 |
$this->logout(); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1523 |
redirect(scriptPath . '/', $lang->get('user_login_noact_msg_logout_success_title'), $lang->get('user_login_noact_msg_logout_success_body'), 5); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1524 |
} |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1525 |
|
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1526 |
if ( $can_request && !isset($_POST['activation_request']) ) |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1527 |
{ |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1528 |
$form = '<p>' . $lang->get('user_login_noact_msg_ask_admins') . '</p> |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1529 |
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post"> |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1530 |
<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> |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1531 |
</form>'; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1532 |
} |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1533 |
else |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1534 |
{ |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1535 |
if ( $can_request && isset($_POST['activation_request']) ) |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1536 |
{ |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1537 |
$this->admin_activation_request($userdata['username']); |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1538 |
$form = '<p>' . $lang->get('user_login_noact_msg_admins_just_asked') . '</p> |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1539 |
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post"> |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1540 |
<p><input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p> |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1541 |
</form>'; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1542 |
} |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1543 |
else |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1544 |
{ |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1545 |
$form = '<p>' . $lang->get('user_login_noact_msg_admins_asked') . '</p> |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1546 |
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post"> |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1547 |
<p><input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p> |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1548 |
</form>'; |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1549 |
} |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1550 |
} |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1551 |
|
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1552 |
global $output; |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1553 |
$output = new Output_HTML(); |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1554 |
$output->set_title($lang->get('user_login_noact_title')); |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1555 |
die_friendly($lang->get('user_login_noact_title'), '<p>' . $lang->get('user_login_noact_msg_intro') . ' '.$solution.'</p>' . $form); |
603
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1556 |
} |
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1557 |
|
33b274c8d357
Moved all account deactivation notice presentation code to its own method in sessions
Dan
parents:
595
diff
changeset
|
1558 |
/** |
1 | 1559 |
* Appends the high-privilege session key to the URL if we are authorized to do high-privilege stuff |
1560 |
* @param string $url The URL to add session data to |
|
1561 |
* @return string |
|
1562 |
*/ |
|
1563 |
||
1564 |
function append_sid($url) |
|
1565 |
{ |
|
1566 |
$sep = ( strstr($url, '?') ) ? '&' : '?'; |
|
1567 |
if ( $this->sid_super ) |
|
1568 |
{ |
|
1569 |
$url = $url . $sep . 'auth=' . urlencode($this->sid_super); |
|
1570 |
// echo($this->sid_super.'<br/>'); |
|
1571 |
} |
|
1572 |
return $url; |
|
1573 |
} |
|
1574 |
||
1575 |
/** |
|
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1576 |
* Prevent the user from changing their password. Authentication plugins may call this to enforce single sign-on. |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1577 |
* @param string URL to page where the user may change their password |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1578 |
* @param string Title of the page where the user may change their password |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1579 |
* @return null |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1580 |
*/ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1581 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1582 |
function disable_password_change($change_url = false, $change_title = false) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1583 |
{ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1584 |
if ( $this->password_change_disabled ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1585 |
{ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1586 |
// don't allow calling twice. if we have two plugins doing this, somebody is bad at configuring websites. |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1587 |
return false; |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1588 |
} |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1589 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1590 |
if ( is_string($change_url) && is_string($change_title) ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1591 |
{ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1592 |
$this->password_change_dest = array( |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1593 |
'url' => $change_url, |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1594 |
'title' => $change_title |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1595 |
); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1596 |
} |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1597 |
else |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1598 |
{ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1599 |
$this->password_change_dest = array( |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1600 |
'url' => false, |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1601 |
'title' => false |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1602 |
); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1603 |
} |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1604 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1605 |
$this->password_change_disabled = true; |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1606 |
} |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1607 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1608 |
/** |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1609 |
* Grabs the user's password MD5 - NOW DEPRECATED AND DISABLED. |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
1610 |
* @return bool false |
1 | 1611 |
*/ |
1612 |
||
1613 |
function grab_password_hash() |
|
1614 |
{ |
|
815
c2b3b1464224
Deprecated old grab_password_hash() functions in session
Dan
parents:
811
diff
changeset
|
1615 |
return false; |
1 | 1616 |
} |
1617 |
||
1618 |
/** |
|
1619 |
* Destroys the user's password MD5 in memory |
|
1620 |
*/ |
|
1621 |
||
1622 |
function disallow_password_grab() |
|
1623 |
{ |
|
1624 |
$this->password_hash = false; |
|
1625 |
return false; |
|
1626 |
} |
|
1627 |
||
1628 |
/** |
|
1629 |
* Generates an AES key and stashes it in the database |
|
1630 |
* @return string Hex-encoded AES key |
|
1631 |
*/ |
|
1632 |
||
1633 |
function rijndael_genkey() |
|
1634 |
{ |
|
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
parents:
270
diff
changeset
|
1635 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
1 | 1636 |
$key = $aes->gen_readymade_key(); |
1637 |
$keys = getConfig('login_key_cache'); |
|
1638 |
if(is_string($keys)) |
|
1639 |
$keys .= $key; |
|
1640 |
else |
|
1641 |
$keys = $key; |
|
1642 |
setConfig('login_key_cache', $keys); |
|
1643 |
return $key; |
|
1644 |
} |
|
1645 |
||
1646 |
/** |
|
1647 |
* Generate a totally random 128-bit value for MD5 challenges |
|
1648 |
* @return string |
|
1649 |
*/ |
|
1650 |
||
1651 |
function dss_rand() |
|
1652 |
{ |
|
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
parents:
270
diff
changeset
|
1653 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
1 | 1654 |
$random = $aes->randkey(128); |
1655 |
unset($aes); |
|
1656 |
return md5(microtime() . $random); |
|
1657 |
} |
|
1658 |
||
1659 |
/** |
|
1660 |
* Fetch a cached login public key using the MD5sum as an identifier. Each key can only be fetched once before it is destroyed. |
|
1661 |
* @param string $md5 The MD5 sum of the key |
|
1662 |
* @return string, or bool false on failure |
|
1663 |
*/ |
|
1664 |
||
1665 |
function fetch_public_key($md5) |
|
1666 |
{ |
|
1667 |
$keys = getConfig('login_key_cache'); |
|
1668 |
$keys = enano_str_split($keys, AES_BITS / 4); |
|
1669 |
||
1670 |
foreach($keys as $i => $k) |
|
1671 |
{ |
|
1672 |
if(md5($k) == $md5) |
|
1673 |
{ |
|
1674 |
unset($keys[$i]); |
|
1675 |
if(count($keys) > 0) |
|
1676 |
{ |
|
1677 |
if ( strlen(getConfig('login_key_cache') ) > 64000 ) |
|
1678 |
{ |
|
1679 |
// This should only need to be done once every month or so for an average-size site |
|
1680 |
setConfig('login_key_cache', ''); |
|
1681 |
} |
|
1682 |
else |
|
1683 |
{ |
|
1684 |
$keys = implode('', array_values($keys)); |
|
1685 |
setConfig('login_key_cache', $keys); |
|
1686 |
} |
|
1687 |
} |
|
1688 |
else |
|
1689 |
{ |
|
1690 |
setConfig('login_key_cache', ''); |
|
1691 |
} |
|
1692 |
return $k; |
|
1693 |
} |
|
1694 |
} |
|
1695 |
// Couldn't find the key... |
|
1696 |
return false; |
|
1697 |
} |
|
1698 |
||
1699 |
/** |
|
1700 |
* Adds a user to a group. |
|
1701 |
* @param int User ID |
|
1702 |
* @param int Group ID |
|
1703 |
* @param bool Group moderator - defaults to false |
|
1704 |
* @return bool True on success, false on failure |
|
1705 |
*/ |
|
1706 |
||
1707 |
function add_user_to_group($user_id, $group_id, $is_mod = false) |
|
1708 |
{ |
|
1709 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
1710 |
||
1711 |
// Validation |
|
1712 |
if ( !is_int($user_id) || !is_int($group_id) || !is_bool($is_mod) ) |
|
1713 |
return false; |
|
1714 |
if ( $user_id < 1 || $group_id < 1 ) |
|
1715 |
return false; |
|
1716 |
||
1717 |
$mod_switch = ( $is_mod ) ? '1' : '0'; |
|
1718 |
$q = $this->sql('SELECT member_id,is_mod FROM '.table_prefix.'group_members WHERE user_id=' . $user_id . ' AND group_id=' . $group_id . ';'); |
|
1719 |
if ( !$q ) |
|
1720 |
$db->_die(); |
|
1721 |
if ( $db->numrows() < 1 ) |
|
1722 |
{ |
|
1723 |
// User is not in group |
|
1724 |
$this->sql('INSERT INTO '.table_prefix.'group_members(user_id,group_id,is_mod) VALUES(' . $user_id . ', ' . $group_id . ', ' . $mod_switch . ');'); |
|
1725 |
return true; |
|
1726 |
} |
|
1727 |
else |
|
1728 |
{ |
|
1729 |
$row = $db->fetchrow(); |
|
1730 |
// Update modship status |
|
1731 |
if ( strval($row['is_mod']) == $mod_switch ) |
|
1732 |
{ |
|
1733 |
// Modship unchanged |
|
1734 |
return true; |
|
1735 |
} |
|
1736 |
else |
|
1737 |
{ |
|
1738 |
// Modship changed |
|
1739 |
$this->sql('UPDATE '.table_prefix.'group_members SET is_mod=' . $mod_switch . ' WHERE member_id=' . $row['member_id'] . ';'); |
|
1740 |
return true; |
|
1741 |
} |
|
1742 |
} |
|
1743 |
return false; |
|
1744 |
} |
|
1745 |
||
1746 |
/** |
|
1747 |
* Removes a user from a group. |
|
1748 |
* @param int User ID |
|
1749 |
* @param int Group ID |
|
1750 |
* @return bool True on success, false on failure |
|
1751 |
* @todo put a little more error checking in... |
|
1752 |
*/ |
|
1753 |
||
1754 |
function remove_user_from_group($user_id, $group_id) |
|
1755 |
{ |
|
1756 |
if ( !is_int($user_id) || !is_int($group_id) ) |
|
1757 |
return false; |
|
1758 |
$this->sql('DELETE FROM '.table_prefix."group_members WHERE user_id=$user_id AND group_id=$group_id;"); |
|
1759 |
return true; |
|
1760 |
} |
|
1761 |
||
1762 |
/** |
|
1763 |
* Checks the banlist to ensure that we're an allowed user. Doesn't return anything because it dies if the user is banned. |
|
1764 |
*/ |
|
1765 |
||
1766 |
function check_banlist() |
|
1767 |
{ |
|
1768 |
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
parents:
387
diff
changeset
|
1769 |
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
parents:
387
diff
changeset
|
1770 |
|
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1771 |
$col_reason = ( $this->compat ) ? '\'No reason available (session manager is in compatibility mode)\' AS reason' : 'reason'; |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1772 |
$remote_addr = ( strstr($_SERVER['REMOTE_ADDR'], ':') ) ? expand_ipv6_address($_SERVER['REMOTE_ADDR']) : $_SERVER['REMOTE_ADDR']; |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1773 |
|
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
parents:
270
diff
changeset
|
1774 |
$banned = false; |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1775 |
if ( $this->user_logged_in ) |
1 | 1776 |
{ |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1777 |
// 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
parents:
317
diff
changeset
|
1778 |
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
parents:
317
diff
changeset
|
1779 |
{ |
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
parents:
317
diff
changeset
|
1780 |
$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
parents:
317
diff
changeset
|
1781 |
. " ( 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
parents:
317
diff
changeset
|
1782 |
. " ( 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
parents:
317
diff
changeset
|
1783 |
. " ( 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
parents:
317
diff
changeset
|
1784 |
. " ( 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
parents:
317
diff
changeset
|
1785 |
. " ( 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
parents:
317
diff
changeset
|
1786 |
. " ( 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
parents:
317
diff
changeset
|
1787 |
. " 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
parents:
317
diff
changeset
|
1788 |
} |
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
parents:
317
diff
changeset
|
1789 |
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
parents:
317
diff
changeset
|
1790 |
{ |
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
parents:
317
diff
changeset
|
1791 |
$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
parents:
317
diff
changeset
|
1792 |
. " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n" |
322
5f1cd51bf1be
Many changes. Installer with PostgreSQL is broken badly and will be for some time.
Dan
parents:
320
diff
changeset
|
1793 |
. " ( 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
parents:
317
diff
changeset
|
1794 |
. " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n" |
322
5f1cd51bf1be
Many changes. Installer with PostgreSQL is broken badly and will be for some time.
Dan
parents:
320
diff
changeset
|
1795 |
. " ( 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
parents:
317
diff
changeset
|
1796 |
. " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n" |
322
5f1cd51bf1be
Many changes. Installer with PostgreSQL is broken badly and will be for some time.
Dan
parents:
320
diff
changeset
|
1797 |
. " ( 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
parents:
317
diff
changeset
|
1798 |
. " 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
parents:
317
diff
changeset
|
1799 |
} |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1800 |
$q = $this->sql($sql); |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1801 |
if ( $db->numrows() > 0 ) |
1 | 1802 |
{ |
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
parents:
387
diff
changeset
|
1803 |
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
parents:
268
diff
changeset
|
1804 |
{ |
425 | 1805 |
if ( $ban_type == BAN_IP && $is_regex != 1 ) |
1 | 1806 |
{ |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1807 |
// check range |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1808 |
$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
parents:
268
diff
changeset
|
1809 |
if ( !$regexp ) |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1810 |
{ |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1811 |
continue; |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1812 |
} |
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1813 |
if ( preg_match("/$regexp/", $remote_addr) ) |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1814 |
{ |
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
parents:
387
diff
changeset
|
1815 |
$reason = $reason_temp; |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1816 |
$banned = true; |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1817 |
} |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1818 |
} |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1819 |
else |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1820 |
{ |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1821 |
// User is banned |
1 | 1822 |
$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
parents:
387
diff
changeset
|
1823 |
$reason = $reason_temp; |
1 | 1824 |
} |
1825 |
} |
|
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1826 |
} |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1827 |
$db->free_result(); |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1828 |
} |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1829 |
else |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1830 |
{ |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1831 |
// 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
parents:
317
diff
changeset
|
1832 |
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
parents:
317
diff
changeset
|
1833 |
{ |
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
parents:
317
diff
changeset
|
1834 |
$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
parents:
317
diff
changeset
|
1835 |
( 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
parents:
317
diff
changeset
|
1836 |
( 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
parents:
317
diff
changeset
|
1837 |
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
parents:
317
diff
changeset
|
1838 |
} |
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
parents:
317
diff
changeset
|
1839 |
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
parents:
317
diff
changeset
|
1840 |
{ |
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
parents:
317
diff
changeset
|
1841 |
$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
parents:
317
diff
changeset
|
1842 |
( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR |
322
5f1cd51bf1be
Many changes. Installer with PostgreSQL is broken badly and will be for some time.
Dan
parents:
320
diff
changeset
|
1843 |
( 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
parents:
317
diff
changeset
|
1844 |
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
parents:
317
diff
changeset
|
1845 |
} |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1846 |
$q = $this->sql($sql); |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1847 |
if ( $db->numrows() > 0 ) |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1848 |
{ |
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
parents:
387
diff
changeset
|
1849 |
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
parents:
268
diff
changeset
|
1850 |
{ |
495
00f5cd31217a
Fixed undefined variable ($row['is_regex'] instead of $is_regex) in sessions.php
Dan
parents:
485
diff
changeset
|
1851 |
if ( $ban_type == BAN_IP && $is_regex != 1 ) |
1 | 1852 |
{ |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1853 |
// check range |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1854 |
$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
parents:
268
diff
changeset
|
1855 |
if ( !$regexp ) |
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1856 |
{ |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1857 |
die("bad regexp for $ban_value"); |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1858 |
continue; |
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1859 |
} |
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1860 |
if ( preg_match("/$regexp/", $remote_addr) ) |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1861 |
{ |
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
parents:
387
diff
changeset
|
1862 |
$reason = $reason_temp; |
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1863 |
$banned = true; |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1864 |
} |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1865 |
} |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1866 |
else |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1867 |
{ |
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1868 |
// 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
parents:
387
diff
changeset
|
1869 |
$reason = $reason_temp; |
1 | 1870 |
$banned = true; |
1871 |
} |
|
1872 |
} |
|
1873 |
} |
|
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1874 |
$db->free_result(); |
1 | 1875 |
} |
1101
30d8bb88572d
Sessions: Improved inactive account UX; shuffled around a bit of code so that whitelist checks are shared; fixed a bunch of bugs related to ban code and IPv6 addresses
Dan
parents:
1089
diff
changeset
|
1876 |
if ( $banned && !$this->on_critical_page(true) ) |
1 | 1877 |
{ |
1878 |
// 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
parents:
387
diff
changeset
|
1879 |
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 | 1880 |
exit; |
1881 |
} |
|
1882 |
} |
|
1883 |
||
1884 |
# Registration |
|
1885 |
||
1886 |
/** |
|
1887 |
* 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
parents:
268
diff
changeset
|
1888 |
* @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
parents:
268
diff
changeset
|
1889 |
* @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
parents:
268
diff
changeset
|
1890 |
* @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
parents:
268
diff
changeset
|
1891 |
* @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
parents:
268
diff
changeset
|
1892 |
* @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 | 1893 |
*/ |
1894 |
||
30 | 1895 |
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
parents:
1
diff
changeset
|
1896 |
{ |
1 | 1897 |
global $db, $session, $paths, $template, $plugins; // Common objects |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
1898 |
global $lang; |
1 | 1899 |
|
1900 |
// 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
parents:
270
diff
changeset
|
1901 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
1 | 1902 |
|
359 | 1903 |
// Since we're recording IP addresses, make sure the user's IP is safe. |
1904 |
$ip =& $_SERVER['REMOTE_ADDR']; |
|
1905 |
if ( !is_valid_ip($ip) ) |
|
1906 |
return 'Invalid IP'; |
|
1907 |
||
1908 |
if ( !preg_match('#^'.$this->valid_username.'$#', $username) ) |
|
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
1909 |
return $lang->get('user_reg_err_username_banned_chars'); |
359 | 1910 |
|
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
parents:
268
diff
changeset
|
1911 |
$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
parents:
133
diff
changeset
|
1912 |
$user_orig = $username; |
1 | 1913 |
$username = $this->prepare_text($username); |
1914 |
$email = $this->prepare_text($email); |
|
1915 |
$real_name = $this->prepare_text($real_name); |
|
1916 |
||
1917 |
$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
parents:
317
diff
changeset
|
1918 |
$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
parents:
131
diff
changeset
|
1919 |
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
parents:
131
diff
changeset
|
1920 |
{ |
1 | 1921 |
$row = $db->fetchrow(); |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
1922 |
$str = 'user_reg_err_dupe'; |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
1923 |
|
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
parents:
131
diff
changeset
|
1924 |
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
parents:
131
diff
changeset
|
1925 |
{ |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
1926 |
$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
parents:
131
diff
changeset
|
1927 |
} |
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
parents:
131
diff
changeset
|
1928 |
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
parents:
131
diff
changeset
|
1929 |
{ |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
1930 |
$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
parents:
131
diff
changeset
|
1931 |
} |
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
parents:
131
diff
changeset
|
1932 |
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
parents:
131
diff
changeset
|
1933 |
{ |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
1934 |
$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
parents:
131
diff
changeset
|
1935 |
} |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
1936 |
|
371
dc6026376919
Improved compatibility with PostgreSQL and fixed a number of installer bugs; fixed missing "meta" category declaration in language files
Dan
parents:
370
diff
changeset
|
1937 |
return $lang->get($str); |
1 | 1938 |
} |
1939 |
||
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
parents:
131
diff
changeset
|
1940 |
// 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
parents:
131
diff
changeset
|
1941 |
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
parents:
131
diff
changeset
|
1942 |
{ |
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
parents:
131
diff
changeset
|
1943 |
$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
parents:
131
diff
changeset
|
1944 |
$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
parents:
131
diff
changeset
|
1945 |
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
parents:
131
diff
changeset
|
1946 |
{ |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
1947 |
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
parents:
131
diff
changeset
|
1948 |
} |
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
parents:
131
diff
changeset
|
1949 |
} |
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
parents:
131
diff
changeset
|
1950 |
|
1 | 1951 |
// Require the account to be activated? |
1952 |
switch(getConfig('account_activation')) |
|
1953 |
{ |
|
1954 |
case 'none': |
|
1955 |
default: |
|
1956 |
$active = '1'; |
|
1957 |
break; |
|
1958 |
case 'user': |
|
1959 |
$active = '0'; |
|
1960 |
break; |
|
1961 |
case 'admin': |
|
1962 |
$active = '0'; |
|
1963 |
break; |
|
1964 |
} |
|
30 | 1965 |
if ( $coppa ) |
1966 |
$active = '0'; |
|
1967 |
||
1968 |
$coppa_col = ( $coppa ) ? '1' : '0'; |
|
1 | 1969 |
|
1970 |
// Generate a totally random activation key |
|
1971 |
$actkey = sha1 ( microtime() . mt_rand() ); |
|
1972 |
||
30 | 1973 |
// We good, create the user |
1148 | 1974 |
$this->sql('INSERT INTO ' . table_prefix . "users ( username, email, real_name, theme, style, reg_time, account_active, activation_key, user_level, user_coppa,\n" |
1975 |
. " user_registration_ip, user_lang, user_has_avatar, avatar_type ) VALUES\n" |
|
1976 |
. " ( '$username', '$email', '$real_name', '$template->default_theme', '$template->default_style', " . time() . ", $active, '$actkey', \n" |
|
1977 |
. " " . USER_LEVEL_CHPREF . ", $coppa_col, '$ip', $lang->lang_id, 0, 'png' );"); |
|
1 | 1978 |
|
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1979 |
// Get user ID and create users_extra entry |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1980 |
$q = $this->sql('SELECT user_id FROM '.table_prefix."users WHERE username='$username';"); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1981 |
if ( $db->numrows() > 0 ) |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1982 |
{ |
359 | 1983 |
list($user_id) = $db->fetchrow_num(); |
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1984 |
$db->free_result(); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1985 |
|
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
parents:
32
diff
changeset
|
1986 |
$this->sql('INSERT INTO '.table_prefix.'users_extra(user_id) VALUES(' . $user_id . ');'); |
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1987 |
} |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
30
diff
changeset
|
1988 |
|
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
1989 |
// Set the password |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
1990 |
$this->set_password($user_id, $password); |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
1991 |
|
731
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
1992 |
// Config option added, 1.1.5 |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
1993 |
if ( getConfig('userpage_grant_acl', '1') == '1' ) |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
1994 |
{ |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
1995 |
// Grant edit and very limited mod access to the userpage |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
1996 |
$acl_data = array( |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
1997 |
'read' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
1998 |
'view_source' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
1999 |
'edit_page' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2000 |
'post_comments' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2001 |
'edit_comments' => AUTH_ALLOW, // only allows editing own comments |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2002 |
'history_view' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2003 |
'history_rollback' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2004 |
'rename' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2005 |
'delete_page' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2006 |
'tag_create' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2007 |
'tag_delete_own' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2008 |
'tag_delete_other' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2009 |
'edit_cat' => AUTH_ALLOW, |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2010 |
'create_page' => AUTH_ALLOW |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2011 |
); |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2012 |
$acl_data = $db->escape($this->perm_to_string($acl_data)); |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2013 |
$userpage = $db->escape(sanitize_page_id($user_orig)); |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2014 |
$cols = "target_type, target_id, page_id, namespace, rules"; |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2015 |
$vals = ACL_TYPE_USER . ", $user_id, '$userpage', 'User', '$acl_data'"; |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2016 |
$q = "INSERT INTO ".table_prefix."acl($cols) VALUES($vals);"; |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2017 |
$this->sql($q); |
8e6dbf6882c2
Added config option to grant userpage rights to new users (defaults to on, as it was hardcoded on before)
Dan
parents:
725
diff
changeset
|
2018 |
} |
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
parents:
133
diff
changeset
|
2019 |
|
1 | 2020 |
// Require the account to be activated? |
30 | 2021 |
if ( $coppa ) |
2022 |
{ |
|
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2023 |
$this->admin_activation_request($user_orig); |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2024 |
$this->send_coppa_mail($user_orig, $email); |
30 | 2025 |
} |
2026 |
else |
|
1 | 2027 |
{ |
30 | 2028 |
switch(getConfig('account_activation')) |
2029 |
{ |
|
2030 |
case 'none': |
|
2031 |
default: |
|
2032 |
break; |
|
2033 |
case 'user': |
|
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2034 |
$a = $this->send_activation_mail($user_orig); |
30 | 2035 |
if(!$a) |
2036 |
{ |
|
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2037 |
$this->admin_activation_request($user_orig); |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2038 |
return $lang->get('user_reg_err_actmail_failed') . ' ' . $a; |
30 | 2039 |
} |
2040 |
break; |
|
2041 |
case 'admin': |
|
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2042 |
$this->admin_activation_request($user_orig); |
30 | 2043 |
break; |
2044 |
} |
|
1 | 2045 |
} |
2046 |
||
2047 |
// Leave some data behind for the hook |
|
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2048 |
$code = $plugins->setHook('user_registered'); |
1 | 2049 |
foreach ( $code as $cmd ) |
2050 |
{ |
|
2051 |
eval($cmd); |
|
2052 |
} |
|
2053 |
||
2054 |
return 'success'; |
|
2055 |
} |
|
2056 |
||
2057 |
/** |
|
2058 |
* Attempts to send an e-mail to the specified user with activation instructions. |
|
2059 |
* @param string $u The usernamd of the user requesting activation |
|
2060 |
* @return bool true on success, false on failure |
|
2061 |
*/ |
|
2062 |
||
2063 |
function send_activation_mail($u, $actkey = false) |
|
2064 |
{ |
|
2065 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2066 |
global $lang; |
1 | 2067 |
$q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';'); |
2068 |
$r = $db->fetchrow(); |
|
2069 |
if ( empty($r['email']) ) |
|
2070 |
$db->_die('BUG: $session->send_activation_mail(): no e-mail address in row'); |
|
2071 |
||
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2072 |
$aklink = makeUrlComplete('Special', 'ActivateAccount/'.str_replace(' ', '_', $u).'/'. ( ( is_string($actkey) ) ? $actkey : $r['activation_key'] ) ); |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2073 |
$message = $lang->get('user_reg_activation_email', array( |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2074 |
'activation_link' => $aklink, |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2075 |
'username' => $u |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2076 |
)); |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2077 |
|
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2078 |
if ( getConfig('smtp_enabled') == '1' ) |
1 | 2079 |
{ |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2080 |
$result = smtp_send_email($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email')); |
832
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2081 |
if ( $result == 'success' ) |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2082 |
{ |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2083 |
$result = true; |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2084 |
} |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2085 |
else |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2086 |
{ |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2087 |
echo $result; |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2088 |
$result = false; |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2089 |
} |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2090 |
} |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2091 |
else |
7152ca0a0ce9
Major redesign of rendering pipeline that separates pages saved with MCE from pages saved with the plaintext editor (full description in long commit message)
Dan
parents:
826
diff
changeset
|
2092 |
{ |
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2093 |
$result = mail($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email')); |
1 | 2094 |
} |
2095 |
return $result; |
|
2096 |
} |
|
2097 |
||
2098 |
/** |
|
30 | 2099 |
* Attempts to send an e-mail to the specified user's e-mail address on file intended for the parents |
2100 |
* @param string $u The usernamd of the user requesting activation |
|
2101 |
* @return bool true on success, false on failure |
|
2102 |
*/ |
|
2103 |
||
2104 |
function send_coppa_mail($u, $actkey = false) |
|
2105 |
{ |
|
2106 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2107 |
global $lang; |
30 | 2108 |
|
2109 |
$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;'); |
|
2110 |
$un = $db->fetchrow(); |
|
2111 |
$admin_user = $un['username']; |
|
2112 |
||
2113 |
$q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';'); |
|
2114 |
$r = $db->fetchrow(); |
|
2115 |
if ( empty($r['email']) ) |
|
2116 |
$db->_die('BUG: $session->send_activation_mail(): no e-mail address in row'); |
|
2117 |
||
2118 |
if(isset($_SERVER['HTTPS'])) $prot = 'https'; |
|
2119 |
else $prot = 'http'; |
|
2120 |
if($_SERVER['SERVER_PORT'] == '80') $p = ''; |
|
2121 |
else $p = ':'.$_SERVER['SERVER_PORT']; |
|
2122 |
$sidbak = false; |
|
2123 |
if($this->sid_super) |
|
2124 |
$sidbak = $this->sid_super; |
|
2125 |
$this->sid_super = false; |
|
2126 |
if($sidbak) |
|
2127 |
$this->sid_super = $sidbak; |
|
2128 |
unset($sidbak); |
|
2129 |
$link = "$prot://".$_SERVER['HTTP_HOST'].scriptPath; |
|
2130 |
||
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2131 |
$message = $lang->get( |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2132 |
'user_reg_activation_email_coppa', |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2133 |
array( |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2134 |
'username' => $u, |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2135 |
'admin_user' => $admin_user, |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2136 |
'site_link' => $link |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2137 |
) |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
359
diff
changeset
|
2138 |
); |
30 | 2139 |
|
2140 |
||
2141 |
if(getConfig('smtp_enabled') == '1') |
|
2142 |
{ |
|
2143 |
$result = smtp_send_email($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email')); |
|
2144 |
if($result == 'success') |
|
2145 |
{ |
|
2146 |
$result = true; |
|
2147 |
} |
|
2148 |
else |
|
2149 |
{ |
|
2150 |
echo $result; |
|
2151 |
$result = false; |
|
2152 |
} |
|
2153 |
} |
|
2154 |
else |
|
2155 |
{ |
|
2156 |
$result = mail($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email')); |
|
2157 |
} |
|
2158 |
return $result; |
|
2159 |
} |
|
2160 |
||
2161 |
/** |
|
1 | 2162 |
* Sends an e-mail to a user so they can reset their password. |
2163 |
* @param int $user The user ID, or username if it's a string |
|
2164 |
* @return bool true on success, false on failure |
|
2165 |
*/ |
|
2166 |
||
2167 |
function mail_password_reset($user) |
|
2168 |
{ |
|
2169 |
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
parents:
326
diff
changeset
|
2170 |
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
parents:
326
diff
changeset
|
2171 |
|
1 | 2172 |
if(is_int($user)) |
2173 |
{ |
|
2174 |
$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 |
|
2175 |
} |
|
2176 |
elseif(is_string($user)) |
|
2177 |
{ |
|
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
parents:
317
diff
changeset
|
2178 |
$q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=' . ENANO_SQLFUNC_LOWERCASE . '(\''.$db->escape($user).'\');'); |
1 | 2179 |
} |
2180 |
else |
|
2181 |
{ |
|
2182 |
return false; |
|
2183 |
} |
|
2184 |
||
2185 |
$row = $db->fetchrow(); |
|
2186 |
$temp_pass = $this->random_pass(); |
|
2187 |
||
2188 |
$this->register_temp_password($row['user_id'], $temp_pass); |
|
2189 |
||
2190 |
$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
parents:
326
diff
changeset
|
2191 |
|
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
parents:
326
diff
changeset
|
2192 |
$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
parents:
326
diff
changeset
|
2193 |
'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
parents:
326
diff
changeset
|
2194 |
'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
parents:
326
diff
changeset
|
2195 |
'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
parents:
326
diff
changeset
|
2196 |
'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
parents:
326
diff
changeset
|
2197 |
)); |
1 | 2198 |
|
2199 |
if(getConfig('smtp_enabled') == '1') |
|
2200 |
{ |
|
2201 |
$result = smtp_send_email($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email')); |
|
2202 |
if($result == 'success') |
|
2203 |
{ |
|
2204 |
$result = true; |
|
2205 |
} |
|
2206 |
else |
|
2207 |
{ |
|
2208 |
echo '<p>'.$result.'</p>'; |
|
2209 |
$result = false; |
|
2210 |
} |
|
2211 |
} else { |
|
2212 |
$result = mail($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email')); |
|
2213 |
} |
|
2214 |
return $result; |
|
2215 |
} |
|
2216 |
||
2217 |
/** |
|
2218 |
* Sets the temporary password for the specified user to whatever is specified. |
|
2219 |
* @param int $user_id |
|
2220 |
* @param string $password |
|
2221 |
* @return bool |
|
2222 |
*/ |
|
2223 |
||
2224 |
function register_temp_password($user_id, $password) |
|
2225 |
{ |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2226 |
global $db; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2227 |
if ( !is_int($user_id) ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2228 |
return false; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2229 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2230 |
$this->sql('SELECT password_salt FROM ' . table_prefix . "users WHERE user_id = $user_id;"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2231 |
if ( $db->numrows() < 1 ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2232 |
return false; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2233 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2234 |
list($salt) = $db->fetchrow_num(); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2235 |
$db->free_result(); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2236 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2237 |
$temp_pass = hmac_sha1($password, $salt); |
1 | 2238 |
$this->sql('UPDATE '.table_prefix.'users SET temp_password=\'' . $temp_pass . '\',temp_password_time='.time().' WHERE user_id='.intval($user_id).';'); |
2239 |
} |
|
2240 |
||
2241 |
/** |
|
2242 |
* Sends a request to the admin panel to have the username $u activated. |
|
2243 |
* @param string $u The username of the user requesting activation |
|
2244 |
*/ |
|
2245 |
||
2246 |
function admin_activation_request($u) |
|
2247 |
{ |
|
2248 |
global $db; |
|
1211 | 2249 |
$this->sql('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, author, edit_summary) VALUES(\'admin\', \'activ_req\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$this->username.'\', \''.$db->escape($u).'\');'); |
1 | 2250 |
} |
2251 |
||
2252 |
/** |
|
2253 |
* Activates a user account. If the action fails, a report is sent to the admin. |
|
2254 |
* @param string $user The username of the user requesting activation |
|
2255 |
* @param string $key The activation key |
|
2256 |
*/ |
|
2257 |
||
2258 |
function activate_account($user, $key) |
|
2259 |
{ |
|
2260 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
1175
1e2c9819ede3
Logs: Fully integrated an author_uid column. Logs are now linked by user ID instead of just username, so they survive username changes better. Database is changed. Fixes issue 6.
Dan
parents:
1173
diff
changeset
|
2261 |
$q = $this->sql('SELECT 1 FROM ' . table_prefix . 'users WHERE username = \''.$db->escape($user).'\' AND activation_key = \''.$db->escape($key).'\''); |
1e2c9819ede3
Logs: Fully integrated an author_uid column. Logs are now linked by user ID instead of just username, so they survive username changes better. Database is changed. Fixes issue 6.
Dan
parents:
1173
diff
changeset
|
2262 |
if ( $db->numrows() > 0 ) |
1 | 2263 |
{ |
1175
1e2c9819ede3
Logs: Fully integrated an author_uid column. Logs are now linked by user ID instead of just username, so they survive username changes better. Database is changed. Fixes issue 6.
Dan
parents:
1173
diff
changeset
|
2264 |
$new_key = md5(AESCrypt::randkey()); |
1e2c9819ede3
Logs: Fully integrated an author_uid column. Logs are now linked by user ID instead of just username, so they survive username changes better. Database is changed. Fixes issue 6.
Dan
parents:
1173
diff
changeset
|
2265 |
$this->sql('UPDATE ' . table_prefix . 'users SET account_active = 1, activation_key = \'' . $new_key . '\' WHERE username=\''.$db->escape($user).'\' AND activation_key=\''.$db->escape($key).'\';'); |
1e2c9819ede3
Logs: Fully integrated an author_uid column. Logs are now linked by user ID instead of just username, so they survive username changes better. Database is changed. Fixes issue 6.
Dan
parents:
1173
diff
changeset
|
2266 |
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_good\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')'); |
1206
50f6c144ec68
Fixed some bugs with account activation, especially if you're a half-logged-in vegetable.
Dan
parents:
1205
diff
changeset
|
2267 |
return true; |
1 | 2268 |
} |
2269 |
else |
|
2270 |
{ |
|
1175
1e2c9819ede3
Logs: Fully integrated an author_uid column. Logs are now linked by user ID instead of just username, so they survive username changes better. Database is changed. Fixes issue 6.
Dan
parents:
1173
diff
changeset
|
2271 |
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_bad\', '.time().', \''.enano_date(ED_DATE | ED_TIME).'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')'); |
1206
50f6c144ec68
Fixed some bugs with account activation, especially if you're a half-logged-in vegetable.
Dan
parents:
1205
diff
changeset
|
2272 |
return false; |
1 | 2273 |
} |
2274 |
} |
|
2275 |
||
2276 |
/** |
|
2277 |
* For a given user level identifier (USER_LEVEL_*), returns a string describing that user level. |
|
2278 |
* @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
parents:
31
diff
changeset
|
2279 |
* @param bool If true, returns a shorter string. Optional. |
1 | 2280 |
* @return string |
2281 |
*/ |
|
2282 |
||
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
2283 |
function userlevel_to_string($user_level, $short = false) |
1 | 2284 |
{ |
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
parents:
387
diff
changeset
|
2285 |
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
parents:
387
diff
changeset
|
2286 |
|
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
parents:
387
diff
changeset
|
2287 |
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
parents:
387
diff
changeset
|
2288 |
'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
parents:
387
diff
changeset
|
2289 |
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
parents:
387
diff
changeset
|
2290 |
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
parents:
387
diff
changeset
|
2291 |
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
parents:
387
diff
changeset
|
2292 |
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
parents:
387
diff
changeset
|
2293 |
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
parents:
387
diff
changeset
|
2294 |
), |
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
parents:
387
diff
changeset
|
2295 |
'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
parents:
387
diff
changeset
|
2296 |
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
parents:
387
diff
changeset
|
2297 |
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
parents:
387
diff
changeset
|
2298 |
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
parents:
387
diff
changeset
|
2299 |
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
parents:
387
diff
changeset
|
2300 |
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
parents:
387
diff
changeset
|
2301 |
), |
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
parents:
387
diff
changeset
|
2302 |
'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
parents:
387
diff
changeset
|
2303 |
); |
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
parents:
387
diff
changeset
|
2304 |
|
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
parents:
387
diff
changeset
|
2305 |
if ( is_object($lang) && !$levels['l10n'] ) |
1 | 2306 |
{ |
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
parents:
387
diff
changeset
|
2307 |
$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
parents:
387
diff
changeset
|
2308 |
'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
parents:
387
diff
changeset
|
2309 |
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
parents:
387
diff
changeset
|
2310 |
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
parents:
387
diff
changeset
|
2311 |
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
parents:
387
diff
changeset
|
2312 |
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
parents:
387
diff
changeset
|
2313 |
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
parents:
387
diff
changeset
|
2314 |
), |
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
parents:
387
diff
changeset
|
2315 |
'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
parents:
387
diff
changeset
|
2316 |
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
parents:
387
diff
changeset
|
2317 |
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
parents:
387
diff
changeset
|
2318 |
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
parents:
387
diff
changeset
|
2319 |
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
parents:
387
diff
changeset
|
2320 |
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
parents:
387
diff
changeset
|
2321 |
), |
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
parents:
387
diff
changeset
|
2322 |
'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
parents:
387
diff
changeset
|
2323 |
); |
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
parents:
387
diff
changeset
|
2324 |
} |
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
parents:
387
diff
changeset
|
2325 |
|
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
parents:
387
diff
changeset
|
2326 |
$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
parents:
387
diff
changeset
|
2327 |
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
parents:
387
diff
changeset
|
2328 |
{ |
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
parents:
387
diff
changeset
|
2329 |
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
parents:
31
diff
changeset
|
2330 |
} |
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
2331 |
else |
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
2332 |
{ |
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
parents:
387
diff
changeset
|
2333 |
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
parents:
31
diff
changeset
|
2334 |
{ |
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
parents:
387
diff
changeset
|
2335 |
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
parents:
387
diff
changeset
|
2336 |
} |
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
parents:
387
diff
changeset
|
2337 |
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
parents:
387
diff
changeset
|
2338 |
{ |
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
parents:
387
diff
changeset
|
2339 |
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
parents:
31
diff
changeset
|
2340 |
} |
1 | 2341 |
} |
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
parents:
387
diff
changeset
|
2342 |
|
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
parents:
387
diff
changeset
|
2343 |
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
parents:
387
diff
changeset
|
2344 |
|
1 | 2345 |
} |
2346 |
||
2347 |
/** |
|
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2348 |
* Change a user's e-mail address. |
1 | 2349 |
* @param int $user_id The user ID of the user to update - this cannot be changed |
2350 |
* @param string $email The new e-mail address |
|
2351 |
* @return string 'success' if successful, or array of error strings on failure |
|
2352 |
*/ |
|
2353 |
||
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2354 |
function change_email($user_id, $email) |
1 | 2355 |
{ |
2356 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
2357 |
||
2358 |
// Create some arrays |
|
2359 |
||
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2360 |
$errors = array(); // Used to hold error strings |
1 | 2361 |
|
2362 |
// Scan the user ID for problems |
|
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2363 |
if ( intval($user_id) < 1 ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2364 |
$errors[] = 'SQL injection attempt'; |
1 | 2365 |
|
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2366 |
$user_id = intval($user_id); |
1 | 2367 |
|
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2368 |
// Verify e-mail address |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2369 |
if ( !check_email_address($email) ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2370 |
$errors[] = 'user_err_email_not_valid'; |
1 | 2371 |
|
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2372 |
if ( count($errors) > 0 ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2373 |
return $errors; |
1 | 2374 |
|
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2375 |
// Make query |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2376 |
$email = $db->escape($email); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2377 |
$q = $db->sql_query('UPDATE ' . table_prefix . "users SET email = '$email' WHERE user_id = $user_id;"); |
1 | 2378 |
|
2379 |
// We also need to trigger re-activation. |
|
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2380 |
switch(getConfig('account_activation', 'none')) |
1 | 2381 |
{ |
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2382 |
case 'user': |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2383 |
case 'admin': |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2384 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2385 |
// Note: even with admin activation, activation e-mails are sent when an e-mail is changed. |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2386 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2387 |
if ( $session->user_level >= USER_LEVEL_MOD && getConfig('account_activation') == 'admin' ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2388 |
// Trust admins and moderators |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2389 |
break; |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2390 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2391 |
// retrieve username |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2392 |
if ( !$username ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2393 |
{ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2394 |
$q = $this->sql('SELECT username FROM ' . table_prefix . "users WHERE user_id = $user_id;"); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2395 |
if($db->numrows() < 1) |
1 | 2396 |
{ |
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2397 |
$errors[] = 'The username could not be selected.'; |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2398 |
} |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2399 |
else |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2400 |
{ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2401 |
$row = $db->fetchrow(); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2402 |
$username = $row['username']; |
1 | 2403 |
} |
1079
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2404 |
} |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2405 |
if ( !$username ) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2406 |
return $errors; |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2407 |
|
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2408 |
// Generate an activation key |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2409 |
$actkey = sha1 ( microtime() . mt_rand() ); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2410 |
$a = $this->send_activation_mail($username, $actkey); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2411 |
if(!$a) |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2412 |
{ |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2413 |
$this->admin_activation_request($username); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2414 |
} |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2415 |
// Deactivate the account until e-mail is confirmed |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2416 |
$q = $db->sql_query('UPDATE ' . table_prefix . "users SET account_active = 0, activation_key = '$actkey' WHERE user_id = $user_id;"); |
fcc42560afe6
Added ability for authentication plugins to modify session keys (to allow invalidation when their own authentication data is changed) as well as the ability to disable the built-in password change facility
Dan
parents:
1071
diff
changeset
|
2417 |
break; |
1 | 2418 |
} |
2419 |
||
2420 |
// Yay! We're done |
|
2421 |
return 'success'; |
|
2422 |
} |
|
2423 |
||
591
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2424 |
/** |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2425 |
* Sets a user's password. |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2426 |
* @param int|string User ID or username |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2427 |
* @param string New password |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2428 |
*/ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2429 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2430 |
function set_password($user, $password) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2431 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2432 |
// Generate new password and salt |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2433 |
$hmac_secret = hexencode(AESCrypt::randkey(20), '', ''); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2434 |
$password_hmac = hmac_sha1($password, $hmac_secret); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2435 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2436 |
// Figure out how we want to specify the user |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2437 |
$uidcol = is_int($user) ? "user_id = $user" : ENANO_SQLFUNC_LOWERCASE . "(username) = '" . strtolower($this->prepare_text($user)) . "'"; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2438 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2439 |
// Perform update |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2440 |
$this->sql('UPDATE ' . table_prefix . "users SET old_encryption = 0, password = '$password_hmac', password_salt = '$hmac_secret' WHERE $uidcol;"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2441 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2442 |
return true; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2443 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2444 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
2445 |
/** |
591
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2446 |
* 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
parents:
590
diff
changeset
|
2447 |
* @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
parents:
590
diff
changeset
|
2448 |
* @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
parents:
590
diff
changeset
|
2449 |
* @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
parents:
590
diff
changeset
|
2450 |
*/ |
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2451 |
|
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2452 |
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
parents:
590
diff
changeset
|
2453 |
{ |
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2454 |
$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
parents:
590
diff
changeset
|
2455 |
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
parents:
590
diff
changeset
|
2456 |
} |
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2457 |
|
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2458 |
/** |
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2459 |
* 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
parents:
590
diff
changeset
|
2460 |
* @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
parents:
590
diff
changeset
|
2461 |
* @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
parents:
590
diff
changeset
|
2462 |
* @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
parents:
590
diff
changeset
|
2463 |
*/ |
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2464 |
|
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2465 |
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
parents:
590
diff
changeset
|
2466 |
{ |
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2467 |
$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
parents:
590
diff
changeset
|
2468 |
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
parents:
590
diff
changeset
|
2469 |
} |
2529833a7731
Made $session->private_key protected and added pk_{en,de}crypt methods for encrypting and decrypting data using the private key
Dan
parents:
590
diff
changeset
|
2470 |
|
1 | 2471 |
# |
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
parents:
536
diff
changeset
|
2472 |
# 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
parents:
536
diff
changeset
|
2473 |
# |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
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
parents:
536
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
parents:
536
diff
changeset
|
2476 |
* 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
parents:
536
diff
changeset
|
2477 |
* 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
parents:
536
diff
changeset
|
2478 |
* 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
parents:
536
diff
changeset
|
2479 |
* 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
parents:
536
diff
changeset
|
2480 |
* 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
parents:
536
diff
changeset
|
2481 |
* 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
parents:
536
diff
changeset
|
2482 |
* 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
parents:
536
diff
changeset
|
2483 |
*/ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2484 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
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
parents:
536
diff
changeset
|
2486 |
* 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
parents:
536
diff
changeset
|
2487 |
* @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
parents:
536
diff
changeset
|
2488 |
* @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
parents:
536
diff
changeset
|
2489 |
*/ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2490 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2491 |
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
parents:
536
diff
changeset
|
2492 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2493 |
// 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
parents:
536
diff
changeset
|
2494 |
$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
parents:
536
diff
changeset
|
2495 |
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
parents:
536
diff
changeset
|
2496 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2497 |
$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
parents:
536
diff
changeset
|
2498 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2499 |
$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
parents:
536
diff
changeset
|
2500 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2501 |
$gid_col = ( ENANO_DBLAYER == 'PGSQL' ) ? |
618 | 2502 |
'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
parents:
536
diff
changeset
|
2503 |
'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
parents:
536
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
parents:
536
diff
changeset
|
2505 |
// 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
parents:
536
diff
changeset
|
2506 |
$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
parents:
536
diff
changeset
|
2507 |
. " 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
parents:
536
diff
changeset
|
2508 |
. " 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
parents:
536
diff
changeset
|
2509 |
. " COALESCE(ru.rank_style, rg.rank_style, rl.rank_style, rd.rank_style) AS rank_style,\n" |
770
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2510 |
. " rg.rank_id AS group_rank_id,\n" |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2511 |
. " ( ru.rank_id IS NULL AND rg.rank_id IS NULL ) AS using_default,\n" |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2512 |
. " ( ru.rank_id IS NULL AND rg.rank_id IS NOT NULL ) AS using_group,\n" |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2513 |
. " ( ru.rank_id IS NOT NULL ) AS using_user,\n" |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2514 |
. " u.user_rank_userset,\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
parents:
536
diff
changeset
|
2515 |
. " $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
parents:
536
diff
changeset
|
2516 |
. " FROM " . table_prefix . "users AS u\n" |
584 | 2517 |
. " 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
parents:
536
diff
changeset
|
2518 |
. " 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
parents:
536
diff
changeset
|
2519 |
. " 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
parents:
536
diff
changeset
|
2520 |
. " ON ( u.user_id = m.user_id )\n" |
584 | 2521 |
. " 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
parents:
536
diff
changeset
|
2522 |
. " ON ( u.user_rank = ru.rank_id )\n" |
584 | 2523 |
. " 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
parents:
536
diff
changeset
|
2524 |
. " ON ( g.group_rank = rg.rank_id )\n" |
584 | 2525 |
. " 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
parents:
536
diff
changeset
|
2526 |
. " 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
parents:
536
diff
changeset
|
2527 |
. $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
parents:
536
diff
changeset
|
2528 |
. " )\n" |
584 | 2529 |
. " LEFT JOIN " . table_prefix . "ranks AS rd\n" |
580 | 2530 |
. " ON ( rd.rank_id = 1 )$append\n" |
776 | 2531 |
. " GROUP BY u.user_id, u.username, u.user_level, u.user_group, u.user_rank, u.user_title, u.user_rank_userset, g.group_rank,\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
parents:
536
diff
changeset
|
2532 |
. " ru.rank_id, ru.rank_title, ru.rank_style,rg.rank_id, rg.rank_title, rg.rank_style,\n" |
580 | 2533 |
. " 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
parents:
536
diff
changeset
|
2534 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2535 |
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
parents:
536
diff
changeset
|
2536 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2537 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2538 |
/** |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2539 |
* 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
parents:
536
diff
changeset
|
2540 |
* 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
parents:
536
diff
changeset
|
2541 |
* 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
parents:
536
diff
changeset
|
2542 |
* 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
parents:
536
diff
changeset
|
2543 |
* 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
parents:
536
diff
changeset
|
2544 |
* 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
parents:
536
diff
changeset
|
2545 |
* 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
parents:
536
diff
changeset
|
2546 |
* 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
parents:
536
diff
changeset
|
2547 |
* @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
parents:
536
diff
changeset
|
2548 |
* @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
parents:
536
diff
changeset
|
2549 |
*/ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2550 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2551 |
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
parents:
536
diff
changeset
|
2552 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2553 |
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
parents:
536
diff
changeset
|
2554 |
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
parents:
536
diff
changeset
|
2555 |
global $user_ranks; |
770
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2556 |
// cache info in RAM if possible |
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
parents:
536
diff
changeset
|
2557 |
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
parents:
536
diff
changeset
|
2558 |
|
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
parents:
592
diff
changeset
|
2559 |
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
parents:
592
diff
changeset
|
2560 |
$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
parents:
592
diff
changeset
|
2561 |
|
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
parents:
536
diff
changeset
|
2562 |
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
parents:
592
diff
changeset
|
2563 |
$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
parents:
536
diff
changeset
|
2564 |
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
parents:
536
diff
changeset
|
2565 |
$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
parents:
536
diff
changeset
|
2566 |
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
parents:
536
diff
changeset
|
2567 |
// 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
parents:
536
diff
changeset
|
2568 |
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
parents:
536
diff
changeset
|
2569 |
|
770
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2570 |
// check the RAM cache |
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
parents:
536
diff
changeset
|
2571 |
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
parents:
536
diff
changeset
|
2572 |
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
parents:
536
diff
changeset
|
2573 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2574 |
// 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
parents:
536
diff
changeset
|
2575 |
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
parents:
536
diff
changeset
|
2576 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2577 |
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
parents:
536
diff
changeset
|
2578 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2579 |
$_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
parents:
536
diff
changeset
|
2580 |
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
parents:
536
diff
changeset
|
2581 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2582 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2583 |
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
parents:
536
diff
changeset
|
2584 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2585 |
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
parents:
536
diff
changeset
|
2586 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2587 |
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
parents:
536
diff
changeset
|
2588 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2589 |
$_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
parents:
536
diff
changeset
|
2590 |
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
parents:
536
diff
changeset
|
2591 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2592 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2593 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2594 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2595 |
$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
parents:
536
diff
changeset
|
2596 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2597 |
$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
parents:
536
diff
changeset
|
2598 |
// 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
parents:
536
diff
changeset
|
2599 |
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
parents:
536
diff
changeset
|
2600 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2601 |
// 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
parents:
536
diff
changeset
|
2602 |
$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
parents:
536
diff
changeset
|
2603 |
$_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
parents:
536
diff
changeset
|
2604 |
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
parents:
536
diff
changeset
|
2605 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2606 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2607 |
// 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
parents:
536
diff
changeset
|
2608 |
$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
parents:
536
diff
changeset
|
2609 |
$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
parents:
536
diff
changeset
|
2610 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2611 |
$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
parents:
536
diff
changeset
|
2612 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2613 |
$_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
parents:
536
diff
changeset
|
2614 |
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
parents:
536
diff
changeset
|
2615 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2616 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2617 |
/** |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2618 |
* 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
parents:
536
diff
changeset
|
2619 |
* @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
parents:
536
diff
changeset
|
2620 |
* @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
parents:
536
diff
changeset
|
2621 |
*/ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2622 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2623 |
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
parents:
536
diff
changeset
|
2624 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2625 |
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
parents:
536
diff
changeset
|
2626 |
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
parents:
536
diff
changeset
|
2627 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2628 |
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
parents:
536
diff
changeset
|
2629 |
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
parents:
536
diff
changeset
|
2630 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2631 |
// 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
parents:
536
diff
changeset
|
2632 |
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
parents:
536
diff
changeset
|
2633 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2634 |
$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
parents:
536
diff
changeset
|
2635 |
'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
parents:
536
diff
changeset
|
2636 |
'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
parents:
536
diff
changeset
|
2637 |
'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
parents:
536
diff
changeset
|
2638 |
); |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2639 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2640 |
// 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
parents:
536
diff
changeset
|
2641 |
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
parents:
536
diff
changeset
|
2642 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2643 |
$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
parents:
536
diff
changeset
|
2644 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2645 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2646 |
// 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
parents:
536
diff
changeset
|
2647 |
$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
parents:
536
diff
changeset
|
2648 |
$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
parents:
536
diff
changeset
|
2649 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2650 |
// 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
parents:
536
diff
changeset
|
2651 |
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
parents:
536
diff
changeset
|
2652 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2653 |
$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
parents:
536
diff
changeset
|
2654 |
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
parents:
536
diff
changeset
|
2655 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2656 |
// 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
parents:
536
diff
changeset
|
2657 |
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
parents:
536
diff
changeset
|
2658 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2659 |
// 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
parents:
536
diff
changeset
|
2660 |
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
parents:
536
diff
changeset
|
2661 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2662 |
// 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
parents:
536
diff
changeset
|
2663 |
$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
parents:
536
diff
changeset
|
2664 |
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
parents:
536
diff
changeset
|
2665 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2666 |
$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
parents:
536
diff
changeset
|
2667 |
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
parents:
536
diff
changeset
|
2668 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2669 |
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
parents:
536
diff
changeset
|
2670 |
$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
parents:
536
diff
changeset
|
2671 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2672 |
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
parents:
536
diff
changeset
|
2673 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2674 |
$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
parents:
536
diff
changeset
|
2675 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2676 |
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
parents:
536
diff
changeset
|
2677 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2678 |
$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
parents:
536
diff
changeset
|
2679 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2680 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2681 |
// 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
parents:
536
diff
changeset
|
2682 |
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
parents:
536
diff
changeset
|
2683 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2684 |
// 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
parents:
536
diff
changeset
|
2685 |
// 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
parents:
536
diff
changeset
|
2686 |
$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
parents:
536
diff
changeset
|
2687 |
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
parents:
536
diff
changeset
|
2688 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2689 |
$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
parents:
536
diff
changeset
|
2690 |
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
parents:
536
diff
changeset
|
2691 |
{ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2692 |
$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
parents:
536
diff
changeset
|
2693 |
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
parents:
536
diff
changeset
|
2694 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2695 |
$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
parents:
536
diff
changeset
|
2696 |
$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
parents:
536
diff
changeset
|
2697 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2698 |
// 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
parents:
536
diff
changeset
|
2699 |
// 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
parents:
536
diff
changeset
|
2700 |
$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
parents:
536
diff
changeset
|
2701 |
$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
parents:
536
diff
changeset
|
2702 |
$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
parents:
536
diff
changeset
|
2703 |
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
parents:
536
diff
changeset
|
2704 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2705 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2706 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2707 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2708 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2709 |
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
parents:
536
diff
changeset
|
2710 |
$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
parents:
536
diff
changeset
|
2711 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2712 |
$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
parents:
536
diff
changeset
|
2713 |
$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
parents:
536
diff
changeset
|
2714 |
$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
parents:
536
diff
changeset
|
2715 |
|
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2716 |
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
parents:
536
diff
changeset
|
2717 |
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
parents:
536
diff
changeset
|
2718 |
} |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
2719 |
|
770
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2720 |
/** |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2721 |
* Get the list of ranks that a user is allowed to use. Returns false if they cannot change it. |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2722 |
* @param string|int User ID or username |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2723 |
* @return array Associative by rank ID |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2724 |
*/ |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2725 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2726 |
function get_user_possible_ranks($id) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2727 |
{ |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2728 |
global $db, $session, $paths, $template, $plugins; // Common objects |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2729 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2730 |
// cache info in RAM if possible |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2731 |
static $_cache = array(); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2732 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2733 |
if ( is_int($id) && $id == 0 ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2734 |
$id = 1; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2735 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2736 |
if ( is_int($id) ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2737 |
$col = "u.user_id = $id"; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2738 |
else if ( is_string($id) ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2739 |
$col = ENANO_SQLFUNC_LOWERCASE . "(username) = " . ENANO_SQLFUNC_LOWERCASE . "('" . $db->escape($id) . "')"; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2740 |
else |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2741 |
// invalid parameter |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2742 |
return false; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2743 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2744 |
// check the RAM cache |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2745 |
if ( isset($_cache[$id]) ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2746 |
return $_cache[$id]; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2747 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2748 |
$sql = $this->generate_rank_sql("\n WHERE $col"); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2749 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2750 |
$q = $this->sql($sql); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2751 |
// any results? |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2752 |
if ( $db->numrows() < 1 ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2753 |
{ |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2754 |
// nuttin'. |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2755 |
$db->free_result(); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2756 |
$_cache[$id] = false; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2757 |
return false; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2758 |
} |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2759 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2760 |
// Found something. |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2761 |
$row = $db->fetchrow(); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2762 |
$db->free_result(); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2763 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2764 |
if ( $row['using_user'] && !$row['user_rank_userset'] ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2765 |
{ |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2766 |
// The user's rank was set manually by an admin. |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2767 |
$result = array( |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2768 |
array( |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2769 |
'rank_id' => $row['rank_id'], |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2770 |
'rank_title' => $row['rank_title'], |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2771 |
'rank_style' => $row['rank_style'], |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2772 |
'rank_type' => 'user' |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2773 |
) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2774 |
); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2775 |
$_cache[$id] = $result; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2776 |
return $result; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2777 |
} |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2778 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2779 |
// copy the result to a more permanent array so we can reference this later |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2780 |
$current_settings = $row; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2781 |
unset($row); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2782 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2783 |
$result = array(); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2784 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2785 |
// first rank available to us will be the one set by the user's user level |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2786 |
if ( isset($this->level_rank_table[$current_settings['user_level']]) ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2787 |
{ |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2788 |
$q = $this->sql('SELECT rank_id, rank_title, rank_style FROM ' . table_prefix . "ranks WHERE rank_id = {$this->level_rank_table[$this->user_level]};"); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2789 |
if ( $db->numrows() > 0 ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2790 |
{ |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2791 |
$row = $db->fetchrow(); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2792 |
$row['rank_type'] = 'ulevel'; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2793 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2794 |
$result[] = $row; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2795 |
} |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2796 |
$db->free_result(); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2797 |
} |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2798 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2799 |
// for each group the user is in, figure out if it has a rank associated with it |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2800 |
$group_list = explode(',', $current_settings['group_list']); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2801 |
foreach ( $group_list as $group_id ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2802 |
{ |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2803 |
$group_id = intval($group_id); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2804 |
$q = $this->sql('SELECT r.rank_id, r.rank_title, r.rank_style FROM ' . table_prefix . "groups AS g\n" |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2805 |
. " LEFT JOIN " . table_prefix . "ranks AS r\n" |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2806 |
. " ON ( g.group_rank = r.rank_id )\n" |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2807 |
. " WHERE g.group_id = $group_id\n" |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2808 |
. " AND r.rank_id IS NOT NULL;"); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2809 |
if ( $db->numrows() > 0 ) |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2810 |
{ |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2811 |
$row = $db->fetchrow(); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2812 |
$row['rank_type'] = 'group'; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2813 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2814 |
$result[] = $row; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2815 |
} |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2816 |
$db->free_result(); |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2817 |
} |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2818 |
|
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2819 |
$_cache[$id] = $result; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2820 |
return $result; |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2821 |
} |
62fed244fa1c
Fixed timezone preference setting not fully implemented; added ability for users to select their own rank from a list of possible ranks based on group membership and user level
Dan
parents:
749
diff
changeset
|
2822 |
|
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
parents:
536
diff
changeset
|
2823 |
# |
1 | 2824 |
# Access Control Lists |
2825 |
# |
|
2826 |
||
2827 |
/** |
|
2828 |
* Creates a new permission field in memory. If the permissions are set in the database, they are used. Otherwise, $default_perm is used. |
|
2829 |
* @param string $acl_type An identifier for this field |
|
2830 |
* @param int $default_perm Whether permission should be granted or not if it's not specified in the ACLs. |
|
2831 |
* @param string $desc A human readable name for the permission type |
|
2832 |
* @param array $deps The list of dependencies - this should be an array of ACL types |
|
2833 |
* @param string $scope Which namespaces this field should apply to. This should be either a pipe-delimited list of namespace IDs or just "All". |
|
2834 |
*/ |
|
2835 |
||
2836 |
function register_acl_type($acl_type, $default_perm = AUTH_DISALLOW, $desc = false, $deps = Array(), $scope = 'All') |
|
2837 |
{ |
|
2838 |
if(isset($this->acl_types[$acl_type])) |
|
2839 |
return false; |
|
2840 |
else |
|
2841 |
{ |
|
2842 |
if(!$desc) |
|
2843 |
{ |
|
2844 |
$desc = capitalize_first_letter(str_replace('_', ' ', $acl_type)); |
|
2845 |
} |
|
2846 |
$this->acl_types[$acl_type] = $default_perm; |
|
2847 |
$this->acl_descs[$acl_type] = $desc; |
|
2848 |
$this->acl_deps[$acl_type] = $deps; |
|
2849 |
$this->acl_scope[$acl_type] = explode('|', $scope); |
|
2850 |
} |
|
2851 |
return true; |
|
2852 |
} |
|
2853 |
||
2854 |
/** |
|
2855 |
* Tells us whether permission $type is allowed or not based on the current rules. |
|
2856 |
* @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type()) |
|
2857 |
* @param bool $no_deps If true, disables dependency checking |
|
2858 |
* @return bool True if allowed, false if denied or if an error occured |
|
2859 |
*/ |
|
2860 |
||
2861 |
function get_permissions($type, $no_deps = false) |
|
2862 |
{ |
|
2863 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
2864 |
if ( isset( $this->perms[$type] ) ) |
|
2865 |
{ |
|
2866 |
if ( $this->perms[$type] == AUTH_DENY ) |
|
2867 |
$ret = false; |
|
2868 |
else if ( $this->perms[$type] == AUTH_WIKIMODE && $paths->wiki_mode ) |
|
2869 |
$ret = true; |
|
2870 |
else if ( $this->perms[$type] == AUTH_WIKIMODE && !$paths->wiki_mode ) |
|
2871 |
$ret = false; |
|
2872 |
else if ( $this->perms[$type] == AUTH_ALLOW ) |
|
2873 |
$ret = true; |
|
2874 |
else if ( $this->perms[$type] == AUTH_DISALLOW ) |
|
2875 |
$ret = false; |
|
2876 |
} |
|
2877 |
else if(isset($this->acl_types[$type])) |
|
2878 |
{ |
|
2879 |
if ( $this->acl_types[$type] == AUTH_DENY ) |
|
2880 |
$ret = false; |
|
2881 |
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode ) |
|
2882 |
$ret = true; |
|
2883 |
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode ) |
|
2884 |
$ret = false; |
|
2885 |
else if ( $this->acl_types[$type] == AUTH_ALLOW ) |
|
2886 |
$ret = true; |
|
2887 |
else if ( $this->acl_types[$type] == AUTH_DISALLOW ) |
|
2888 |
$ret = false; |
|
2889 |
} |
|
2890 |
else |
|
2891 |
{ |
|
2892 |
// ACL type is undefined |
|
2893 |
trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING); |
|
2894 |
return false; // Be on the safe side and deny access |
|
2895 |
} |
|
2896 |
if ( !$no_deps ) |
|
2897 |
{ |
|
2898 |
if ( !$this->acl_check_deps($type) ) |
|
2899 |
return false; |
|
2900 |
} |
|
2901 |
return $ret; |
|
2902 |
} |
|
2903 |
||
2904 |
/** |
|
2905 |
* Fetch the permissions that apply to the current user for the page specified. The object you get will have the get_permissions method |
|
2906 |
* and several other abilities. |
|
2907 |
* @param string $page_id |
|
2908 |
* @param string $namespace |
|
2909 |
* @return object |
|
2910 |
*/ |
|
2911 |
||
2912 |
function fetch_page_acl($page_id, $namespace) |
|
2913 |
{ |
|
2914 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
2915 |
||
2916 |
if ( count ( $this->acl_base_cache ) < 1 ) |
|
2917 |
{ |
|
2918 |
// Permissions table not yet initialized |
|
2919 |
return false; |
|
2920 |
} |
|
2921 |
||
156
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2922 |
// cache of permission objects (to save RAM and SQL queries) |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2923 |
static $objcache = array(); |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2924 |
|
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2925 |
if ( count($objcache) == 0 ) |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2926 |
{ |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2927 |
foreach ( $paths->nslist as $key => $_ ) |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2928 |
{ |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2929 |
$objcache[$key] = array(); |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2930 |
} |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2931 |
} |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2932 |
|
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2933 |
if ( isset($objcache[$namespace][$page_id]) ) |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2934 |
{ |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2935 |
return $objcache[$namespace][$page_id]; |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2936 |
} |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2937 |
|
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2938 |
$objcache[$namespace][$page_id] = new Session_ACLPageInfo( $page_id, $namespace, $this->acl_types, $this->acl_descs, $this->acl_deps, $this->acl_base_cache ); |
edbff85d43e8
Feature add: new page group type: regular expression match (PCRE)
Dan
parents:
142
diff
changeset
|
2939 |
$object =& $objcache[$namespace][$page_id]; |
1 | 2940 |
|
592 | 2941 |
profiler_log("session: fetched ACLs for page {$namespace}:{$page_id}"); |
2942 |
||
1 | 2943 |
return $object; |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2944 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2945 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2946 |
/** |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2947 |
* Fetch the permissions that apply to an arbitrary user for the page specified. The object you get will have the get_permissions method |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2948 |
* and several other abilities. |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2949 |
* @param int|string $user_id_or_name; user ID *or* username of the user |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2950 |
* @param string $page_id; if null, will be default effective permissions. |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2951 |
* @param string $namespace; if null, will be default effective permissions. |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2952 |
* @return object |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2953 |
*/ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2954 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2955 |
function fetch_page_acl_user($user_id_or_name, $page_id, $namespace) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2956 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2957 |
global $db, $session, $paths, $template, $plugins; // Common objects |
1 | 2958 |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2959 |
// cache user info |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2960 |
static $user_info_cache = null; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2961 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2962 |
if ( isset($user_info_cache[$user_id_or_name]) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2963 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2964 |
$user_id =& $user_info_cache[$user_id_or_name]['user_id']; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2965 |
$groups =& $user_info_cache[$user_id_or_name]['groups']; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2966 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2967 |
else |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2968 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2969 |
$uid_column = ( is_int($user_id_or_name) ) ? "user_id = $user_id_or_name" : "username = '" . $db->escape($user_id_or_name) . "'"; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2970 |
$q = $db->sql_query('SELECT u.user_id, m.group_id, g.group_name FROM ' . table_prefix . "users AS u\n" |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2971 |
. " LEFT JOIN " . table_prefix . "group_members AS m\n" |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2972 |
. " ON ( ( u.user_id = m.user_id AND m.pending = 0 ) OR m.member_id IS NULL )\n" |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2973 |
. " LEFT JOIN " . table_prefix . "groups AS g\n" |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2974 |
. " ON ( g.group_id = m.group_id )\n" |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2975 |
. " WHERE $uid_column;"); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2976 |
if ( !$q ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2977 |
$db->_die(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2978 |
|
711
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
2979 |
// The l10n engine takes care of this later. |
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
2980 |
$groups = array(1 => 'Everyone'); |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2981 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2982 |
if ( $row = $db->fetchrow() ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2983 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2984 |
$user_id = intval($row['user_id']); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2985 |
if ( $row['group_id'] ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2986 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2987 |
do |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2988 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2989 |
$groups[ intval($row['group_id'] ) ] = $row['group_name']; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2990 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2991 |
while ( $row = $db->fetchrow() ); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2992 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2993 |
$db->free_result(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2994 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2995 |
else |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2996 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2997 |
$db->free_result(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2998 |
throw new Exception('Unknown user ID or username'); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
2999 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3000 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3001 |
$user_info_cache[$user_id_or_name] = array( |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3002 |
'user_id' => $user_id, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3003 |
'groups' => $groups |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3004 |
); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3005 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3006 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3007 |
// cache base permissions |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3008 |
static $base_cache = array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3009 |
if ( !isset($base_cache[$user_id_or_name]) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3010 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3011 |
$base_cache[$user_id_or_name] = $this->acl_types; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3012 |
$current_perms =& $base_cache[$user_id_or_name]; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3013 |
$current_perms['__resolve_table'] = array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3014 |
|
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
3015 |
$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
parents:
555
diff
changeset
|
3016 |
. " 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
parents:
555
diff
changeset
|
3017 |
. " 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
parents:
555
diff
changeset
|
3018 |
. ' 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
parents:
555
diff
changeset
|
3019 |
. ' ( '; |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3020 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3021 |
$q = Array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3022 |
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id= ' . $user_id . ' )'; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3023 |
if(count($groups) > 0) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3024 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3025 |
foreach($groups as $g_id => $g_name) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3026 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3027 |
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )'; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3028 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3029 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3030 |
$bs .= implode(" OR \n ", $q) . " ) \n ORDER BY target_type ASC, target_id ASC;"; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3031 |
$q = $this->sql($bs); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3032 |
foreach ( $this->acl_types as $perm_type => $_ ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3033 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3034 |
// init the resolver table with blanks |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3035 |
$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
parents:
555
diff
changeset
|
3036 |
'src' => ACL_INHERIT_ENANO_DEFAULT, |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3037 |
'rule_id' => -1 |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3038 |
); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3039 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3040 |
if ( $row = $db->fetchrow() ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3041 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3042 |
do { |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3043 |
$rules = $this->string_to_perm($row['rules']); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3044 |
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 ); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3045 |
// track where these rulings are coming from |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3046 |
$src = ( $is_everyone ) ? ACL_INHERIT_GLOBAL_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_GLOBAL_GROUP : ACL_INHERIT_GLOBAL_USER ); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3047 |
foreach ( $rules as $perm_type => $_ ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3048 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3049 |
$current_perms['__resolve_table'][$perm_type] = array( |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3050 |
'src' => $src, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3051 |
'rule_id' => $row['rule_id'] |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3052 |
); |
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
3053 |
if ( $row['group_name'] ) |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
3054 |
{ |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
3055 |
$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
parents:
555
diff
changeset
|
3056 |
} |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3057 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3058 |
// merge it in |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3059 |
$current_perms = $this->acl_merge($current_perms, $rules, $is_everyone, $_defaults_used); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3060 |
} while ( $row = $db->fetchrow() ); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3061 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3062 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3063 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3064 |
// cache of permission objects (to save RAM and SQL queries) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3065 |
static $objcache = array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3066 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3067 |
if ( count($objcache) == 0 ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3068 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3069 |
foreach ( $paths->nslist as $key => $_ ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3070 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3071 |
$objcache[$key] = array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3072 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3073 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3074 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3075 |
if ( !isset($objcache[$namespace][$page_id]) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3076 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3077 |
$objcache[$namespace][$page_id] = array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3078 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3079 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3080 |
if ( isset($objcache[$namespace][$page_id][$user_id_or_name]) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3081 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3082 |
return $objcache[$namespace][$page_id][$user_id_or_name]; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3083 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3084 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3085 |
//if ( !isset( $paths->pages[$paths->nslist[$namespace] . $page_id] ) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3086 |
//{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3087 |
// // Page does not exist |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3088 |
// return false; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3089 |
//} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3090 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3091 |
$objcache[$namespace][$page_id][$user_id_or_name] = new Session_ACLPageInfo( |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3092 |
$page_id, // $page_id, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3093 |
$namespace, // $namespace, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3094 |
$this->acl_types, // $acl_types, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3095 |
$this->acl_descs, // $acl_descs, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3096 |
$this->acl_deps, // $acl_deps, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3097 |
$base_cache[$user_id_or_name], // $base, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3098 |
$user_info_cache[$user_id_or_name]['user_id'], // $user_id = null, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3099 |
$user_info_cache[$user_id_or_name]['groups'], // $groups = null, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3100 |
$base_cache[$user_id_or_name]['__resolve_table'] // $resolve_table = array() |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3101 |
); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3102 |
$object =& $objcache[$namespace][$page_id][$user_id_or_name]; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3103 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3104 |
return $object; |
1 | 3105 |
} |
3106 |
||
3107 |
/** |
|
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
parents:
570
diff
changeset
|
3108 |
* 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
parents:
570
diff
changeset
|
3109 |
* @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
parents:
570
diff
changeset
|
3110 |
* @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
parents:
570
diff
changeset
|
3111 |
* @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
parents:
570
diff
changeset
|
3112 |
*/ |
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
parents:
570
diff
changeset
|
3113 |
|
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
parents:
570
diff
changeset
|
3114 |
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
parents:
570
diff
changeset
|
3115 |
{ |
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
parents:
570
diff
changeset
|
3116 |
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
parents:
570
diff
changeset
|
3117 |
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
parents:
570
diff
changeset
|
3118 |
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
parents:
570
diff
changeset
|
3119 |
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
parents:
570
diff
changeset
|
3120 |
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
parents:
570
diff
changeset
|
3121 |
} |
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
parents:
570
diff
changeset
|
3122 |
|
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
parents:
570
diff
changeset
|
3123 |
/** |
1 | 3124 |
* Read all of our permissions from the database and process/apply them. This should be called after the page is determined. |
3125 |
* @access private |
|
3126 |
*/ |
|
3127 |
||
3128 |
function init_permissions() |
|
3129 |
{ |
|
3130 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
3131 |
// Initialize the permissions list with some defaults |
|
3132 |
$this->perms = $this->acl_types; |
|
3133 |
$this->acl_defaults_used = $this->perms; |
|
3134 |
||
3135 |
// 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
parents:
270
diff
changeset
|
3136 |
$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
parents:
270
diff
changeset
|
3137 |
. ' 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
parents:
270
diff
changeset
|
3138 |
. ' ( '; |
1 | 3139 |
|
3140 |
$q = Array(); |
|
3141 |
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )'; |
|
3142 |
if(count($this->groups) > 0) |
|
3143 |
{ |
|
3144 |
foreach($this->groups as $g_id => $g_name) |
|
3145 |
{ |
|
3146 |
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )'; |
|
3147 |
} |
|
3148 |
} |
|
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
parents:
270
diff
changeset
|
3149 |
$bs .= implode(" OR \n ", $q) . " ) \n ORDER BY target_type ASC, target_id ASC;"; |
1 | 3150 |
$q = $this->sql($bs); |
3151 |
if ( $row = $db->fetchrow() ) |
|
3152 |
{ |
|
3153 |
do { |
|
3154 |
$rules = $this->string_to_perm($row['rules']); |
|
3155 |
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 ); |
|
3156 |
$this->acl_merge_with_current($rules, $is_everyone); |
|
3157 |
} while ( $row = $db->fetchrow() ); |
|
3158 |
} |
|
3159 |
||
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
parents:
57
diff
changeset
|
3160 |
// 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
parents:
57
diff
changeset
|
3161 |
$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
parents:
57
diff
changeset
|
3162 |
|
592 | 3163 |
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
parents:
72
diff
changeset
|
3164 |
|
592 | 3165 |
// Load and calculate permissions for the current page |
3166 |
$page_acl = $this->fetch_page_acl($paths->page_id, $paths->namespace); |
|
3167 |
$this->perms = $page_acl->perms; |
|
3168 |
$this->acl_defaults_used = $page_acl->acl_defaults_used; |
|
1 | 3169 |
} |
3170 |
||
3171 |
/** |
|
3172 |
* Extends the scope of a permission type. |
|
3173 |
* @param string The name of the permission type |
|
3174 |
* @param string The namespace(s) that should be covered. This can be either one namespace ID or a pipe-delimited list. |
|
3175 |
* @param object Optional - the current $paths object, in case we're doing this from the acl_rule_init hook |
|
3176 |
*/ |
|
3177 |
||
3178 |
function acl_extend_scope($perm_type, $namespaces, &$p_in) |
|
3179 |
{ |
|
3180 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
3181 |
$p_obj = ( is_object($p_in) ) ? $p_in : $paths; |
|
3182 |
$nslist = explode('|', $namespaces); |
|
3183 |
foreach ( $nslist as $i => $ns ) |
|
3184 |
{ |
|
3185 |
if ( !isset($p_obj->nslist[$ns]) ) |
|
3186 |
{ |
|
3187 |
unset($nslist[$i]); |
|
3188 |
} |
|
3189 |
else |
|
3190 |
{ |
|
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
parents:
570
diff
changeset
|
3191 |
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
parents:
570
diff
changeset
|
3192 |
$this->acl_scope[$perm_type][] = $ns; |
1 | 3193 |
if ( isset($this->acl_types[$perm_type]) && !isset($this->perms[$perm_type]) ) |
3194 |
{ |
|
3195 |
$this->perms[$perm_type] = $this->acl_types[$perm_type]; |
|
3196 |
} |
|
3197 |
} |
|
3198 |
} |
|
3199 |
} |
|
3200 |
||
3201 |
/** |
|
3202 |
* Converts a permissions field into a string for database insertion. Similar in spirit to serialize(). |
|
3203 |
* @param array $perms An associative array with only integers as values |
|
3204 |
* @return string |
|
3205 |
*/ |
|
3206 |
||
3207 |
function perm_to_string($perms) |
|
3208 |
{ |
|
3209 |
$s = ''; |
|
3210 |
foreach($perms as $perm => $ac) |
|
3211 |
{ |
|
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
parents:
340
diff
changeset
|
3212 |
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
parents:
340
diff
changeset
|
3213 |
continue; |
1 | 3214 |
$s .= "$perm=$ac;"; |
3215 |
} |
|
3216 |
return $s; |
|
3217 |
} |
|
3218 |
||
3219 |
/** |
|
3220 |
* Converts a permissions string back to an array. |
|
3221 |
* @param string $perms The result from sessionManager::perm_to_string() |
|
3222 |
* @return array |
|
3223 |
*/ |
|
3224 |
||
3225 |
function string_to_perm($perms) |
|
3226 |
{ |
|
3227 |
$ret = Array(); |
|
3228 |
preg_match_all('#([a-z0-9_-]+)=([0-9]+);#i', $perms, $matches); |
|
3229 |
foreach($matches[1] as $i => $t) |
|
3230 |
{ |
|
3231 |
$ret[$t] = intval($matches[2][$i]); |
|
3232 |
} |
|
3233 |
return $ret; |
|
3234 |
} |
|
3235 |
||
3236 |
/** |
|
3237 |
* Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence over the first, but AUTH_DENY always prevails. |
|
3238 |
* @param array $perm1 The first set of permissions |
|
3239 |
* @param array $perm2 The second set of permissions |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3240 |
* @param bool $is_everyone If true, applies exceptions for "Everyone" group |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3241 |
* @param array|reference $defaults_used Array that will be filled with default usage data |
1 | 3242 |
* @return array |
3243 |
*/ |
|
3244 |
||
570 | 3245 |
function acl_merge($perm1, $perm2, $is_everyone = false, &$defaults_used = array()) |
1 | 3246 |
{ |
3247 |
$ret = $perm1; |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3248 |
if ( !is_array(@$defaults_used) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3249 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3250 |
$defaults_used = array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3251 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3252 |
foreach ( $perm1 as $i => $p ) |
1 | 3253 |
{ |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3254 |
if ( isset($perm2[$i]) ) |
1 | 3255 |
{ |
711
f70d764aab33
Added initial support for DST. Rules are defined in constants.php and are extensible.
Dan
parents:
697
diff
changeset
|
3256 |
if ( $is_everyone && isset($defaults_used[$i]) && $defaults_used[$i] === false ) |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3257 |
continue; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3258 |
// Decide precedence |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3259 |
if ( isset($defaults_used[$i]) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3260 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3261 |
// echo "$i: default in use, overriding to: {$perm2[$i]}<br />"; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3262 |
// Defaults are in use, override |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3263 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3264 |
// CHANGED - 1.1.4: |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3265 |
// For some time this has been intentionally relaxed so that the following |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3266 |
// exception is available to Deny permissions: |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3267 |
// If the rule applies to the group "Everyone" on the entire site, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3268 |
// Deny settings could be overriden. |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3269 |
// This is documented at: http://docs.enanocms.org/Help:4.2 |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3270 |
if ( $perm1[$i] != AUTH_DENY ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3271 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3272 |
$perm1[$i] = $perm2[$i]; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3273 |
$defaults_used[$i] = ( $is_everyone ); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3274 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3275 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3276 |
else |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3277 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3278 |
// echo "$i: default NOT in use"; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3279 |
// Defaults are not in use, merge as normal |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3280 |
if ( $perm1[$i] != AUTH_DENY ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3281 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3282 |
// echo ", but overriding"; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3283 |
$perm1[$i] = $perm2[$i]; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3284 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3285 |
// echo "<br />"; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3286 |
} |
1 | 3287 |
} |
3288 |
} |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3289 |
return $perm1; |
1 | 3290 |
} |
3291 |
||
3292 |
/** |
|
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
parents:
340
diff
changeset
|
3293 |
* 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
parents:
340
diff
changeset
|
3294 |
* 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
parents:
340
diff
changeset
|
3295 |
* @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
parents:
340
diff
changeset
|
3296 |
* @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
parents:
340
diff
changeset
|
3297 |
*/ |
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
parents:
340
diff
changeset
|
3298 |
|
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
parents:
340
diff
changeset
|
3299 |
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
parents:
340
diff
changeset
|
3300 |
{ |
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
parents:
340
diff
changeset
|
3301 |
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
parents:
340
diff
changeset
|
3302 |
{ |
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
parents:
340
diff
changeset
|
3303 |
$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
parents:
340
diff
changeset
|
3304 |
} |
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
parents:
340
diff
changeset
|
3305 |
$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
parents:
340
diff
changeset
|
3306 |
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
parents:
340
diff
changeset
|
3307 |
{ |
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
parents:
340
diff
changeset
|
3308 |
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
parents:
340
diff
changeset
|
3309 |
{ |
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
parents:
340
diff
changeset
|
3310 |
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
parents:
340
diff
changeset
|
3311 |
$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
parents:
340
diff
changeset
|
3312 |
} |
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
parents:
340
diff
changeset
|
3313 |
} |
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
parents:
340
diff
changeset
|
3314 |
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
parents:
340
diff
changeset
|
3315 |
} |
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
parents:
340
diff
changeset
|
3316 |
|
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
parents:
340
diff
changeset
|
3317 |
/** |
1 | 3318 |
* Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not. |
3319 |
* @param array The array to merge into the master ACL list |
|
3320 |
* @param bool If true, $perm is treated as the "new default" |
|
3321 |
* @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2. |
|
3322 |
*/ |
|
3323 |
||
3324 |
function acl_merge_with_current($perm, $is_everyone = false, $scope = 2) |
|
3325 |
{ |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
3326 |
$this->perms = $this->acl_merge($this->perms, $perm, $is_everyone, $this->acl_defaults_used); |
1 | 3327 |
} |
3328 |
||
3329 |
/** |
|
3330 |
* Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence |
|
3331 |
* over the first, without exceptions. This is used to merge the hardcoded defaults with admin-specified |
|
3332 |
* defaults, which take precedence. |
|
3333 |
* @param array $perm1 The first set of permissions |
|
3334 |
* @param array $perm2 The second set of permissions |
|
3335 |
* @return array |
|
3336 |
*/ |
|
3337 |
||
3338 |
function acl_merge_complete($perm1, $perm2) |
|
3339 |
{ |
|
3340 |
$ret = $perm1; |
|
3341 |
foreach ( $perm2 as $type => $level ) |
|
3342 |
{ |
|
3343 |
$ret[$type] = $level; |
|
3344 |
} |
|
3345 |
return $ret; |
|
3346 |
} |
|
3347 |
||
3348 |
/** |
|
3349 |
* Tell us if the dependencies for a given permission are met. |
|
3350 |
* @param string The ACL permission ID |
|
3351 |
* @return bool |
|
3352 |
*/ |
|
3353 |
||
749 | 3354 |
function acl_check_deps($type, $debug = false) |
1 | 3355 |
{ |
1155
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
3356 |
global $paths; |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
3357 |
|
749 | 3358 |
// This will only happen if the permissions table is hacked or improperly accessed |
3359 |
if(!isset($this->acl_deps[$type])) |
|
1 | 3360 |
return true; |
749 | 3361 |
// Permission has no dependencies? |
1 | 3362 |
if(sizeof($this->acl_deps[$type]) < 1) |
3363 |
return true; |
|
749 | 3364 |
// go through them all and build a flat list of dependencies |
1 | 3365 |
$deps = $this->acl_deps[$type]; |
3366 |
while(true) |
|
3367 |
{ |
|
3368 |
$j = sizeof($deps); |
|
3369 |
for ( $i = 0; $i < $j; $i++ ) |
|
3370 |
{ |
|
3371 |
$b = $deps; |
|
1155
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
3372 |
if ( !$this->check_acl_scope($deps[$i], $paths->namespace) ) |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
3373 |
{ |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
3374 |
// Action $type depends on action $deps[$i] which cannot be satisfied because $deps[$i] is out of scope. |
1157 | 3375 |
// echo '<pre>' . enano_debug_print_backtrace(true) . '</pre>'; |
1155
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
3376 |
trigger_error("acl_check_deps: $type depends on {$deps[$i]} which is not within scope of $paths->namespace; this indicats a bug in ACL rule specification", E_USER_WARNING); |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
3377 |
return false; |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
3378 |
} |
1 | 3379 |
$deps = array_merge($deps, $this->acl_deps[$deps[$i]]); |
3380 |
if( $b == $deps ) |
|
3381 |
{ |
|
3382 |
break 2; |
|
3383 |
} |
|
3384 |
$j = sizeof($deps); |
|
3385 |
} |
|
3386 |
} |
|
749 | 3387 |
$debugdata = array(); |
1 | 3388 |
foreach($deps as $d) |
3389 |
{ |
|
749 | 3390 |
// Our dependencies are fully resolved, so tell get_permissions() to not recursively call this function |
3391 |
if ( !$this->get_permissions($d, true) ) |
|
1 | 3392 |
{ |
749 | 3393 |
if ( $debug ) |
3394 |
{ |
|
3395 |
$debugdata[] = $d; |
|
3396 |
} |
|
3397 |
else |
|
3398 |
{ |
|
3399 |
return false; |
|
3400 |
} |
|
1 | 3401 |
} |
3402 |
} |
|
749 | 3403 |
return $debug ? $debugdata : true; |
1 | 3404 |
} |
3405 |
||
3406 |
/** |
|
3407 |
* Makes a CAPTCHA code and caches the code in the database |
|
3408 |
* @param int $len The length of the code, in bytes |
|
402
d907601ccad2
Fixed some captcha bugs and made all captcha fields case-insensitive
Dan
parents:
401
diff
changeset
|
3409 |
* @param string Optional, the hash to reuse |
1 | 3410 |
* @return string A unique identifier assigned to the code. This hash should be passed to sessionManager::getCaptcha() to retrieve the code. |
3411 |
*/ |
|
3412 |
||
402
d907601ccad2
Fixed some captcha bugs and made all captcha fields case-insensitive
Dan
parents:
401
diff
changeset
|
3413 |
function make_captcha($len = 7, $hash = '') |
1 | 3414 |
{ |
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
parents:
391
diff
changeset
|
3415 |
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
parents:
259
diff
changeset
|
3416 |
$code = $this->generate_captcha_code($len); |
402
d907601ccad2
Fixed some captcha bugs and made all captcha fields case-insensitive
Dan
parents:
401
diff
changeset
|
3417 |
if ( !preg_match('/^[a-f0-9]{32}([a-z0-9]{8})?$/', $hash) ) |
d907601ccad2
Fixed some captcha bugs and made all captcha fields case-insensitive
Dan
parents:
401
diff
changeset
|
3418 |
$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
parents:
391
diff
changeset
|
3419 |
$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
parents:
391
diff
changeset
|
3420 |
|
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
parents:
391
diff
changeset
|
3421 |
// 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
parents:
391
diff
changeset
|
3422 |
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
parents:
391
diff
changeset
|
3423 |
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
parents:
391
diff
changeset
|
3424 |
|
402
d907601ccad2
Fixed some captcha bugs and made all captcha fields case-insensitive
Dan
parents:
401
diff
changeset
|
3425 |
$this->sql('DELETE FROM ' . table_prefix . "captcha WHERE session_id = '$hash';"); |
d907601ccad2
Fixed some captcha bugs and made all captcha fields case-insensitive
Dan
parents:
401
diff
changeset
|
3426 |
$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 | 3427 |
return $hash; |
3428 |
} |
|
3429 |
||
3430 |
/** |
|
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
parents:
391
diff
changeset
|
3431 |
* 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
parents:
391
diff
changeset
|
3432 |
* @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
parents:
259
diff
changeset
|
3433 |
* @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
parents:
259
diff
changeset
|
3434 |
*/ |
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
parents:
259
diff
changeset
|
3435 |
|
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
parents:
259
diff
changeset
|
3436 |
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
parents:
259
diff
changeset
|
3437 |
{ |
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
parents:
391
diff
changeset
|
3438 |
// 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
parents:
391
diff
changeset
|
3439 |
$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
parents:
391
diff
changeset
|
3440 |
$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
parents:
391
diff
changeset
|
3441 |
$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
parents:
391
diff
changeset
|
3442 |
$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
parents:
391
diff
changeset
|
3443 |
$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
parents:
391
diff
changeset
|
3444 |
$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
parents:
259
diff
changeset
|
3445 |
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
parents:
259
diff
changeset
|
3446 |
{ |
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
parents:
391
diff
changeset
|
3447 |
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
parents:
391
diff
changeset
|
3448 |
{ |
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
parents:
391
diff
changeset
|
3449 |
$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
parents:
391
diff
changeset
|
3450 |
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
parents:
391
diff
changeset
|
3451 |
$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
parents:
391
diff
changeset
|
3452 |
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
parents:
391
diff
changeset
|
3453 |
$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
parents:
391
diff
changeset
|
3454 |
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
parents:
391
diff
changeset
|
3455 |
$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
parents:
391
diff
changeset
|
3456 |
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
parents:
391
diff
changeset
|
3457 |
$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
parents:
391
diff
changeset
|
3458 |
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
parents:
391
diff
changeset
|
3459 |
$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
parents:
391
diff
changeset
|
3460 |
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
parents:
391
diff
changeset
|
3461 |
$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
parents:
391
diff
changeset
|
3462 |
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
parents:
391
diff
changeset
|
3463 |
{ |
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
parents:
391
diff
changeset
|
3464 |
$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
parents:
391
diff
changeset
|
3465 |
$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
parents:
391
diff
changeset
|
3466 |
} |
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
parents:
391
diff
changeset
|
3467 |
} |
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
parents:
391
diff
changeset
|
3468 |
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
parents:
391
diff
changeset
|
3469 |
{ |
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
parents:
391
diff
changeset
|
3470 |
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
parents:
391
diff
changeset
|
3471 |
$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
parents:
391
diff
changeset
|
3472 |
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
parents:
391
diff
changeset
|
3473 |
$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
parents:
391
diff
changeset
|
3474 |
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
parents:
391
diff
changeset
|
3475 |
$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
parents:
391
diff
changeset
|
3476 |
} |
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
parents:
391
diff
changeset
|
3477 |
$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
parents:
391
diff
changeset
|
3478 |
$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
parents:
391
diff
changeset
|
3479 |
$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
parents:
391
diff
changeset
|
3480 |
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
parents:
391
diff
changeset
|
3481 |
$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
parents:
391
diff
changeset
|
3482 |
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
parents:
391
diff
changeset
|
3483 |
$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
parents:
259
diff
changeset
|
3484 |
} |
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
parents:
391
diff
changeset
|
3485 |
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
parents:
259
diff
changeset
|
3486 |
} |
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
parents:
259
diff
changeset
|
3487 |
|
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
parents:
259
diff
changeset
|
3488 |
/** |
1 | 3489 |
* For the given code ID, returns the correct CAPTCHA code, or false on failure |
3490 |
* @param string $hash The unique ID assigned to the code |
|
1158
e733f984c990
CAPTCHA: Added smart autosubmit for registration page. Usability testing was so-so, may back out later.
Dan
parents:
1155
diff
changeset
|
3491 |
* @param bool If true, the code is NOT deleted from the database. Use with caution! |
1 | 3492 |
* @return string The correct confirmation code |
3493 |
*/ |
|
3494 |
||
1158
e733f984c990
CAPTCHA: Added smart autosubmit for registration page. Usability testing was so-so, may back out later.
Dan
parents:
1155
diff
changeset
|
3495 |
function get_captcha($hash, $nodelete = false) |
1 | 3496 |
{ |
3497 |
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
parents:
391
diff
changeset
|
3498 |
|
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
parents:
391
diff
changeset
|
3499 |
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
parents:
259
diff
changeset
|
3500 |
{ |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3501 |
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
parents:
259
diff
changeset
|
3502 |
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
parents:
259
diff
changeset
|
3503 |
} |
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
parents:
391
diff
changeset
|
3504 |
|
402
d907601ccad2
Fixed some captcha bugs and made all captcha fields case-insensitive
Dan
parents:
401
diff
changeset
|
3505 |
// sanity check |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3506 |
if ( !is_valid_ip(@$_SERVER['REMOTE_ADDR']) ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3507 |
{ |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3508 |
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
parents:
259
diff
changeset
|
3509 |
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
parents:
259
diff
changeset
|
3510 |
} |
402
d907601ccad2
Fixed some captcha bugs and made all captcha fields case-insensitive
Dan
parents:
401
diff
changeset
|
3511 |
|
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3512 |
$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
parents:
391
diff
changeset
|
3513 |
if ( $db->numrows() < 1 ) |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3514 |
{ |
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
parents:
391
diff
changeset
|
3515 |
return false; |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3516 |
} |
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
parents:
391
diff
changeset
|
3517 |
|
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
parents:
391
diff
changeset
|
3518 |
list($code_id, $code) = $db->fetchrow_num(); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3519 |
|
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
parents:
259
diff
changeset
|
3520 |
$db->free_result(); |
1158
e733f984c990
CAPTCHA: Added smart autosubmit for registration page. Usability testing was so-so, may back out later.
Dan
parents:
1155
diff
changeset
|
3521 |
|
e733f984c990
CAPTCHA: Added smart autosubmit for registration page. Usability testing was so-so, may back out later.
Dan
parents:
1155
diff
changeset
|
3522 |
// delete it |
e733f984c990
CAPTCHA: Added smart autosubmit for registration page. Usability testing was so-so, may back out later.
Dan
parents:
1155
diff
changeset
|
3523 |
if ( !$nodelete ) |
e733f984c990
CAPTCHA: Added smart autosubmit for registration page. Usability testing was so-so, may back out later.
Dan
parents:
1155
diff
changeset
|
3524 |
$this->sql('DELETE FROM ' . table_prefix . "captcha WHERE code_id = $code_id;"); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3525 |
|
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
parents:
391
diff
changeset
|
3526 |
return $code; |
1 | 3527 |
} |
3528 |
||
3529 |
/** |
|
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
parents:
259
diff
changeset
|
3530 |
* (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 | 3531 |
*/ |
3532 |
||
3533 |
function kill_captcha() |
|
3534 |
{ |
|
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
parents:
259
diff
changeset
|
3535 |
return true; |
1 | 3536 |
} |
3537 |
||
3538 |
/** |
|
3539 |
* Generates a random password. |
|
3540 |
* @param int $length Optional - length of password |
|
3541 |
* @return string |
|
3542 |
*/ |
|
3543 |
||
3544 |
function random_pass($length = 10) |
|
3545 |
{ |
|
3546 |
$valid_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_+@#%&<>'; |
|
3547 |
$valid_chars = enano_str_split($valid_chars); |
|
3548 |
$ret = ''; |
|
3549 |
for ( $i = 0; $i < $length; $i++ ) |
|
3550 |
{ |
|
3551 |
$ret .= $valid_chars[mt_rand(0, count($valid_chars)-1)]; |
|
3552 |
} |
|
3553 |
return $ret; |
|
3554 |
} |
|
3555 |
||
3556 |
/** |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3557 |
* Generates some Javascript that calls the AES encryption library. Put this after your </form>. |
1 | 3558 |
* @param string The name of the form |
3559 |
* @param string The name of the password field |
|
3560 |
* @param string The name of the field that switches encryption on or off |
|
3561 |
* @param string The name of the field that contains the encryption key |
|
3562 |
* @param string The name of the field that will contain the encrypted password |
|
3563 |
* @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
parents:
504
diff
changeset
|
3564 |
* @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
parents:
504
diff
changeset
|
3565 |
* @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
parents:
504
diff
changeset
|
3566 |
* @param string The name of the field that the client should populate with its public key |
1 | 3567 |
* @return string |
3568 |
*/ |
|
3569 |
||
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3570 |
function aes_javascript($form_name, $pw_field, $use_crypt = 'use_crypt', $crypt_key = 'crypt_key', $crypt_data = 'crypt_data', $challenge = 'challenge_data', $dh_supported = 'dh_supported', $dh_pubkey = 'dh_public_key', $dh_client_pubkey = 'dh_client_public_key') |
1 | 3571 |
{ |
3572 |
$code = ' |
|
3573 |
<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
parents:
504
diff
changeset
|
3574 |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3575 |
function runEncryption(nowhiteout) |
1 | 3576 |
{ |
691
dab7850c098d
Made login forms that use $session->aes_javascript() use new whiteOutForm() function
Dan
parents:
688
diff
changeset
|
3577 |
var frm = document.forms.'.$form_name.'; |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3578 |
if ( !nowhiteout ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3579 |
whiteOutForm(frm); |
691
dab7850c098d
Made login forms that use $session->aes_javascript() use new whiteOutForm() function
Dan
parents:
688
diff
changeset
|
3580 |
|
586
234ddd896555
Made encryption work in form-based logon again; modified load_component() to fetch compressed versions when possible
Dan
parents:
584
diff
changeset
|
3581 |
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
parents:
504
diff
changeset
|
3582 |
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
parents:
504
diff
changeset
|
3583 |
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
parents:
504
diff
changeset
|
3584 |
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
parents:
504
diff
changeset
|
3585 |
{ |
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
parents:
504
diff
changeset
|
3586 |
$code .= <<<EOF |
542
5841df0ab575
Added ETag support and increased caching settings to try and speed the system up. Result of a YSlow audit.
Dan
parents:
541
diff
changeset
|
3587 |
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
parents:
504
diff
changeset
|
3588 |
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
parents:
504
diff
changeset
|
3589 |
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
parents:
504
diff
changeset
|
3590 |
} |
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
parents:
504
diff
changeset
|
3591 |
$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
parents:
504
diff
changeset
|
3592 |
|
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
parents:
504
diff
changeset
|
3593 |
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
parents:
504
diff
changeset
|
3594 |
{ |
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
parents:
504
diff
changeset
|
3595 |
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
parents:
504
diff
changeset
|
3596 |
} |
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
parents:
504
diff
changeset
|
3597 |
|
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3598 |
if ( frm["' . $pw_field . '_confirm"] ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3599 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3600 |
pass1 = frm.' . $pw_field . '.value; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3601 |
pass2 = frm.' . $pw_field . '_confirm.value; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3602 |
if ( pass1 != pass2 ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3603 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3604 |
load_component("l10n"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3605 |
alert($lang.get("userfuncs_passreset_err_no_match")); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3606 |
return false; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3607 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3608 |
if ( pass1.length < 6 ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3609 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3610 |
load_component("l10n"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3611 |
alert($lang.get("userfuncs_passreset_err_too_short")); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3612 |
return false; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3613 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3614 |
frm.' . $pw_field . '_confirm.value = ""; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3615 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3616 |
|
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
parents:
504
diff
changeset
|
3617 |
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
parents:
504
diff
changeset
|
3618 |
{ |
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
parents:
504
diff
changeset
|
3619 |
// 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
parents:
504
diff
changeset
|
3620 |
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
parents:
504
diff
changeset
|
3621 |
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
parents:
504
diff
changeset
|
3622 |
{ |
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
parents:
504
diff
changeset
|
3623 |
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
parents:
504
diff
changeset
|
3624 |
} |
691
dab7850c098d
Made login forms that use $session->aes_javascript() use new whiteOutForm() function
Dan
parents:
688
diff
changeset
|
3625 |
/* |
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
parents:
504
diff
changeset
|
3626 |
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
parents:
504
diff
changeset
|
3627 |
{ |
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
parents:
504
diff
changeset
|
3628 |
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
parents:
504
diff
changeset
|
3629 |
} |
691
dab7850c098d
Made login forms that use $session->aes_javascript() use new whiteOutForm() function
Dan
parents:
688
diff
changeset
|
3630 |
*/ |
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
parents:
504
diff
changeset
|
3631 |
|
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
parents:
504
diff
changeset
|
3632 |
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
parents:
504
diff
changeset
|
3633 |
|
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
parents:
504
diff
changeset
|
3634 |
// 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
parents:
504
diff
changeset
|
3635 |
// 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
parents:
504
diff
changeset
|
3636 |
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
parents:
504
diff
changeset
|
3637 |
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
parents:
504
diff
changeset
|
3638 |
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
parents:
504
diff
changeset
|
3639 |
// 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
parents:
504
diff
changeset
|
3640 |
|
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
parents:
504
diff
changeset
|
3641 |
// 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
parents:
504
diff
changeset
|
3642 |
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
parents:
504
diff
changeset
|
3643 |
|
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
parents:
504
diff
changeset
|
3644 |
// 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
parents:
504
diff
changeset
|
3645 |
frm.' . $crypt_key . '.value = secret_hash; |
629 | 3646 |
' . ( $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
parents:
504
diff
changeset
|
3647 |
|
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
parents:
504
diff
changeset
|
3648 |
// 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
parents:
504
diff
changeset
|
3649 |
|
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
parents:
504
diff
changeset
|
3650 |
// 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
parents:
504
diff
changeset
|
3651 |
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
parents:
504
diff
changeset
|
3652 |
|
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
parents:
504
diff
changeset
|
3653 |
// 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
parents:
504
diff
changeset
|
3654 |
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
parents:
504
diff
changeset
|
3655 |
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
parents:
504
diff
changeset
|
3656 |
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
parents:
504
diff
changeset
|
3657 |
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
parents:
504
diff
changeset
|
3658 |
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
parents:
504
diff
changeset
|
3659 |
{ |
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
parents:
504
diff
changeset
|
3660 |
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
parents:
504
diff
changeset
|
3661 |
} |
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
parents:
504
diff
changeset
|
3662 |
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
parents:
504
diff
changeset
|
3663 |
// 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
parents:
504
diff
changeset
|
3664 |
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
parents:
504
diff
changeset
|
3665 |
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
parents:
504
diff
changeset
|
3666 |
// 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
parents:
504
diff
changeset
|
3667 |
} |
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
parents:
504
diff
changeset
|
3668 |
else if ( testpassed && !use_diffiehellman ) |
1 | 3669 |
{ |
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
parents:
57
diff
changeset
|
3670 |
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
parents:
57
diff
changeset
|
3671 |
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
parents:
57
diff
changeset
|
3672 |
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
parents:
57
diff
changeset
|
3673 |
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
parents:
57
diff
changeset
|
3674 |
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
parents:
57
diff
changeset
|
3675 |
{ |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
3676 |
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
parents:
57
diff
changeset
|
3677 |
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
parents:
57
diff
changeset
|
3678 |
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
parents:
57
diff
changeset
|
3679 |
} |
1 | 3680 |
pass = frm.'.$pw_field.'.value; |
3681 |
chal = frm.'.$challenge.'.value; |
|
3682 |
challenge = hex_md5(pass + chal) + chal; |
|
3683 |
frm.'.$challenge.'.value = challenge; |
|
3684 |
pass = stringToByteArray(pass); |
|
3685 |
cryptstring = rijndaelEncrypt(pass, cryptkey, \'ECB\'); |
|
3686 |
if(!cryptstring) |
|
3687 |
{ |
|
3688 |
return false; |
|
3689 |
} |
|
3690 |
cryptstring = byteArrayToHex(cryptstring); |
|
3691 |
frm.'.$crypt_data.'.value = cryptstring; |
|
3692 |
frm.'.$pw_field.'.value = \'\'; |
|
3693 |
} |
|
3694 |
} |
|
3695 |
</script> |
|
3696 |
'; |
|
3697 |
return $code; |
|
3698 |
} |
|
3699 |
||
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3700 |
/** |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3701 |
* Generates the HTML form elements required for an encrypted logon experience. |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3702 |
* @return string |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3703 |
*/ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3704 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3705 |
function generate_aes_form() |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3706 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3707 |
$return = '<input type="hidden" name="use_crypt" value="no" />'; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3708 |
$return .= '<input type="hidden" name="crypt_key" value="' . $this->rijndael_genkey() . '" />'; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3709 |
$return .= '<input type="hidden" name="crypt_data" value="" />'; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3710 |
$return .= '<input type="hidden" name="challenge_data" value="' . $this->dss_rand() . '" />'; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3711 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3712 |
require_once(ENANO_ROOT . '/includes/math.php'); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3713 |
require_once(ENANO_ROOT . '/includes/diffiehellman.php'); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3714 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3715 |
global $dh_supported, $_math; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3716 |
if ( $dh_supported ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3717 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3718 |
$dh_key_priv = dh_gen_private(); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3719 |
$dh_key_pub = dh_gen_public($dh_key_priv); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3720 |
$dh_key_priv = $_math->str($dh_key_priv); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3721 |
$dh_key_pub = $_math->str($dh_key_pub); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3722 |
// store the keys in the DB |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3723 |
$this->sql('INSERT INTO ' . table_prefix . "diffiehellman( public_key, private_key ) VALUES ( '$dh_key_pub', '$dh_key_priv' );"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3724 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3725 |
$return .= "<input type=\"hidden\" name=\"dh_supported\" value=\"true\" /> |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3726 |
<input type=\"hidden\" name=\"dh_public_key\" value=\"$dh_key_pub\" /> |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3727 |
<input type=\"hidden\" name=\"dh_client_public_key\" value=\"\" />"; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3728 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3729 |
else |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3730 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3731 |
$return .= "<input type=\"hidden\" name=\"dh_supported\" value=\"false\" />"; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3732 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3733 |
return $return; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3734 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3735 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3736 |
/** |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3737 |
* If you used all the same form fields as the normal login interface, this will take care of DiffieHellman for you and return the key. |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3738 |
* @param string Password field name (defaults to "password") |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3739 |
* @return string |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3740 |
*/ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3741 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3742 |
function get_aes_post($fieldname = 'password') |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3743 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3744 |
global $db, $session, $paths, $template, $plugins; // Common objects |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3745 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3746 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3747 |
if ( $_POST['use_crypt'] == 'yes' ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3748 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3749 |
$crypt_key = $this->fetch_public_key($_POST['crypt_key']); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3750 |
if ( !$crypt_key ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3751 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3752 |
throw new Exception($lang->get('user_err_key_not_found')); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3753 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3754 |
$crypt_key = hexdecode($crypt_key); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3755 |
$data = $aes->decrypt($_POST['crypt_data'], $crypt_key, ENC_HEX); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3756 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3757 |
else if ( $_POST['use_crypt'] == 'yes_dh' ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3758 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3759 |
require_once(ENANO_ROOT . '/includes/math.php'); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3760 |
require_once(ENANO_ROOT . '/includes/diffiehellman.php'); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3761 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3762 |
global $dh_supported, $_math; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3763 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3764 |
if ( !$dh_supported ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3765 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3766 |
throw new Exception('Server does not support DiffieHellman, denying request'); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3767 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3768 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3769 |
// Fetch private key |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3770 |
$dh_public = $_POST['dh_public_key']; |
826
dcf5381ce8ba
Replaced integer checks that used preg_match() to use ctype_digit() instead
Dan
parents:
815
diff
changeset
|
3771 |
if ( !ctype_digit($dh_public) ) |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3772 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3773 |
throw new Exception('ERR_DH_KEY_NOT_INTEGER'); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3774 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3775 |
$q = $db->sql_query('SELECT private_key, key_id FROM ' . table_prefix . "diffiehellman WHERE public_key = '$dh_public';"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3776 |
if ( !$q ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3777 |
$db->die_json(); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3778 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3779 |
if ( $db->numrows() < 1 ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3780 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3781 |
throw new Exception('ERR_DH_KEY_NOT_FOUND'); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3782 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3783 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3784 |
list($dh_private, $dh_key_id) = $db->fetchrow_num(); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3785 |
$db->free_result(); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3786 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3787 |
// We have the private key, now delete the key pair, we no longer need it |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3788 |
$q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE key_id = $dh_key_id;"); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3789 |
if ( !$q ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3790 |
$db->die_json(); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3791 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3792 |
// Generate the shared secret |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3793 |
$dh_secret = dh_gen_shared_secret($dh_private, $_POST['dh_client_public_key']); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3794 |
$dh_secret = $_math->str($dh_secret); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3795 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3796 |
// Did we get all our math right? |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3797 |
$dh_secret_check = sha1($dh_secret); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3798 |
$dh_hash = $_POST['crypt_key']; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3799 |
if ( $dh_secret_check !== $dh_hash ) |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3800 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3801 |
throw new Exception('ERR_DH_HASH_NO_MATCH'); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3802 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3803 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3804 |
// All good! Generate the AES key |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3805 |
$aes_key = substr(sha256($dh_secret), 0, ( AES_BITS / 4 )); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3806 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3807 |
// decrypt user info |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3808 |
$aes_key = hexdecode($aes_key); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3809 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3810 |
$data = $aes->decrypt($_POST['crypt_data'], $aes_key, ENC_HEX); |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3811 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3812 |
else |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3813 |
{ |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3814 |
$data = $_POST[$fieldname]; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3815 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3816 |
return $data; |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3817 |
} |
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3818 |
|
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
782
diff
changeset
|
3819 |
/** |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3820 |
* Backend code for the JSON login interface. Basically a frontend to the session API that takes all parameters in one huge array. |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3821 |
* @param array LoginAPI request |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3822 |
* @return array LoginAPI response |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3823 |
*/ |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3824 |
|
725
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3825 |
function process_login_request($req, $_dbgtmp = false) |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3826 |
{ |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3827 |
global $db, $session, $paths, $template, $plugins; // Common objects |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3828 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3829 |
// Setup EnanoMath and Diffie-Hellman |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3830 |
global $dh_supported; |
725
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3831 |
if ( !function_exists('dh_gen_private') ) |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3832 |
{ |
725
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3833 |
require_once(ENANO_ROOT.'/includes/math.php'); |
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3834 |
|
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3835 |
$dh_supported = true; |
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3836 |
try |
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3837 |
{ |
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3838 |
require_once(ENANO_ROOT . '/includes/diffiehellman.php'); |
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3839 |
} |
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3840 |
catch ( Exception $e ) |
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3841 |
{ |
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3842 |
$dh_supported = false; |
b64f2618ef25
Fixed DiffieHellman being included twice when not supported and login fails
Dan
parents:
711
diff
changeset
|
3843 |
} |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3844 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3845 |
global $_math; |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3846 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3847 |
// Check for the mode |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3848 |
if ( !isset($req['mode']) ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3849 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3850 |
return $this->get_login_response('api_error', 'ERR_JSON_NO_MODE'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3851 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3852 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3853 |
// Main processing switch |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3854 |
switch ( $req['mode'] ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3855 |
{ |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3856 |
default: |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3857 |
return $this->get_login_response('api_error', 'ERR_JSON_INVALID_MODE'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3858 |
break; |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3859 |
case 'getkey': |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3860 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3861 |
$this->start(); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3862 |
|
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3863 |
return $this->get_login_response('initial'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3864 |
break; |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3865 |
case 'login_dh': |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3866 |
// User is requesting a login and has sent Diffie-Hellman data. |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3867 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3868 |
// |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3869 |
// KEY RECONSTRUCTION |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3870 |
// |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3871 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3872 |
$userinfo_crypt = $req['userinfo']; |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3873 |
$dh_public = $req['dh_public_key']; |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3874 |
$dh_hash = $req['dh_secret_hash']; |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3875 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3876 |
// Check the key |
826
dcf5381ce8ba
Replaced integer checks that used preg_match() to use ctype_digit() instead
Dan
parents:
815
diff
changeset
|
3877 |
if ( !ctype_digit($dh_public) || !ctype_digit($req['dh_client_key']) ) |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3878 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3879 |
return $this->get_login_response('api_error', 'ERR_DH_KEY_NOT_NUMERIC'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3880 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3881 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3882 |
// Fetch private key |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3883 |
$q = $db->sql_query('SELECT private_key, key_id FROM ' . table_prefix . "diffiehellman WHERE public_key = '$dh_public';"); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3884 |
if ( !$q ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3885 |
$db->die_json(); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3886 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3887 |
if ( $db->numrows() < 1 ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3888 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3889 |
return $this->get_login_response('api_error', 'ERR_DH_KEY_NOT_FOUND'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3890 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3891 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3892 |
list($dh_private, $dh_key_id) = $db->fetchrow_num(); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3893 |
$db->free_result(); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3894 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3895 |
// We have the private key, now delete the key pair, we no longer need it |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3896 |
$q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE key_id = $dh_key_id;"); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3897 |
if ( !$q ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3898 |
$db->die_json(); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3899 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3900 |
// Generate the shared secret |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3901 |
$dh_secret = dh_gen_shared_secret($dh_private, $req['dh_client_key']); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3902 |
$dh_secret = $_math->str($dh_secret); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3903 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3904 |
// Did we get all our math right? |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3905 |
$dh_secret_check = sha1($dh_secret); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3906 |
if ( $dh_secret_check !== $dh_hash ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3907 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3908 |
return $this->get_login_response('api_error', 'ERR_DH_HASH_NO_MATCH'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3909 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3910 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3911 |
// All good! Generate the AES key |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3912 |
$aes_key = substr(sha256($dh_secret), 0, ( AES_BITS / 4 )); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3913 |
case 'login_aes': |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3914 |
if ( $req['mode'] == 'login_aes' ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3915 |
{ |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3916 |
// login_aes-specific code |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3917 |
$aes_key = $this->fetch_public_key($req['key_aes']); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3918 |
if ( !$aes_key ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3919 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3920 |
return $this->get_login_response('api_error', 'ERR_AES_LOOKUP_FAILED'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3921 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3922 |
$userinfo_crypt = $req['userinfo']; |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3923 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3924 |
// shared between the two systems from here on out |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3925 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3926 |
// decrypt user info |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3927 |
$aes_key = hexdecode($aes_key); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3928 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
518
2b826f2640e9
SECURITY: Disabled caching of decrypted DiffieHellman login requests
Dan
parents:
511
diff
changeset
|
3929 |
// using "true" here disables caching of the decrypted login info (which includes the password) |
2b826f2640e9
SECURITY: Disabled caching of decrypted DiffieHellman login requests
Dan
parents:
511
diff
changeset
|
3930 |
$userinfo_json = $aes->decrypt($userinfo_crypt, $aes_key, ENC_HEX, true); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3931 |
if ( !$userinfo_json ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3932 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3933 |
return $this->get_login_response('api_error', 'ERR_AES_DECRYPT_FAILED'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3934 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3935 |
// de-JSON user info |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3936 |
try |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3937 |
{ |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3938 |
$userinfo = enano_json_decode($userinfo_json); |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3939 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3940 |
catch ( Exception $e ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3941 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3942 |
return $this->get_login_response('api_error', 'ERR_USERINFO_DECODE_FAILED'); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3943 |
} |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3944 |
|
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3945 |
case 'login_pt': |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3946 |
// plaintext login |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3947 |
if ( $req['mode'] == 'login_pt' ) |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3948 |
{ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3949 |
$userinfo = isset($req['userinfo']) ? $req['userinfo'] : array(); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3950 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3951 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3952 |
if ( !isset($userinfo['username']) || !isset($userinfo['password']) ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3953 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3954 |
return $this->get_login_response('api_error', 'ERR_USERINFO_MISSING_VALUES'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3955 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3956 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3957 |
$username =& $userinfo['username']; |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3958 |
$password =& $userinfo['password']; |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
3959 |
|
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3960 |
// locked out? check captcha |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3961 |
$lockout_data = $this->get_lockout_info(); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3962 |
if ( $lockout_data['policy'] == 'captcha' && $lockout_data['active'] ) |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3963 |
{ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3964 |
// policy is captcha -- check if it's correct, and if so, bypass lockout check |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3965 |
$real_code = $this->get_captcha($req['captcha_hash']); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3966 |
if ( strtolower($real_code) !== strtolower($req['captcha_code']) ) |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3967 |
{ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3968 |
// captcha is bad |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3969 |
return $this->get_login_response('login_failure', 'lockout_bad_captcha'); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3970 |
} |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3971 |
} |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3972 |
else if ( $lockout_data['policy'] == 'lockout' && $lockout_data['active'] ) |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3973 |
{ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3974 |
// we're fully locked out |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3975 |
return $this->get_login_response('login_failure', 'lockout_request_denied'); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3976 |
} |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3977 |
|
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3978 |
// At this point if any extra info was injected into the login data packet, we need to let plugins process it |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3979 |
/** |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3980 |
* Called upon processing an incoming login request. If you added anything to the userinfo object during the jshook |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3981 |
* login_build_userinfo, that will be in the $userinfo array here. Expected return values are: true if your plugin has |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3982 |
* not only succeeded but ALSO issued a session key (bypass the whole Enano builtin login process) and an associative array |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3983 |
* with "mode" set to "error" and an error string in "error" to send an error back to the client. Any return value other |
1001
79770fb4132a
Sped up AJAX de-auth a little; added a little extra info to login_success JSON responses
Dan
parents:
985
diff
changeset
|
3984 |
* than these will be treated as a pass-through, and the user's password will be validated through Enano's standard process. |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3985 |
* @hook login_process_userdata_json |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3986 |
*/ |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3987 |
|
897
f31c252c52c1
session: login_process_userdata_json hook should work with more than one installed auth plugin now
Dan
parents:
895
diff
changeset
|
3988 |
$code = $plugins->setHook('login_process_userdata_json', true); |
1065
18d013f98fd0
AJAX Login: Fixed all known issues with lockout (and some unknown ones)
Dan
parents:
1032
diff
changeset
|
3989 |
|
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3990 |
foreach ( $code as $cmd ) |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3991 |
{ |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3992 |
$result = eval($cmd); |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3993 |
if ( $result === true ) |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
3994 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3995 |
return $this->get_login_response('login_success', false, array( |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3996 |
'key' => $this->sid_super, |
1001
79770fb4132a
Sped up AJAX de-auth a little; added a little extra info to login_success JSON responses
Dan
parents:
985
diff
changeset
|
3997 |
'user_id' => $this->user_id, |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3998 |
'user_level' => $this->user_level, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
3999 |
'reset' => false |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4000 |
)); |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
4001 |
} |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
4002 |
else if ( is_array($result) ) |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
4003 |
{ |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
4004 |
if ( isset($result['mode']) && $result['mode'] === 'error' && isset($result['error']) ) |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
4005 |
{ |
895
d6b095673a47
Session: additional metadata passed back from auth plugins is passed through to client for optional further parsing
Dan
parents:
857
diff
changeset
|
4006 |
// Pass back any additional information from the error response |
d6b095673a47
Session: additional metadata passed back from auth plugins is passed through to client for optional further parsing
Dan
parents:
857
diff
changeset
|
4007 |
$append = $result; |
d6b095673a47
Session: additional metadata passed back from auth plugins is passed through to client for optional further parsing
Dan
parents:
857
diff
changeset
|
4008 |
unset($append['mode'], $append['error']); |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4009 |
$append['from_plugin'] = true; |
895
d6b095673a47
Session: additional metadata passed back from auth plugins is passed through to client for optional further parsing
Dan
parents:
857
diff
changeset
|
4010 |
|
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4011 |
return $this->get_login_response('login_failure', $result['error'], $append); |
843
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
4012 |
} |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
4013 |
} |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
4014 |
} |
4415e50e4e84
Added possibility for auth plugins, which can log a user in using non-standard authentication methods.
Dan
parents:
832
diff
changeset
|
4015 |
|
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4016 |
// attempt the login |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4017 |
$login_result = $this->login_without_crypto($username, $password, false, intval($req['level']), @$req['remember']); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4018 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4019 |
if ( $login_result['success'] ) |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4020 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4021 |
return $this->get_login_response('login_success', false, array( |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4022 |
'key' => $this->sid_super, |
1026
f0431eb8161e
AJAX login: fixed improper run of login_submit_early; fixed failure to redirect if main_page_members == current page
Dan
parents:
1001
diff
changeset
|
4023 |
'user_id' => $this->user_id, |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4024 |
'user_level' => $this->user_level, |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4025 |
)); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4026 |
} |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4027 |
else if ( !$login_result['success'] && $login_result['error'] === 'valid_reset' ) |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4028 |
{ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4029 |
return $this->get_login_response('reset_pass_used', false, array( |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4030 |
'redirect_url' => $login_result['redirect_url'] |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4031 |
)); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4032 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4033 |
else |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4034 |
{ |
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4035 |
return $this->get_login_response('login_failure', 'invalid_credentials'); |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4036 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4037 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4038 |
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
parents:
466
diff
changeset
|
4039 |
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
parents:
466
diff
changeset
|
4040 |
// 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
parents:
471
diff
changeset
|
4041 |
// 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
parents:
466
diff
changeset
|
4042 |
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
parents:
466
diff
changeset
|
4043 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
466
diff
changeset
|
4044 |
$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
parents:
466
diff
changeset
|
4045 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
466
diff
changeset
|
4046 |
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
parents:
466
diff
changeset
|
4047 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
466
diff
changeset
|
4048 |
$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
parents:
466
diff
changeset
|
4049 |
$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
parents:
466
diff
changeset
|
4050 |
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
parents:
466
diff
changeset
|
4051 |
$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
parents:
466
diff
changeset
|
4052 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
466
diff
changeset
|
4053 |
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
parents:
466
diff
changeset
|
4054 |
'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
parents:
466
diff
changeset
|
4055 |
); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
466
diff
changeset
|
4056 |
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
parents:
471
diff
changeset
|
4057 |
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
parents:
471
diff
changeset
|
4058 |
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
parents:
471
diff
changeset
|
4059 |
'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
parents:
471
diff
changeset
|
4060 |
'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
parents:
471
diff
changeset
|
4061 |
'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
parents:
471
diff
changeset
|
4062 |
'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
parents:
471
diff
changeset
|
4063 |
))); |
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
parents:
471
diff
changeset
|
4064 |
break; |
811
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4065 |
case 'logout': |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4066 |
if ( !$this->started ) |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4067 |
$this->start(); |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4068 |
if ( !isset($req['csrf_token']) ) |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4069 |
return array( |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4070 |
'mode' => 'error', |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4071 |
'error' => 'Invalid CSRF token' |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4072 |
); |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4073 |
|
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4074 |
if ( $req['csrf_token'] !== $this->csrf_token ) |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4075 |
return array( |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4076 |
'mode' => 'error', |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4077 |
'error' => 'Invalid CSRF token' |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4078 |
); |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4079 |
$level = isset($req['level']) && is_int($req['level']) ? $req['level'] : USER_LEVEL_MEMBER; |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4080 |
if ( ($result = $this->logout($level)) === 'success' ) |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4081 |
{ |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4082 |
return array( |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4083 |
'mode' => 'logout_success' |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4084 |
); |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4085 |
} |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4086 |
else |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4087 |
{ |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4088 |
return array( |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4089 |
'mode' => 'error', |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4090 |
'error' => $result |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4091 |
); |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4092 |
} |
5c807fe77020
Added support for live re-auth and de-auth; fully AJAX, no page reload required, plus plugin-usable API.
Dan
parents:
802
diff
changeset
|
4093 |
break; |
436
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4094 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4095 |
|
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4096 |
} |
242353360e37
Added support for Diffie-Hellman key exchange during login. w00t!
Dan
parents:
425
diff
changeset
|
4097 |
|
1132
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4098 |
/** |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4099 |
* Generate a packet to send to the client for logins. |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4100 |
* @param string mode |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4101 |
* @param array |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4102 |
* @return array |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4103 |
*/ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4104 |
|
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4105 |
function get_login_response($mode, $error = false, $base = array()) |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4106 |
{ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4107 |
$this->start(); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4108 |
|
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4109 |
// init |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4110 |
$response = $base; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4111 |
// modules in the packet |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4112 |
$response['mode'] = $mode; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4113 |
$response['error'] = $error; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4114 |
$response['crypto'] = $mode !== 'login_success' ? $this->get_login_crypto_packet() : false; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4115 |
$response['lockout'] = $mode !== 'login_success' ? $this->get_lockout_info() : false; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4116 |
$response['extended_time'] = intval(getConfig('session_remember_time', '30')); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4117 |
$response['username'] = $this->user_logged_in ? $this->username : false; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4118 |
return $response; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4119 |
} |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4120 |
|
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4121 |
/** |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4122 |
* Get a packet of crypto flags for login. |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4123 |
* @return array |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4124 |
*/ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4125 |
|
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4126 |
function get_login_crypto_packet() |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4127 |
{ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4128 |
global $dh_supported, $_math; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4129 |
|
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4130 |
$response = array(); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4131 |
|
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4132 |
$response['dh_enable'] = $dh_supported; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4133 |
$response['aes_key'] = $this->rijndael_genkey(); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4134 |
|
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4135 |
// Can we do Diffie-Hellman? If so, generate and stash a public/private key pair. |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4136 |
if ( $dh_supported ) |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4137 |
{ |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4138 |
$dh_key_priv = dh_gen_private(); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4139 |
$dh_key_pub = dh_gen_public($dh_key_priv); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4140 |
$dh_key_priv = $_math->str($dh_key_priv); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4141 |
$dh_key_pub = $_math->str($dh_key_pub); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4142 |
$response['dh_public_key'] = $dh_key_pub; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4143 |
// store the keys in the DB |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4144 |
$this->sql('INSERT INTO ' . table_prefix . "diffiehellman( public_key, private_key ) VALUES ( '$dh_key_pub', '$dh_key_priv' );"); |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4145 |
} |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4146 |
|
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4147 |
return $response; |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4148 |
} |
05fe0039d952
Logins: reorganized data structures a bit. WiP - needs test routine done.
Dan
parents:
1101
diff
changeset
|
4149 |
|
1 | 4150 |
} |
4151 |
||
4152 |
/** |
|
4153 |
* Class used to fetch permissions for a specific page. Used internally by SessionManager. |
|
4154 |
* @package Enano |
|
4155 |
* @subpackage Session manager |
|
4156 |
* @license http://www.gnu.org/copyleft/gpl.html |
|
4157 |
* @access private |
|
4158 |
*/ |
|
4159 |
||
4160 |
class Session_ACLPageInfo { |
|
4161 |
||
4162 |
/** |
|
4163 |
* The page ID of this ACL info package |
|
4164 |
* @var string |
|
4165 |
*/ |
|
4166 |
||
4167 |
var $page_id; |
|
4168 |
||
4169 |
/** |
|
4170 |
* The namespace of the page being checked |
|
4171 |
* @var string |
|
4172 |
*/ |
|
4173 |
||
4174 |
var $namespace; |
|
4175 |
||
4176 |
/** |
|
4177 |
* Our list of permission types. |
|
4178 |
* @access private |
|
4179 |
* @var array |
|
4180 |
*/ |
|
4181 |
||
4182 |
var $acl_types = Array(); |
|
4183 |
||
4184 |
/** |
|
4185 |
* The list of descriptions for the permission types |
|
4186 |
* @var array |
|
4187 |
*/ |
|
4188 |
||
4189 |
var $acl_descs = Array(); |
|
4190 |
||
4191 |
/** |
|
4192 |
* A list of dependencies for ACL types. |
|
4193 |
* @var array |
|
4194 |
*/ |
|
4195 |
||
4196 |
var $acl_deps = Array(); |
|
4197 |
||
4198 |
/** |
|
246
c9fd175289aa
Cleaned up some HTML in the installer; corrected some phpDoc syntax errors
Dan
parents:
203
diff
changeset
|
4199 |
* Our tell-all list of permissions. Do not even try to change this. |
c9fd175289aa
Cleaned up some HTML in the installer; corrected some phpDoc syntax errors
Dan
parents:
203
diff
changeset
|
4200 |
* @access private |
1 | 4201 |
* @var array |
4202 |
*/ |
|
4203 |
||
4204 |
var $perms = Array(); |
|
4205 |
||
4206 |
/** |
|
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
parents:
57
diff
changeset
|
4207 |
* 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
parents:
57
diff
changeset
|
4208 |
* @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
parents:
57
diff
changeset
|
4209 |
* @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
parents:
57
diff
changeset
|
4210 |
*/ |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4211 |
|
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4212 |
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
parents:
57
diff
changeset
|
4213 |
|
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4214 |
/** |
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
parents:
322
diff
changeset
|
4215 |
* 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
parents:
322
diff
changeset
|
4216 |
* @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
parents:
322
diff
changeset
|
4217 |
*/ |
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
parents:
322
diff
changeset
|
4218 |
|
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
parents:
322
diff
changeset
|
4219 |
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
parents:
322
diff
changeset
|
4220 |
|
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
parents:
322
diff
changeset
|
4221 |
/** |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4222 |
* Tracks where permissions were calculated using the ACL_INHERIT_* constants. Layout: |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4223 |
* array( |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4224 |
* [permission_name] => array( |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4225 |
* [src] => ACL_INHERIT_* |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4226 |
* [rule_id] => integer |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4227 |
* ), |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4228 |
* ... |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4229 |
* ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4230 |
* |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4231 |
* @var array |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4232 |
*/ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4233 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4234 |
var $perm_resolve_table = array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4235 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4236 |
# |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4237 |
# USER PARAMETERS |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4238 |
# |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4239 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4240 |
/** |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4241 |
* User ID |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4242 |
* @var int |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4243 |
*/ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4244 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4245 |
var $user_id = 1; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4246 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4247 |
/** |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4248 |
* Group membership associative array (group_id => group_name) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4249 |
* @var array |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4250 |
*/ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4251 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4252 |
var $groups = array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4253 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4254 |
/** |
1 | 4255 |
* Constructor. |
4256 |
* @param string $page_id The ID of the page to check |
|
4257 |
* @param string $namespace The namespace of the page to check. |
|
4258 |
* @param array $acl_types List of ACL types |
|
4259 |
* @param array $acl_descs List of human-readable descriptions for permissions (associative) |
|
4260 |
* @param array $acl_deps List of dependencies for permissions. For example, viewing history/diffs depends on the ability to read the page. |
|
4261 |
* @param array $base What to start with - this is an attempt to reduce the number of SQL queries. |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4262 |
* @param int|string $user_id_or_name Username or ID to search for, defaults to current user |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4263 |
* @param array $resolve_table Debugging info for tracking where rules came from, defaults to a blank array. |
1 | 4264 |
*/ |
4265 |
||
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4266 |
function __construct($page_id, $namespace, $acl_types, $acl_descs, $acl_deps, $base, $user_id = null, $groups = null, $resolve_table = array()) |
1 | 4267 |
{ |
4268 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
4269 |
||
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4270 |
// hack |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4271 |
if ( isset($base['__resolve_table']) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4272 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4273 |
unset($base['__resolve_table']); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4274 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4275 |
|
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
parents:
570
diff
changeset
|
4276 |
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
parents:
570
diff
changeset
|
4277 |
{ |
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
parents:
570
diff
changeset
|
4278 |
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
parents:
570
diff
changeset
|
4279 |
{ |
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
parents:
570
diff
changeset
|
4280 |
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
parents:
570
diff
changeset
|
4281 |
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
parents:
570
diff
changeset
|
4282 |
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
parents:
570
diff
changeset
|
4283 |
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
parents:
570
diff
changeset
|
4284 |
} |
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
parents:
570
diff
changeset
|
4285 |
} |
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
parents:
570
diff
changeset
|
4286 |
|
1 | 4287 |
$this->acl_deps = $acl_deps; |
4288 |
$this->acl_types = $acl_types; |
|
4289 |
$this->acl_descs = $acl_descs; |
|
4290 |
||
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
parents:
57
diff
changeset
|
4291 |
$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
parents:
57
diff
changeset
|
4292 |
$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
parents:
57
diff
changeset
|
4293 |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4294 |
$this->perm_resolve_table = array(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4295 |
if ( is_array($resolve_table) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4296 |
$this->perm_resolve_table = $resolve_table; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4297 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4298 |
if ( is_int($user_id) && is_array($groups) ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4299 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4300 |
$this->user_id = $user_id; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4301 |
$this->groups = $groups; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4302 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4303 |
else |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4304 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4305 |
$this->user_id = $session->user_id; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4306 |
$this->groups = $session->groups; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4307 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4308 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4309 |
$this->page_id = $page_id; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4310 |
$this->namespace = $namespace; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4311 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4312 |
$this->__calculate(); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4313 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4314 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4315 |
/** |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4316 |
* Performs the actual permission calculation. |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4317 |
* @access private |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4318 |
*/ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4319 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4320 |
private function __calculate() |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4321 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4322 |
global $db, $session, $paths, $template, $plugins; // Common objects |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4323 |
|
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4324 |
$page_id =& $this->page_id; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4325 |
$namespace =& $this->namespace; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4326 |
|
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
parents:
72
diff
changeset
|
4327 |
// 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
parents:
72
diff
changeset
|
4328 |
$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
parents:
72
diff
changeset
|
4329 |
$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
parents:
72
diff
changeset
|
4330 |
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
parents:
72
diff
changeset
|
4331 |
{ |
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
parents:
72
diff
changeset
|
4332 |
$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
parents:
72
diff
changeset
|
4333 |
} |
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
parents:
72
diff
changeset
|
4334 |
|
1 | 4335 |
// 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
parents:
555
diff
changeset
|
4336 |
$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
parents:
555
diff
changeset
|
4337 |
. " LEFT JOIN " . table_prefix . "page_groups AS pg\n" |
618 | 4338 |
. " 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
parents:
555
diff
changeset
|
4339 |
. " 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
parents:
555
diff
changeset
|
4340 |
. " 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
parents:
555
diff
changeset
|
4341 |
|
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4342 |
$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
parents:
270
diff
changeset
|
4343 |
. ' ( '; |
1 | 4344 |
$q = Array(); |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4345 |
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )'; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4346 |
if(count($this->groups) > 0) |
1 | 4347 |
{ |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4348 |
foreach($this->groups as $g_id => $g_name) |
1 | 4349 |
{ |
4350 |
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )'; |
|
4351 |
} |
|
4352 |
} |
|
4353 |
// 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 |
|
4354 |
// permissions to override group permissions. |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4355 |
$bs .= implode(" OR\n ", $q) . ' ) AND (' . $pg_info . ' ( page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\' ) ) |
1 | 4356 |
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
parents:
555
diff
changeset
|
4357 |
|
1 | 4358 |
$q = $session->sql($bs); |
1173
b5b8e7ab0914
Comments (AJAX): Now paginated server side. Fixes issue 2.
Dan
parents:
1170
diff
changeset
|
4359 |
if ( $row = $db->fetchrow($q, true) ) |
1 | 4360 |
{ |
1173
b5b8e7ab0914
Comments (AJAX): Now paginated server side. Fixes issue 2.
Dan
parents:
1170
diff
changeset
|
4361 |
do |
b5b8e7ab0914
Comments (AJAX): Now paginated server side. Fixes issue 2.
Dan
parents:
1170
diff
changeset
|
4362 |
{ |
1 | 4363 |
$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
parents:
57
diff
changeset
|
4364 |
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 ); |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4365 |
// log where this comes from |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4366 |
if ( $row['namespace'] == '__PageGroup' ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4367 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4368 |
$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
parents:
555
diff
changeset
|
4369 |
$pg_name = $row['pg_name']; |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4370 |
} |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4371 |
else |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4372 |
{ |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4373 |
$src = ( $is_everyone ) ? ACL_INHERIT_LOCAL_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_LOCAL_GROUP : ACL_INHERIT_LOCAL_USER ); |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4374 |
} |
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4375 |
if ( $row['group_name'] ) |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4376 |
{ |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4377 |
$group_name = $row['group_name']; |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4378 |
} |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4379 |
foreach ( $rules as $perm_type => $perm_value ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4380 |
{ |
576
6a8c4f1fc6c9
Fixed undefined index left over from scope system rewrite a few days ago
Dan
parents:
573
diff
changeset
|
4381 |
if ( !isset($this->perms[$perm_type]) ) |
6a8c4f1fc6c9
Fixed undefined index left over from scope system rewrite a few days ago
Dan
parents:
573
diff
changeset
|
4382 |
continue; |
6a8c4f1fc6c9
Fixed undefined index left over from scope system rewrite a few days ago
Dan
parents:
573
diff
changeset
|
4383 |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4384 |
if ( $this->perms[$perm_type] == AUTH_DENY ) |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4385 |
continue; |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4386 |
|
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
parents:
570
diff
changeset
|
4387 |
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
parents:
570
diff
changeset
|
4388 |
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
parents:
570
diff
changeset
|
4389 |
|
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4390 |
$this->perm_resolve_table[$perm_type] = array( |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4391 |
'src' => $src, |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4392 |
'rule_id' => $row['rule_id'] |
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4393 |
); |
556
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4394 |
if ( isset($pg_name) ) |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4395 |
{ |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4396 |
$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
parents:
555
diff
changeset
|
4397 |
} |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4398 |
if ( isset($group_name) ) |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4399 |
{ |
63e131c38876
More work done on effective permissions API, namely reporting of page group and usergroup names
Dan
parents:
555
diff
changeset
|
4400 |
$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
parents:
555
diff
changeset
|
4401 |
} |
554
e87390b1f9b0
Revamped some ACL code and added effective permissions calculation code into session manager
Dan
parents:
542
diff
changeset
|
4402 |
} |
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
parents:
57
diff
changeset
|
4403 |
$this->acl_merge_with_current($rules, $is_everyone); |
1 | 4404 |
} while ( $row = $db->fetchrow() ); |
4405 |
} |
|
4406 |
||
4407 |
$this->page_id = $page_id; |
|
4408 |
$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
parents:
322
diff
changeset
|
4409 |
|
749 | 4410 |
$pathskey = $paths->nslist[$this->namespace].sanitize_page_id($this->page_id); |
953
323c4cd1aa37
Made some more changes to the way namespaces are handled, for optimization purposes. This is a bit of a structural reorganization: $paths->pages is obsoleted in its entirety; calculating page existence and metadata is now the job of the Namespace_* backend class. There are many things in PageProcessor that should be reorganized, and page actions in general should really be rethought. This is probably the beginning of a long process that will be taking place over the course of the betas.
Dan
parents:
941
diff
changeset
|
4411 |
$ns = namespace_factory($this->page_id, $this->namespace); |
323c4cd1aa37
Made some more changes to the way namespaces are handled, for optimization purposes. This is a bit of a structural reorganization: $paths->pages is obsoleted in its entirety; calculating page existence and metadata is now the job of the Namespace_* backend class. There are many things in PageProcessor that should be reorganized, and page actions in general should really be rethought. This is probably the beginning of a long process that will be taking place over the course of the betas.
Dan
parents:
941
diff
changeset
|
4412 |
$cdata = $ns->get_cdata(); |
323c4cd1aa37
Made some more changes to the way namespaces are handled, for optimization purposes. This is a bit of a structural reorganization: $paths->pages is obsoleted in its entirety; calculating page existence and metadata is now the job of the Namespace_* backend class. There are many things in PageProcessor that should be reorganized, and page actions in general should really be rethought. This is probably the beginning of a long process that will be taking place over the course of the betas.
Dan
parents:
941
diff
changeset
|
4413 |
$ppwm = $cdata['wiki_mode']; |
323c4cd1aa37
Made some more changes to the way namespaces are handled, for optimization purposes. This is a bit of a structural reorganization: $paths->pages is obsoleted in its entirety; calculating page existence and metadata is now the job of the Namespace_* backend class. There are many things in PageProcessor that should be reorganized, and page actions in general should really be rethought. This is probably the beginning of a long process that will be taking place over the course of the betas.
Dan
parents:
941
diff
changeset
|
4414 |
unset($ns, $cdata); |
323c4cd1aa37
Made some more changes to the way namespaces are handled, for optimization purposes. This is a bit of a structural reorganization: $paths->pages is obsoleted in its entirety; calculating page existence and metadata is now the job of the Namespace_* backend class. There are many things in PageProcessor that should be reorganized, and page actions in general should really be rethought. This is probably the beginning of a long process that will be taking place over the course of the betas.
Dan
parents:
941
diff
changeset
|
4415 |
|
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
parents:
322
diff
changeset
|
4416 |
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
parents:
322
diff
changeset
|
4417 |
$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
parents:
322
diff
changeset
|
4418 |
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
parents:
322
diff
changeset
|
4419 |
$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
parents:
322
diff
changeset
|
4420 |
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
parents:
322
diff
changeset
|
4421 |
$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
parents:
322
diff
changeset
|
4422 |
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
parents:
322
diff
changeset
|
4423 |
{ |
749 | 4424 |
if ( $this->user_id > 1 ) |
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
parents:
322
diff
changeset
|
4425 |
{ |
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
parents:
322
diff
changeset
|
4426 |
$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
parents:
322
diff
changeset
|
4427 |
} |
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
parents:
322
diff
changeset
|
4428 |
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
parents:
322
diff
changeset
|
4429 |
{ |
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
parents:
322
diff
changeset
|
4430 |
$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
parents:
322
diff
changeset
|
4431 |
} |
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
parents:
322
diff
changeset
|
4432 |
} |
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
parents:
322
diff
changeset
|
4433 |
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
parents:
322
diff
changeset
|
4434 |
{ |
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
parents:
322
diff
changeset
|
4435 |
// 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
parents:
322
diff
changeset
|
4436 |
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
parents:
322
diff
changeset
|
4437 |
} |
1 | 4438 |
} |
4439 |
||
4440 |
/** |
|
4441 |
* Tells us whether permission $type is allowed or not based on the current rules. |
|
4442 |
* @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type()) |
|
4443 |
* @param bool $no_deps If true, disables dependency checking |
|
4444 |
* @return bool True if allowed, false if denied or if an error occured |
|
4445 |
*/ |
|
4446 |
||
4447 |
function get_permissions($type, $no_deps = false) |
|
4448 |
{ |
|
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
parents:
57
diff
changeset
|
4449 |
// echo '<pre>' . print_r($this->perms, true) . '</pre>'; |
1 | 4450 |
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
parents:
322
diff
changeset
|
4451 |
|
1 | 4452 |
if ( isset( $this->perms[$type] ) ) |
4453 |
{ |
|
4454 |
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
parents:
322
diff
changeset
|
4455 |
{ |
1 | 4456 |
$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
parents:
322
diff
changeset
|
4457 |
} |
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
parents:
322
diff
changeset
|
4458 |
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
parents:
322
diff
changeset
|
4459 |
{ |
1 | 4460 |
$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
parents:
322
diff
changeset
|
4461 |
} |
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
parents:
322
diff
changeset
|
4462 |
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
parents:
322
diff
changeset
|
4463 |
{ |
1 | 4464 |
$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
parents:
322
diff
changeset
|
4465 |
} |
1 | 4466 |
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
parents:
322
diff
changeset
|
4467 |
{ |
1 | 4468 |
$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
parents:
322
diff
changeset
|
4469 |
} |
1 | 4470 |
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
parents:
322
diff
changeset
|
4471 |
{ |
1 | 4472 |
$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
parents:
322
diff
changeset
|
4473 |
} |
1 | 4474 |
} |
4475 |
else if(isset($this->acl_types[$type])) |
|
4476 |
{ |
|
4477 |
if ( $this->acl_types[$type] == AUTH_DENY ) |
|
4478 |
$ret = false; |
|
4479 |
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode ) |
|
4480 |
$ret = true; |
|
4481 |
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode ) |
|
4482 |
$ret = false; |
|
4483 |
else if ( $this->acl_types[$type] == AUTH_ALLOW ) |
|
4484 |
$ret = true; |
|
4485 |
else if ( $this->acl_types[$type] == AUTH_DISALLOW ) |
|
4486 |
$ret = false; |
|
4487 |
} |
|
4488 |
else |
|
4489 |
{ |
|
4490 |
// 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
parents:
570
diff
changeset
|
4491 |
$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
parents:
570
diff
changeset
|
4492 |
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
parents:
570
diff
changeset
|
4493 |
{ |
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
parents:
570
diff
changeset
|
4494 |
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
parents:
570
diff
changeset
|
4495 |
{ |
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
parents:
570
diff
changeset
|
4496 |
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
parents:
570
diff
changeset
|
4497 |
{ |
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
parents:
570
diff
changeset
|
4498 |
$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
parents:
570
diff
changeset
|
4499 |
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
parents:
570
diff
changeset
|
4500 |
{ |
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
parents:
570
diff
changeset
|
4501 |
$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
parents:
570
diff
changeset
|
4502 |
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
parents:
570
diff
changeset
|
4503 |
} |
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
parents:
570
diff
changeset
|
4504 |
} |
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
parents:
570
diff
changeset
|
4505 |
} |
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
parents:
570
diff
changeset
|
4506 |
} |
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
parents:
570
diff
changeset
|
4507 |
trigger_error('Unknown access type "' . $type . '", called from ' . $caller . '', E_USER_WARNING); |
1 | 4508 |
return false; // Be on the safe side and deny access |
4509 |
} |
|
4510 |
if ( !$no_deps ) |
|
4511 |
{ |
|
4512 |
if ( !$this->acl_check_deps($type) ) |
|
4513 |
return false; |
|
4514 |
} |
|
4515 |
return $ret; |
|
4516 |
} |
|
4517 |
||
4518 |
/** |
|
4519 |
* Tell us if the dependencies for a given permission are met. |
|
4520 |
* @param string The ACL permission ID |
|
749 | 4521 |
* @param bool If true, does not return a boolean value, but instead returns array of dependencies that fail |
1 | 4522 |
* @return bool |
4523 |
*/ |
|
4524 |
||
749 | 4525 |
function acl_check_deps($type, $debug = false) |
1 | 4526 |
{ |
749 | 4527 |
// This will only happen if the permissions table is hacked or improperly accessed |
4528 |
if(!isset($this->acl_deps[$type])) |
|
4529 |
return $debug ? array() : true; |
|
4530 |
// Permission has no dependencies? |
|
1 | 4531 |
if(sizeof($this->acl_deps[$type]) < 1) |
749 | 4532 |
return $debug ? array() : true; |
4533 |
// go through them all and build a flat list of dependencies |
|
1 | 4534 |
$deps = $this->acl_deps[$type]; |
4535 |
while(true) |
|
4536 |
{ |
|
4537 |
$j = sizeof($deps); |
|
4538 |
for ( $i = 0; $i < $j; $i++ ) |
|
4539 |
{ |
|
4540 |
$b = $deps; |
|
1155
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
4541 |
if ( !isset($this->acl_deps[$deps[$i]]) ) |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
4542 |
{ |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
4543 |
// Action $type depends on action $deps[$i] which cannot be satisfied because $deps[$i] is out of scope. |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
4544 |
trigger_error("acl_check_deps: $type depends on {$deps[$i]} which is not within scope of $this->namespace; this indicats a bug in ACL rule specification", E_USER_WARNING); |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
4545 |
return false; |
a1770361ef88
Sessions: Made acl_check_deps() verify scope, so that all of an action's dependencies must apply to the namespace of the given action.
Dan
parents:
1148
diff
changeset
|
4546 |
} |
1 | 4547 |
$deps = array_merge($deps, $this->acl_deps[$deps[$i]]); |
4548 |
if( $b == $deps ) |
|
4549 |
{ |
|
4550 |
break 2; |
|
4551 |
} |
|
4552 |
$j = sizeof($deps); |
|
4553 |
} |
|
4554 |
} |
|
749 | 4555 |
$debugdata = array(); |
1 | 4556 |
foreach($deps as $d) |
4557 |
{ |
|
749 | 4558 |
// Our dependencies are fully resolved, so tell get_permissions() to not recursively call this function |
4559 |
if ( !$this->get_permissions($d, true) ) |
|
1 | 4560 |
{ |
749 | 4561 |
if ( $debug ) |
4562 |
{ |
|
4563 |
$debugdata[] = $d; |
|
4564 |
} |
|
4565 |
else |
|
4566 |
{ |
|
4567 |
return false; |
|
4568 |
} |
|
1 | 4569 |
} |
4570 |
} |
|
749 | 4571 |
return $debug ? $debugdata : true; |
1 | 4572 |
} |
4573 |
||
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
parents:
57
diff
changeset
|
4574 |
/** |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4575 |
* 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
parents:
57
diff
changeset
|
4576 |
* @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
parents:
57
diff
changeset
|
4577 |
* @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
parents:
57
diff
changeset
|
4578 |
* @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
parents:
57
diff
changeset
|
4579 |
*/ |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4580 |
|
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4581 |
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
parents:
57
diff
changeset
|
4582 |
{ |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4583 |
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
parents:
57
diff
changeset
|
4584 |
{ |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4585 |
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
parents:
57
diff
changeset
|
4586 |
{ |
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
parents:
375
diff
changeset
|
4587 |
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
parents:
57
diff
changeset
|
4588 |
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
parents:
57
diff
changeset
|
4589 |
// 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
parents:
57
diff
changeset
|
4590 |
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
parents:
57
diff
changeset
|
4591 |
{ |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4592 |
//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
parents:
57
diff
changeset
|
4593 |
// 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
parents:
57
diff
changeset
|
4594 |
$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
parents:
57
diff
changeset
|
4595 |
$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
parents:
57
diff
changeset
|
4596 |
} |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4597 |
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
parents:
57
diff
changeset
|
4598 |
{ |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4599 |
//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
parents:
57
diff
changeset
|
4600 |
// 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
parents:
57
diff
changeset
|
4601 |
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
parents:
57
diff
changeset
|
4602 |
{ |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4603 |
//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
parents:
57
diff
changeset
|
4604 |
$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
parents:
57
diff
changeset
|
4605 |
} |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4606 |
//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
parents:
57
diff
changeset
|
4607 |
} |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4608 |
} |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4609 |
} |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4610 |
} |
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
parents:
57
diff
changeset
|
4611 |
|
1 | 4612 |
} |
4613 |
||
466
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4614 |
/** |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4615 |
* Cron task - clears out the database of Diffie-Hellman keys |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4616 |
*/ |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4617 |
|
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4618 |
function cron_clean_login_cache() |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4619 |
{ |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4620 |
global $db, $session, $paths, $template, $plugins; // Common objects |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4621 |
|
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4622 |
if ( !$db->sql_query('DELETE FROM ' . table_prefix . 'diffiehellman;') ) |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4623 |
$db->_die(); |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4624 |
|
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4625 |
setConfig('login_key_cache', ''); |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4626 |
} |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4627 |
|
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4628 |
register_cron_task('cron_clean_login_cache', 72); |
1cc8a038ad20
Fixed improper serializing of IP that could allow reusing of key from multiple IP addresses.
Dan
parents:
460
diff
changeset
|
4629 |
|
480
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4630 |
/** |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4631 |
* Cron task - clears out outdated high-auth session keys |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4632 |
*/ |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4633 |
|
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4634 |
function cron_clean_old_admin_keys() |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4635 |
{ |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4636 |
global $db, $session, $paths, $template, $plugins; // Common objects |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4637 |
|
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4638 |
$threshold = time() - ( 15 * 60 ); |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4639 |
$ul_member = USER_LEVEL_MEMBER; |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4640 |
if ( !$db->sql_query('DELETE FROM ' . table_prefix . "session_keys WHERE time < $threshold AND auth_level > $ul_member;") ) |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4641 |
$db->_die(); |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4642 |
} |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4643 |
|
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4644 |
// Once a week |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4645 |
register_cron_task('cron_clean_old_admin_keys', 168); |
d5376271f96b
Added a cron task to sessions.php that deletes old admin keys once a week
Dan
parents:
472
diff
changeset
|
4646 |
|
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
parents:
536
diff
changeset
|
4647 |
/** |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
4648 |
* 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
parents:
536
diff
changeset
|
4649 |
*/ |
acb7e23b6ffa
Massive commit with various changes. Added user ranks system (no admin interface yet) and ability for users to have custom user titles. Made cron framework accept fractions of hours through floating-point intervals. Modifed ACL editor to use miniPrompt framework for close confirmation box. Made avatar system use a special page as opposed to fetching the files directly for caching reasons.
Dan
parents:
536
diff
changeset
|
4650 |
|
573
43e7254afdb4
Renamed some functions (that were new in this release anyway) due to compatibility broken with PunBB bridge
Dan
parents:
571
diff
changeset
|
4651 |
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
parents:
536
diff
changeset
|
4652 |
|
1 | 4653 |
?> |