Enano CMS (1.1.x): comparison plugins/SpecialUserFuncs.php

equal deleted inserted replaced

-:45e887f23282
+:7152ca0a0ce9
 $session->start();
 $template->load_theme($session->theme, $session->style);
 if(isset($_POST['return_to']))
 {
-$name = ( isset($paths->pages[$_POST['return_to']]['name']) ) ? $paths->pages[$_POST['return_to']]['name'] : $_POST['return_to'];
+$name = ( isPage($_POST['return_to']['name']) ) ? $paths->pages[$_POST['return_to']]['name'] : $_POST['return_to'];
 $subst = array(
 'username' => $session->username,
 'redir_target' => $name
 );
 redirect( makeUrl($_POST['return_to'], false, true), $lang->get('user_login_success_title'), $lang->get('user_login_success_body', $subst) );
 function page_Special_Register()
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
-if ( $session->user_logged_in )
+if ( $session->user_level < USER_LEVEL_ADMIN && $session->user_logged_in )
 {
 $paths->main_page();
 }
 // form field trackers
 $time_rem = intval(getConfig('lockout_duration')) - round((time() - $row['timestamp']) / 60);
 die_friendly($lang->get('user_reg_err_disabled_title'), '<p>' . $lang->get('user_reg_err_locked_out', array('time' => $time_rem)) . '</p>');
 }
 $db->free_result();
 }
-if ( $session->user_level < USER_LEVEL_ADMIN && $session->user_logged_in )
-{
-$paths->main_page();
-}
 if(isset($_POST['submit']))
 {
 $_GET['coppa'] = ( isset($_POST['coppa']) ) ? $_POST['coppa'] : 'x';
 $captcharesult = $session->get_captcha($_POST['captchahash']);
 $session->kill_captcha();
-if ( strtolower($captcharesult) != strtolower($_POST['captchacode']) )
+// bypass captcha if logged in (at this point, if logged in, we're admin)
+if ( !$session->user_logged_in && strtolower($captcharesult) != strtolower($_POST['captchacode']) )
 {
 $s = $lang->get('user_reg_err_captcha');
 }
 else
 {
 if ( getConfig('enable_coppa') == '1' && ( !isset($_POST['coppa']) || ( isset($_POST['coppa']) && !in_array($_POST['coppa'], array('yes', 'no')) ) ) )
 {
 $s = 'Invalid COPPA input';
 }
-else if ( !empty($terms) && !isset($_POST['tou_agreed']) )
+else if ( !$session->user_logged_in && !empty($terms) && !isset($_POST['tou_agreed']) )
 {
 $s = $lang->get('user_reg_err_accept_tou');
 }
 else
 {
 ?>
 <h3><?php echo $lang->get('user_reg_msg_table_title'); ?></h3>
 <form name="regform" action="<?php echo makeUrl($paths->page); ?>" method="post" onsubmit="return runEncryption();">
 <div class="tblholder">
 <table border="0" width="100%" cellspacing="1" cellpadding="4">
-<tr><th class="subhead" colspan="3"><?php echo $lang->get('user_reg_msg_table_subtitle'); ?></th></tr>
+<tr><th colspan="3"><?php echo $lang->get('user_reg_msg_table_subtitle'); ?></th></tr>
 <?php if(isset($_POST['submit'])) echo '<tr><td colspan="3" class="row2" style="color: red;">'.$s.'</td></tr>'; ?>
 <!-- FIELD: Username -->
 <tr>
 eval($cmd);
 }
 ?>
 <!-- FIELD: CAPTCHA image -->
+<?php
+if ( !$session->user_logged_in ):
+?>
 <tr>
 <td class="row1" style="width: 50%;" rowspan="2">
 <?php echo $lang->get('user_reg_lbl_field_captcha'); ?><br />
 <small>
 <?php echo $lang->get('user_reg_msg_captcha_pleaseenter', array('regen_flags' => 'href="#" onclick="regenCaptcha(); return false;"')); ?><br />
 <br />
 <?php echo $lang->get('user_reg_msg_captcha_blind'); ?>
 </small>
 </td>
-<td colspan="2" class="row1">
+<td class="row1">
-<img id="captchaimg" alt="CAPTCHA image" src="<?php echo makeUrlNS('Special', 'Captcha/'.$captchacode); ?>" />
+<img id="captchaimg" alt="CAPTCHA image" src="<?php echo makeUrlNS('Special', 'Captcha/'.$captchacode); ?>" /><br />
 <span id="b_username"></span>
+</td>
+<td class="row1">
 </td>
 </tr>
 <!-- FIELD: CAPTCHA input field -->
 <tr>
 </p>
 </td>
 </tr>
 <?php
-endif;
+endif; // !empty($terms)
+endif; // $session->user_logged_in
 ?>
 <!-- FIELD: submit button -->
 <tr>
 <th class="subhead" colspan="3" style="text-align: center;">
 failed = true;
 document.getElementById('s_username').src='<?php echo scriptPath; ?>/images/checkbad.png';
 document.getElementById('e_username').innerHTML = '<br /><small>' + $lang.get('user_reg_err_username_invalid') + '</small>';
 }
 }
-document.getElementById('b_username').innerHTML = '';
+if ( document.getElementById('b_username') )
-if(hex_md5(frm.real_name.value) == '5a397df72678128cf0e8147a2befd5f1')
 {
-document.getElementById('b_username').innerHTML = '<br /><br />Hey...I know you!<br /><img alt="" src="http://upload.wikimedia.org/wikipedia/commons/thumb/7/7f/Bill_Gates_2004_cr.jpg/220px-Bill_Gates_2004_cr.jpg" />';
+document.getElementById('b_username').innerHTML = '';
+if(hex_md5(frm.real_name.value) == '5a397df72678128cf0e8147a2befd5f1')
+{
+document.getElementById('b_username').innerHTML = '<br /><br />Hey...I know you!<br /><img alt="" src="http://upload.wikimedia.org/wikipedia/commons/thumb/7/7f/Bill_Gates_2004_cr.jpg/220px-Bill_Gates_2004_cr.jpg" />';
+}
 }
 // Password
 if ( field.name == 'password' || field.name == 'password_confirm' || field.name == '_nil' )
 {

changeset 832	7152ca0a0ce9
parent 801	eb8b23f11744
child 843	4415e50e4e84