author | Dan |
Sat, 15 Dec 2007 18:11:59 -0500 | |
changeset 260 | c0d855cfaf0e |
parent 256 | f8356d9c3481 |
child 261 | 5f1cd51bf1be |
permissions | -rw-r--r-- |
0 | 1 |
<?php |
2 |
/* |
|
3 |
Plugin Name: User control panel |
|
36
425261984266
Added "page hint" on search page; deprecated "www." on EnanoCMS.org links
Dan
parents:
32
diff
changeset
|
4 |
Plugin URI: http://enanocms.org/ |
0 | 5 |
Description: Provides the page Special:Preferences. |
6 |
Author: Dan Fuhry |
|
256 | 7 |
Version: 1.0.3 |
36
425261984266
Added "page hint" on search page; deprecated "www." on EnanoCMS.org links
Dan
parents:
32
diff
changeset
|
8 |
Author URI: http://enanocms.org/ |
0 | 9 |
*/ |
10 |
||
11 |
/* |
|
12 |
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between |
|
256 | 13 |
* Version 1.0.3 |
0 | 14 |
* Copyright (C) 2006-2007 Dan Fuhry |
15 |
* |
|
16 |
* This program is Free Software; you can redistribute it and/or modify it under the terms of the GNU General Public License |
|
17 |
* as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. |
|
18 |
* |
|
19 |
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied |
|
20 |
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. |
|
21 |
*/ |
|
22 |
||
23 |
$userprefs_menu = Array(); |
|
24 |
$userprefs_menu_links = Array(); |
|
25 |
function userprefs_menu_add($section, $text, $link) |
|
26 |
{ |
|
27 |
global $userprefs_menu; |
|
229
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:
194
diff
changeset
|
28 |
if ( isset($userprefs_menu[$section]) && is_array($userprefs_menu[$section]) ) |
0 | 29 |
{ |
30 |
$userprefs_menu[$section][] = Array( |
|
31 |
'text' => $text, |
|
32 |
'link' => $link |
|
33 |
); |
|
34 |
} |
|
35 |
else |
|
36 |
{ |
|
37 |
$userprefs_menu[$section] = Array(Array( |
|
38 |
'text' => $text, |
|
39 |
'link' => $link |
|
40 |
)); |
|
41 |
} |
|
42 |
} |
|
43 |
||
103
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
44 |
$plugins->attachHook('compile_template', 'userprefs_jbox_setup($button, $tb, $menubtn);'); |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
45 |
|
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
46 |
function userprefs_jbox_setup(&$button, &$tb, &$menubtn) |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
47 |
{ |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
48 |
global $db, $session, $paths, $template, $plugins; // Common objects |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
49 |
|
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
50 |
if ( $paths->namespace != 'Special' || $paths->cpage['urlname_nons'] != 'Preferences' ) |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
51 |
return false; |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
52 |
|
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
53 |
$tb .= "<ul>$template->toolbar_menu</ul>"; |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
54 |
$template->toolbar_menu = ''; |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
55 |
|
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
56 |
$button->assign_vars(array( |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
57 |
'TEXT' => 'list of registered members', |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
58 |
'FLAGS' => '', |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
59 |
'PARENTFLAGS' => '', |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
60 |
'HREF' => makeUrlNS('Special', 'Memberlist') |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
61 |
)); |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
62 |
|
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
63 |
$tb .= $button->run(); |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
64 |
} |
a8891e108c95
Several major improvements: Memberlist page added (planned since about beta 2), page group support added for non-JS ACL editor (oops!), and attempting to view a page for which you lack read permissions will get you logged.
Dan
parents:
85
diff
changeset
|
65 |
|
0 | 66 |
function userprefs_menu_html() |
67 |
{ |
|
68 |
global $userprefs_menu; |
|
69 |
global $userprefs_menu_links; |
|
70 |
||
71 |
$html = ''; |
|
72 |
$quot = '"'; |
|
73 |
||
74 |
foreach ( $userprefs_menu as $section => $buttons ) |
|
75 |
{ |
|
76 |
$html .= ( isset($userprefs_menu_links[$section]) ) ? "<a href={$quot}{$userprefs_menu_links[$section]}{$quot}>{$section}</a>\n " : "<a>{$section}</a>\n "; |
|
77 |
$html .= "<ul>\n "; |
|
78 |
foreach ( $buttons as $button ) |
|
79 |
{ |
|
80 |
$html .= " <li><a href={$quot}{$button['link']}{$quot}>{$button['text']}</a></li>\n "; |
|
81 |
} |
|
82 |
$html .= "</ul>\n "; |
|
83 |
} |
|
84 |
||
85 |
return $html; |
|
86 |
} |
|
87 |
||
88 |
function userprefs_show_menu() |
|
89 |
{ |
|
90 |
echo '<div class="menu_nojs"> |
|
91 |
' . userprefs_menu_html() . ' |
|
92 |
<span class="menuclear"></span> |
|
93 |
</div> |
|
94 |
<br /> |
|
95 |
'; |
|
96 |
} |
|
97 |
||
98 |
function userprefs_menu_init() |
|
99 |
{ |
|
100 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
101 |
global $userprefs_menu_links; |
|
102 |
||
171
1465f48faba0
AJAX login box is now used in userprefs panel; Spry shake effect and general UX on auth fail is smoother now; added ajaxLoginNavTo() JS function
Dan
parents:
140
diff
changeset
|
103 |
userprefs_menu_add('Profile/membership', 'Edit e-mail address and password', makeUrlNS('Special', 'Preferences/EmailPassword') . '" onclick="ajaxLoginNavTo(\'Special\', \'Preferences/EmailPassword\', '.USER_LEVEL_CHPREF.'); return false;'); |
0 | 104 |
userprefs_menu_add('Profile/membership', 'Edit signature', makeUrlNS('Special', 'Preferences/Signature')); |
105 |
userprefs_menu_add('Profile/membership', 'Edit public profile', makeUrlNS('Special', 'Preferences/Profile')); |
|
106 |
userprefs_menu_add('Private messages', 'Inbox', makeUrlNS('Special', 'PrivateMessages/Folder/Inbox')); |
|
107 |
userprefs_menu_add('Private messages', 'Outbox', makeUrlNS('Special', 'PrivateMessages/Folder/Outbox')); |
|
108 |
userprefs_menu_add('Private messages', 'Sent items', makeUrlNS('Special', 'PrivateMessages/Folder/Sent')); |
|
109 |
userprefs_menu_add('Private messages', 'Drafts', makeUrlNS('Special', 'PrivateMessages/Folder/Drafts')); |
|
110 |
userprefs_menu_add('Private messages', 'Archive', makeUrlNS('Special', 'PrivateMessages/Folder/Archive')); |
|
111 |
||
112 |
$userprefs_menu_links['Profile/membership'] = makeUrlNS('Special', 'Preferences'); |
|
113 |
$userprefs_menu_links['Private messages'] = makeUrlNS('Special', 'PrivateMessages'); |
|
114 |
||
115 |
$code = $plugins->setHook('userprefs_jbox'); |
|
116 |
foreach ( $code as $cmd ) |
|
117 |
{ |
|
118 |
eval($cmd); |
|
119 |
} |
|
120 |
} |
|
121 |
||
122 |
$plugins->attachHook('session_started', 'userprefs_menu_init();'); |
|
123 |
||
124 |
function page_Special_Preferences() |
|
125 |
{ |
|
126 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
127 |
||
128 |
// We need a login to continue |
|
129 |
if ( !$session->user_logged_in ) |
|
130 |
redirect(makeUrlNS('Special', 'Login/' . $paths->page), 'Login required', 'You need to be logged in to access this page. Please wait while you are redirected to the login page.'); |
|
131 |
||
132 |
// User ID - later this will be specified on the URL, but hardcoded for now |
|
133 |
$uid = intval($session->user_id); |
|
134 |
||
135 |
// Instanciate the AES encryptor |
|
229
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:
194
diff
changeset
|
136 |
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE); |
0 | 137 |
|
138 |
// Basic user info |
|
139 |
$q = $db->sql_query('SELECT username, password, email, real_name, signature, theme, style FROM '.table_prefix.'users WHERE user_id='.$uid.';'); |
|
140 |
if ( !$q ) |
|
141 |
$db->_die(); |
|
142 |
||
143 |
$row = $db->fetchrow(); |
|
144 |
$db->free_result(); |
|
145 |
||
146 |
$section = $paths->getParam(0); |
|
147 |
if ( !$section ) |
|
148 |
{ |
|
149 |
$section = 'Home'; |
|
150 |
} |
|
151 |
||
152 |
$errors = ''; |
|
153 |
||
154 |
switch ( $section ) |
|
155 |
{ |
|
156 |
case 'EmailPassword': |
|
157 |
// Require elevated privileges (well sortof) |
|
158 |
if ( $session->auth_level < USER_LEVEL_CHPREF ) |
|
159 |
{ |
|
160 |
redirect(makeUrlNS('Special', 'Login/' . $paths->fullpage, 'level=' . USER_LEVEL_CHPREF, true), 'Authentication required', 'You need to re-authenticate to access this page.', 0); |
|
161 |
} |
|
162 |
||
163 |
if ( isset($_POST['submit']) ) |
|
164 |
{ |
|
165 |
$email_changed = false; |
|
166 |
// First do the e-mail address |
|
167 |
if ( strlen($_POST['newemail']) > 0 ) |
|
168 |
{ |
|
169 |
switch('foo') // Same reason as in the password code... |
|
170 |
{ |
|
171 |
case 'foo': |
|
172 |
if ( $_POST['newemail'] != $_POST['newemail_conf'] ) |
|
173 |
{ |
|
174 |
$errors .= '<div class="error-box">The e-mail addresses you entered did not match.</div>'; |
|
175 |
break; |
|
176 |
} |
|
177 |
} |
|
178 |
$q = $db->sql_query('SELECT password FROM '.table_prefix.'users WHERE user_id='.$session->user_id.';'); |
|
179 |
if ( !$q ) |
|
180 |
$db->_die(); |
|
181 |
$row = $db->fetchrow(); |
|
182 |
$db->free_result(); |
|
183 |
$old_pass = $aes->decrypt($row['password'], $session->private_key, ENC_HEX); |
|
184 |
||
185 |
$new_email = $_POST['newemail']; |
|
186 |
||
187 |
$result = $session->update_user($session->user_id, false, $old_pass, false, $new_email); |
|
188 |
if ( $result != 'success' ) |
|
189 |
{ |
|
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
|
190 |
$message = '<p>The following errors were encountered while saving your e-mail address:</p>'; |
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
|
191 |
$message .= '<ul><li>' . implode("</li>\n<li>", $result) . '</li></ul>'; |
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
|
192 |
die_friendly('Error updating e-mail address', $message); |
0 | 193 |
} |
194 |
$email_changed = true; |
|
195 |
} |
|
196 |
// Obtain password |
|
197 |
if ( $_POST['use_crypt'] == 'yes' && !empty($_POST['crypt_data']) ) |
|
198 |
{ |
|
199 |
$key = $session->fetch_public_key($_POST['crypt_key']); |
|
200 |
if ( !$key ) |
|
201 |
die('Can\'t lookup key'); |
|
202 |
$key = hexdecode($key); |
|
203 |
$newpass = $aes->decrypt($_POST['crypt_data'], $key, ENC_HEX); |
|
204 |
// At this point we know if we _want_ to change the password... |
|
205 |
||
206 |
// We can't check the password to see if it matches the confirmation |
|
207 |
// because the confirmation was destroyed during the encryption. I figured |
|
208 |
// this wasn't a big deal because if the encryption worked, then either |
|
209 |
// the Javascript validated it or the user hacked the form. In the latter |
|
210 |
// case, if he's smart enough to hack the encryption code, he's probably |
|
211 |
// smart enough to remember his password. |
|
212 |
||
213 |
if ( strlen($newpass) > 0 ) |
|
214 |
{ |
|
194
6a4573507ff8
Fixed: invalid smartform input to Admin:UserManager when errors present and changing own account; [demo mode] default user can no longer change password
Dan
parents:
181
diff
changeset
|
215 |
if ( defined('ENANO_DEMO_MODE') ) |
6a4573507ff8
Fixed: invalid smartform input to Admin:UserManager when errors present and changing own account; [demo mode] default user can no longer change password
Dan
parents:
181
diff
changeset
|
216 |
$errors .= '<div class="error-box" style="margin: 0 0 10px 0;">You can\'t change your password in demo mode.</div>'; |
0 | 217 |
// Perform checks |
218 |
if ( strlen($newpass) < 6 ) |
|
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:
103
diff
changeset
|
219 |
$errors .= '<div class="error-box" style="margin: 0 0 10px 0;">Password must be at least 6 characters. You hacked my script, darn you!</div>'; |
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:
103
diff
changeset
|
220 |
if ( getConfig('pw_strength_enable') == '1' ) |
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:
103
diff
changeset
|
221 |
{ |
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:
103
diff
changeset
|
222 |
$score_inp = password_score($newpass); |
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:
103
diff
changeset
|
223 |
$score_min = 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:
103
diff
changeset
|
224 |
if ( $score_inp < $score_min ) |
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:
103
diff
changeset
|
225 |
$errors .= '<div class="error-box" style="margin: 0 0 10px 0;">Your password did not meet the complexity score requirement for this site. Your password scored '. $score_inp .', while a score of at least '. $score_min .' is needed.</div>'; |
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:
103
diff
changeset
|
226 |
} |
0 | 227 |
// Encrypt new password |
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
parents:
31
diff
changeset
|
228 |
if ( empty($errors) ) |
0 | 229 |
{ |
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
|
230 |
$newpass_enc = $aes->encrypt($newpass, $session->private_key, ENC_HEX); |
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
|
231 |
// Perform the swap |
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
|
232 |
$q = $db->sql_query('UPDATE '.table_prefix.'users SET password=\'' . $newpass_enc . '\' WHERE user_id=' . $session->user_id . ';'); |
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
|
233 |
if ( !$q ) |
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
|
234 |
$db->_die(); |
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
|
235 |
// Log out and back in |
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
|
236 |
$username = $session->username; |
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
|
237 |
$session->logout(); |
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
|
238 |
if ( $email_changed ) |
0 | 239 |
{ |
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
|
240 |
if ( getConfig('account_activation') == 'user' ) |
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
|
241 |
{ |
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
|
242 |
redirect(makeUrl(getConfig('main_page')), 'Profile changed', 'Your password and e-mail address have been changed. Since e-mail activation is required on this site, you will need to re-activate your account to continue. An e-mail has been sent to the new e-mail address with an activation link. You must click that link in order to log in again.', 19); |
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
|
243 |
} |
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
|
244 |
else if ( getConfig('account_activation') == 'admin' ) |
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
|
245 |
{ |
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
|
246 |
redirect(makeUrl(getConfig('main_page')), 'Profile changed', 'Your password and e-mail address have been changed. Since administrative activation is requires on this site, a request has been sent to the administrators to activate your account for you. You will not be able to use your account until it is activated by an administrator.', 19); |
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
|
247 |
} |
0 | 248 |
} |
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
|
249 |
$session->login_without_crypto($session->username, $newpass); |
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
|
250 |
redirect(makeUrlNS('Special', 'Preferences'), 'Password changed', 'Your password has been changed, and you will now be redirected back to the user control panel.', 4); |
0 | 251 |
} |
252 |
} |
|
253 |
} |
|
254 |
else |
|
255 |
{ |
|
256 |
switch('foo') // allow breaking out of our section...i can't wait until PHP6 (goto support!) |
|
257 |
{ |
|
258 |
case 'foo': |
|
259 |
$pass = $_POST['newpass']; |
|
260 |
if ( $pass != $_POST['newpass_conf'] ) |
|
261 |
{ |
|
262 |
$errors .= '<div class="error-box">The passwords you entered did not match</div>'; |
|
263 |
break; |
|
264 |
} |
|
265 |
||
266 |
if ( $email_changed ) |
|
267 |
{ |
|
268 |
if ( getConfig('account_activation') == 'user' ) |
|
269 |
{ |
|
270 |
redirect(makeUrl(getConfig('main_page')), 'Profile changed', 'Your e-mail address has been changed. Since e-mail activation is required on this site, you will need to re-activate your account to continue. An e-mail has been sent to the new e-mail address with an activation link. You must click that link in order to log in again.', 19); |
|
271 |
} |
|
272 |
else if ( getConfig('account_activation') == 'admin' ) |
|
273 |
{ |
|
274 |
redirect(makeUrl(getConfig('main_page')), 'Profile changed', 'Your e-mail address has been changed. Since administrative activation is requires on this site, a request has been sent to the administrators to activate your account for you. You will not be able to use your account until it is activated by an administrator.', 19); |
|
275 |
} |
|
276 |
else |
|
277 |
{ |
|
278 |
redirect(makeUrlNS('Special', 'Preferences'), 'Password changed', 'Your e-mail address has been changed, and you will now be redirected back to the user control panel.', 4); |
|
279 |
} |
|
280 |
} |
|
281 |
||
282 |
return; |
|
283 |
} |
|
284 |
} |
|
285 |
} |
|
286 |
$template->tpl_strings['PAGE_NAME'] = 'Change E-mail Address or Password'; |
|
287 |
break; |
|
288 |
case 'Signature': |
|
289 |
$template->tpl_strings['PAGE_NAME'] = 'Editing signature'; |
|
290 |
break; |
|
291 |
case 'Profile': |
|
292 |
$template->tpl_strings['PAGE_NAME'] = 'Editing public profile'; |
|
293 |
break; |
|
294 |
} |
|
295 |
||
296 |
$template->header(); |
|
297 |
||
298 |
// Output the menu |
|
299 |
// This is not templatized because it conforms to the jBox menu standard. |
|
300 |
||
301 |
userprefs_show_menu(); |
|
302 |
||
303 |
switch ( $section ) |
|
304 |
{ |
|
305 |
case 'Home': |
|
306 |
global $email; |
|
171
1465f48faba0
AJAX login box is now used in userprefs panel; Spry shake effect and general UX on auth fail is smoother now; added ajaxLoginNavTo() JS function
Dan
parents:
140
diff
changeset
|
307 |
$userpage_id = $paths->nslist['User'] . sanitize_page_id($session->username); |
1465f48faba0
AJAX login box is now used in userprefs panel; Spry shake effect and general UX on auth fail is smoother now; added ajaxLoginNavTo() JS function
Dan
parents:
140
diff
changeset
|
308 |
$userpage_exists = ( isPage($userpage_id) ) ? '' : ' class="wikilink-nonexistent"'; |
1465f48faba0
AJAX login box is now used in userprefs panel; Spry shake effect and general UX on auth fail is smoother now; added ajaxLoginNavTo() JS function
Dan
parents:
140
diff
changeset
|
309 |
$user_page = '<a href="' . makeUrlNS('User', sanitize_page_id($session->username)) . '"' . $userpage_exists . '>user page</a> <sup>(<a href="' . makeUrlNS('User', str_replace(' ', '_', $session->username)) . '#do:comments">comments</a>)</sup>'; |
0 | 310 |
$site_admin = $email->encryptEmail(getConfig('contact_email'), '', '', 'administrator'); |
171
1465f48faba0
AJAX login box is now used in userprefs panel; Spry shake effect and general UX on auth fail is smoother now; added ajaxLoginNavTo() JS function
Dan
parents:
140
diff
changeset
|
311 |
$make_one_now = '<a href="' . makeUrlNS('User', sanitize_page_id($session->username)) . '">make one now</a>'; |
0 | 312 |
echo "<h3 style='margin-top: 0;'>$session->username, welcome to your control panel</h3>"; |
313 |
echo "<p>Here you can make changes to your profile, view statistics on yourself on this site, and set your preferences.</p> |
|
171
1465f48faba0
AJAX login box is now used in userprefs panel; Spry shake effect and general UX on auth fail is smoother now; added ajaxLoginNavTo() JS function
Dan
parents:
140
diff
changeset
|
314 |
<p>Your $user_page is your free writing space. You can use it to tell the other members of this site a little bit about yourself. If you haven't already made a user page, why not $make_one_now?</p> |
0 | 315 |
<p>Use the menu at the top to navigate around. If you have any questions, you may contact the $site_admin."; |
316 |
break; |
|
317 |
case 'EmailPassword': |
|
318 |
||
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:
103
diff
changeset
|
319 |
$errors = trim($errors); |
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:
103
diff
changeset
|
320 |
if ( !empty($errors) ) |
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:
103
diff
changeset
|
321 |
{ |
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:
103
diff
changeset
|
322 |
echo $errors; |
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:
103
diff
changeset
|
323 |
} |
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:
103
diff
changeset
|
324 |
|
0 | 325 |
echo '<form action="' . makeUrlNS('Special', 'Preferences/EmailPassword') . '" method="post" onsubmit="return runEncryption();" name="empwform" >'; |
326 |
||
327 |
// Password change form |
|
328 |
$pubkey = $session->rijndael_genkey(); |
|
329 |
||
330 |
echo '<fieldset> |
|
331 |
<legend>Change password</legend> |
|
332 |
Type a new password:<br /> |
|
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:
103
diff
changeset
|
333 |
<input type="password" name="newpass" size="30" tabindex="1" ' . ( getConfig('pw_strength_enable') == '1' ? 'onkeyup="password_score_field(this);" ' : '' ) . '/>' . ( getConfig('pw_strength_enable') == '1' ? '<span class="password-checker" style="font-weight: bold; color: #aaaaaa;"> Loading...</span>' : '' ) . ' |
0 | 334 |
<br /> |
335 |
<br /> |
|
336 |
Type the password again to confirm:<br /> |
|
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:
103
diff
changeset
|
337 |
<input type="password" name="newpass_conf" size="30" tabindex="2" /> |
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:
103
diff
changeset
|
338 |
' . ( getConfig('pw_strength_enable') == '1' ? '<br /><br /><div id="pwmeter"></div> |
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:
103
diff
changeset
|
339 |
<small>Your password needs to score at least <b>'.getConfig('pw_strength_minimum').'</b> in order to be accepted.</small>' : '' ) . ' |
0 | 340 |
</fieldset><br /> |
341 |
<fieldset> |
|
342 |
<legend>Change e-mail address</legend> |
|
343 |
New e-mail address:<br /> |
|
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:
103
diff
changeset
|
344 |
<input type="text" value="' . ( isset($_POST['newemail']) ? htmlspecialchars($_POST['newemail']) : '' ) . '" name="newemail" size="30" tabindex="3" /> |
0 | 345 |
<br /> |
346 |
<br /> |
|
347 |
Confirm e-mail address:<br /> |
|
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:
103
diff
changeset
|
348 |
<input type="text" value="' . ( isset($_POST['newemail']) ? htmlspecialchars($_POST['newemail']) : '' ) . '" name="newemail_conf" size="30" tabindex="4" /> |
0 | 349 |
</fieldset> |
350 |
<input type="hidden" name="use_crypt" value="no" /> |
|
351 |
<input type="hidden" name="crypt_key" value="' . $pubkey . '" /> |
|
352 |
<input type="hidden" name="crypt_data" value="" /> |
|
353 |
<br /> |
|
354 |
<div style="text-align: right;"><input type="submit" name="submit" value="Save Changes" tabindex="5" /></div>'; |
|
355 |
||
356 |
echo '</form>'; |
|
357 |
||
358 |
// ENCRYPTION CODE |
|
359 |
?> |
|
360 |
<script type="text/javascript"> |
|
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:
103
diff
changeset
|
361 |
<?php if ( getConfig('pw_strength_enable') == '1' ): ?> |
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:
103
diff
changeset
|
362 |
password_score_field(document.forms.empwform.newpass); |
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:
103
diff
changeset
|
363 |
<?php endif; ?> |
0 | 364 |
disableJSONExts(); |
365 |
str = ''; |
|
366 |
for(i=0;i<keySizeInBits/4;i++) str+='0'; |
|
367 |
var key = hexToByteArray(str); |
|
368 |
var pt = hexToByteArray(str); |
|
369 |
var ct = rijndaelEncrypt(pt, key, "ECB"); |
|
370 |
var ct = byteArrayToHex(ct); |
|
371 |
switch(keySizeInBits) |
|
372 |
{ |
|
373 |
case 128: |
|
374 |
v = '66e94bd4ef8a2c3b884cfa59ca342b2e'; |
|
375 |
break; |
|
376 |
case 192: |
|
377 |
v = 'aae06992acbf52a3e8f4a96ec9300bd7aae06992acbf52a3e8f4a96ec9300bd7'; |
|
378 |
break; |
|
379 |
case 256: |
|
380 |
v = 'dc95c078a2408989ad48a21492842087dc95c078a2408989ad48a21492842087'; |
|
381 |
break; |
|
382 |
} |
|
383 |
var aes_testpassed = ( ct == v && md5_vm_test() ); |
|
384 |
function runEncryption() |
|
385 |
{ |
|
386 |
var frm = document.forms.empwform; |
|
387 |
if ( frm.newpass.value.length < 1 ) |
|
388 |
return true; |
|
389 |
if(aes_testpassed) |
|
390 |
{ |
|
391 |
frm.use_crypt.value = 'yes'; |
|
392 |
var cryptkey = frm.crypt_key.value; |
|
393 |
frm.crypt_key.value = hex_md5(cryptkey); |
|
394 |
cryptkey = hexToByteArray(cryptkey); |
|
395 |
if(!cryptkey || ( ( typeof cryptkey == 'string' || typeof cryptkey == 'object' ) ) && cryptkey.length != keySizeInBits / 8 ) |
|
396 |
{ |
|
397 |
frm.submit.disabled = true; |
|
398 |
len = ( typeof cryptkey == 'string' || typeof cryptkey == 'object' ) ? '\nLen: '+cryptkey.length : ''; |
|
399 |
alert('The key is messed up\nType: '+typeof(cryptkey)+len); |
|
400 |
} |
|
401 |
} |
|
402 |
pass1 = frm.newpass.value; |
|
403 |
pass2 = frm.newpass_conf.value; |
|
404 |
if ( pass1 != pass2 ) |
|
405 |
{ |
|
406 |
alert('The passwords you entered do not match.'); |
|
407 |
return false; |
|
408 |
} |
|
409 |
if ( pass1.length < 6 && pass1.length > 0 ) |
|
410 |
{ |
|
411 |
alert('The new password must be 6 characters or greater in length.'); |
|
412 |
return false; |
|
413 |
} |
|
414 |
if(aes_testpassed) |
|
415 |
{ |
|
416 |
pass = frm.newpass.value; |
|
417 |
pass = stringToByteArray(pass); |
|
418 |
cryptstring = rijndaelEncrypt(pass, cryptkey, 'ECB'); |
|
419 |
if(!cryptstring) |
|
420 |
{ |
|
421 |
return false; |
|
422 |
} |
|
423 |
cryptstring = byteArrayToHex(cryptstring); |
|
424 |
frm.crypt_data.value = cryptstring; |
|
425 |
frm.newpass.value = ""; |
|
426 |
frm.newpass_conf.value = ""; |
|
427 |
} |
|
428 |
return true; |
|
429 |
} |
|
430 |
</script> |
|
431 |
<?php |
|
432 |
||
433 |
break; |
|
434 |
case 'Signature': |
|
435 |
if ( isset($_POST['new_sig']) ) |
|
436 |
{ |
|
437 |
$sig = $_POST['new_sig']; |
|
438 |
$sig = RenderMan::preprocess_text($sig, true, false); |
|
439 |
$sql_sig = $db->escape($sig); |
|
440 |
$q = $db->sql_query('UPDATE '.table_prefix.'users SET signature=\'' . $sql_sig . '\' WHERE user_id=' . $session->user_id . ';'); |
|
441 |
if ( !$q ) |
|
442 |
$db->_die(); |
|
443 |
$session->signature = $sig; |
|
444 |
echo '<div class="info-box" style="margin: 0 0 10px 0;">Your signature has been saved.</div>'; |
|
445 |
} |
|
446 |
echo '<form action="'.makeUrl($paths->fullpage).'" method="post">'; |
|
74
68469a95658d
Various bugfixes and cleanups, too much to remember... see the diffs for what got changed :-)
Dan
parents:
36
diff
changeset
|
447 |
echo $template->tinymce_textarea('new_sig', htmlspecialchars($session->signature)); |
0 | 448 |
echo '<input type="submit" value="Save signature" />'; |
449 |
echo '</form>'; |
|
450 |
break; |
|
451 |
case "Profile": |
|
452 |
if ( isset($_POST['submit']) ) |
|
453 |
{ |
|
454 |
$real_name = htmlspecialchars($_POST['real_name']); |
|
455 |
$real_name = $db->escape($real_name); |
|
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
456 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
457 |
$imaddr_aim = htmlspecialchars($_POST['imaddr_aim']); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
458 |
$imaddr_aim = $db->escape($imaddr_aim); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
459 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
460 |
$imaddr_msn = htmlspecialchars($_POST['imaddr_msn']); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
461 |
$imaddr_msn = $db->escape($imaddr_msn); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
462 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
463 |
$imaddr_yahoo = htmlspecialchars($_POST['imaddr_yahoo']); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
464 |
$imaddr_yahoo = $db->escape($imaddr_yahoo); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
465 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
466 |
$imaddr_xmpp = htmlspecialchars($_POST['imaddr_xmpp']); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
467 |
$imaddr_xmpp = $db->escape($imaddr_xmpp); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
468 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
469 |
$homepage = htmlspecialchars($_POST['homepage']); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
470 |
$homepage = $db->escape($homepage); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
471 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
472 |
$location = htmlspecialchars($_POST['location']); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
473 |
$location = $db->escape($location); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
474 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
475 |
$occupation = htmlspecialchars($_POST['occupation']); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
476 |
$occupation = $db->escape($occupation); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
477 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
478 |
$hobbies = htmlspecialchars($_POST['hobbies']); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
479 |
$hobbies = $db->escape($hobbies); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
480 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
481 |
$email_public = ( isset($_POST['email_public']) ) ? '1' : '0'; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
482 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
483 |
$session->real_name = $real_name; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
484 |
|
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
|
485 |
if ( !preg_match('/@([a-z0-9-]+)(\.([a-z0-9-\.]+))?/', $imaddr_msn) && !empty($imaddr_msn) ) |
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
486 |
{ |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
487 |
$imaddr_msn = "$imaddr_msn@hotmail.com"; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
488 |
} |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
489 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
490 |
if ( substr($homepage, 0, 7) != 'http://' ) |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
491 |
{ |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
492 |
$homepage = "http://$homepage"; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
493 |
} |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
494 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
495 |
if ( !preg_match('/^http:\/\/([a-z0-9-.]+)([A-z0-9@#\$%\&:;<>,\.\?=\+\(\)\[\]_\/\\\\]*?)$/i', $homepage) ) |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
496 |
{ |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
497 |
$homepage = ''; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
498 |
} |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
499 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
500 |
$session->user_extra['user_aim'] = $imaddr_aim; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
501 |
$session->user_extra['user_msn'] = $imaddr_msn; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
502 |
$session->user_extra['user_xmpp'] = $imaddr_xmpp; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
503 |
$session->user_extra['user_yahoo'] = $imaddr_yahoo; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
504 |
$session->user_extra['user_homepage'] = $homepage; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
505 |
$session->user_extra['user_location'] = $location; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
506 |
$session->user_extra['user_job'] = $occupation; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
507 |
$session->user_extra['user_hobbies'] = $hobbies; |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
508 |
$session->user_extra['email_public'] = intval($email_public); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
509 |
|
0 | 510 |
$q = $db->sql_query('UPDATE '.table_prefix."users SET real_name='$real_name' WHERE user_id=$session->user_id;"); |
511 |
if ( !$q ) |
|
512 |
$db->_die(); |
|
513 |
||
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
514 |
$q = $db->sql_query('UPDATE '.table_prefix."users_extra SET user_aim='$imaddr_aim',user_yahoo='$imaddr_yahoo',user_msn='$imaddr_msn', |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
515 |
user_xmpp='$imaddr_xmpp',user_homepage='$homepage',user_location='$location',user_job='$occupation', |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
516 |
user_hobbies='$hobbies',email_public=$email_public |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
517 |
WHERE user_id=$session->user_id;"); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
518 |
|
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
519 |
if ( !$q ) |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
520 |
$db->_die(); |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
521 |
|
0 | 522 |
echo '<div class="info-box" style="margin: 0 0 10px 0;">Your profile has been updated.</div>'; |
523 |
} |
|
524 |
echo '<form action="'.makeUrl($paths->fullpage).'" method="post">'; |
|
525 |
?> |
|
526 |
<div class="tblholder"> |
|
527 |
<table border="0" cellspacing="1" cellpadding="4"> |
|
528 |
<tr> |
|
529 |
<th colspan="2">Your public profile</th> |
|
530 |
</tr> |
|
531 |
<tr> |
|
532 |
<td colspan="2" class="row3">Please note that all of the information you enter here will be <b>publicly viewable.</b> All of the fields on this page are optional and may be left blank if you so desire.</td> |
|
533 |
</tr> |
|
534 |
<tr> |
|
535 |
<td class="row2" style="width: 50%;">Real name:</td> |
|
536 |
<td class="row1" style="width: 50%;"><input type="text" name="real_name" value="<?php echo $session->real_name; ?>" size="30" /></td> |
|
537 |
</tr> |
|
538 |
<tr> |
|
539 |
<td class="row2">Change theme:</td> |
|
540 |
<td class="row1">If you don't like the look of the site, need a visual break, or are just curious, we might have some different themes for you to try out! <a href="<?php echo makeUrlNS('Special', 'ChangeStyle/' . $paths->page); ?>" onclick="ajaxChangeStyle(); return false;">Change my theme...</a></td> |
|
541 |
</tr> |
|
542 |
<tr> |
|
31
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
543 |
<th class="subhead" colspan="2"> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
544 |
Instant messenger contact information |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
545 |
</th> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
546 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
547 |
<td class="row2" style="width: 50%;">AIM handle:</td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
548 |
<td class="row1" style="width: 50%;"><input type="text" name="imaddr_aim" value="<?php echo $session->user_extra['user_aim']; ?>" size="30" /></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
549 |
</tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
550 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
551 |
<td class="row2" style="width: 50%;"><acronym title="Windows™ Live Messenger">WLM</acronym> handle:<br /><small>If you don't specify the domain (@whatever.com), "@hotmail.com" will be assumed.</small></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
552 |
<td class="row1" style="width: 50%;"><input type="text" name="imaddr_msn" value="<?php echo $session->user_extra['user_msn']; ?>" size="30" /></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
553 |
</tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
554 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
555 |
<td class="row2" style="width: 50%;">Yahoo! IM handle:</td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
556 |
<td class="row1" style="width: 50%;"><input type="text" name="imaddr_yahoo" value="<?php echo $session->user_extra['user_yahoo']; ?>" size="30" /></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
557 |
</tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
558 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
559 |
<td class="row2" style="width: 50%;">Jabber/XMPP handle:</td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
560 |
<td class="row1" style="width: 50%;"><input type="text" name="imaddr_xmpp" value="<?php echo $session->user_extra['user_xmpp']; ?>" size="30" /></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
561 |
</tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
562 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
563 |
<th class="subhead" colspan="2"> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
564 |
Extra contact information |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
565 |
</th> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
566 |
</tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
567 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
568 |
<td class="row2" style="width: 50%;">Your homepage:<br /><small>Please remember the http:// prefix.</small></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
569 |
<td class="row1" style="width: 50%;"><input type="text" name="homepage" value="<?php echo $session->user_extra['user_homepage']; ?>" size="30" /></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
570 |
</tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
571 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
572 |
<td class="row2" style="width: 50%;">Your location:</td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
573 |
<td class="row1" style="width: 50%;"><input type="text" name="location" value="<?php echo $session->user_extra['user_location']; ?>" size="30" /></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
574 |
</tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
575 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
576 |
<td class="row2" style="width: 50%;">Your job:</td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
577 |
<td class="row1" style="width: 50%;"><input type="text" name="occupation" value="<?php echo $session->user_extra['user_job']; ?>" size="30" /></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
578 |
</tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
579 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
580 |
<td class="row2" style="width: 50%;">Your hobbies:</td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
581 |
<td class="row1" style="width: 50%;"><input type="text" name="hobbies" value="<?php echo $session->user_extra['user_hobbies']; ?>" size="30" /></td> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
582 |
</tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
583 |
<tr> |
dc8741857bde
Finished Special:Preferences/Profile page! Only the wikitext parser cleanup left, yay!
Dan
parents:
0
diff
changeset
|
584 |
<td class="row2" style="width: 50%;"><label for="chk_email_public">E-mail address is public</label><br /><small>If this is checked, your e-mail address will be displayed on your user page. To protect your address from spambots, your e-mail address will be encrypted.</small></td> |
140
40f7fa5fd061
Revamped the administrator's user CP, big time. The admin module now uses a smart form and enables all profile fields, including users_extra, to be changed. Passwords are encrypted when sent. The whole CP has been split off into a different file to accomodate the large amount of code.
Dan
parents:
133
diff
changeset
|
585 |
<td class="row1" style="width: 50%;"><input type="checkbox" id="chk_email_public" name="email_public" <?php if ($session->user_extra['email_public'] == 1) echo 'checked="checked"'; ?> size="30" /></td> |
0 | 586 |
</tr> |
587 |
<tr> |
|
588 |
<th class="subhead" colspan="2"> |
|
589 |
<input type="submit" name="submit" value="Save profile" /> |
|
590 |
</th> |
|
591 |
</tr> |
|
592 |
</table> |
|
593 |
</div> |
|
594 |
<?php |
|
595 |
echo '</form>'; |
|
596 |
break; |
|
597 |
default: |
|
598 |
$good = false; |
|
599 |
$code = $plugins->setHook('userprefs_body'); |
|
600 |
foreach ( $code as $cmd ) |
|
601 |
{ |
|
254
f49e3c8b638c
Fixed focus of AJAX login form fields in IE; removed stale/unused call to $template->makeParserText() in paginate_array(); added hook page_create_request to possibly help control creation of pages of certain namespaces from plugins; fixed critical bug in user CP that prevented plugins from adding custom CP modules
Dan
parents:
229
diff
changeset
|
602 |
if ( eval($cmd) ) |
0 | 603 |
$good = true; |
604 |
} |
|
605 |
if ( !$good ) |
|
606 |
{ |
|
607 |
echo '<h3>Invalid module</h3> |
|
608 |
<p>Userprefs module "'.$section.'" not found.</p>'; |
|
609 |
} |
|
610 |
break; |
|
611 |
} |
|
612 |
||
613 |
$template->footer(); |
|
614 |
} |
|
615 |
||
616 |
?> |