Revision 1805
Added by Dietmar about 12 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
|
| 15 | 15 |
|
| 16 |
04 Nov-2012 Build 1805 Dietmar Woellbrink (Luisehahne) |
|
| 17 |
# fixed Undefined variable: nNumRows in \admin\users\index.php |
|
| 18 |
# fixed Undefined variable: admin in \admin\admintools\tool.php |
|
| 19 |
! show more information in awaiting activation /admin/users |
|
| 20 |
! set input passord to autocomplete off /admin/users and /admin/prfeferences |
|
| 21 |
! add Timezone abbreviation to time format |
|
| 22 |
! change time and date formats fill with leading zeros |
|
| 23 |
! optimize REQUEST_METHOD to get page_id and section_id |
|
| 24 |
! more request vars are possible by this method |
|
| 16 | 25 |
02 Nov-2012 Build 1804 Dietmar Woellbrink (Luisehahne) |
| 17 | 26 |
# fixed Illegal string offset 'time' in \framework\SecureForm.mtab.php |
| 18 | 27 |
! add delete Outdated Confirmations in backend |
| branches/2.8.x/wb/admin/skel/themes/htt/users_form.htt | ||
|---|---|---|
| 35 | 35 |
<tr> |
| 36 | 36 |
<td class="right">{TEXT_PASSWORD}:</td>
|
| 37 | 37 |
<td class="value_input"> |
| 38 |
<input type="password" name="password" maxlength="30" /> |
|
| 38 |
<input type="password" name="password" value="" maxlength="30" />
|
|
| 39 | 39 |
</td> |
| 40 | 40 |
</tr> |
| 41 | 41 |
<tr> |
| 42 | 42 |
<td class="right">{TEXT_RETYPE_PASSWORD}:</td>
|
| 43 | 43 |
<td class="value_input"> |
| 44 |
<input type="password" name="password2" maxlength="30" /> |
|
| 44 |
<input type="password" name="password2" value="" maxlength="30" />
|
|
| 45 | 45 |
</td> |
| 46 | 46 |
</tr> |
| 47 | 47 |
<tr style="{DISPLAY_EXTRA}">
|
| ... | ... | |
| 102 | 102 |
|
| 103 | 103 |
</form> |
| 104 | 104 |
</div> |
| 105 |
<script type="text/javascript"> |
|
| 106 |
<!-- |
|
| 107 |
$(document).ready(function(){
|
|
| 108 |
var passwordField = $('input[name=password]');
|
|
| 109 |
passwordField.attr('autocomplete','off');
|
|
| 110 |
passwordField.val('');
|
|
| 111 |
var DisplayNameField = $('input[name=display_name]');
|
|
| 112 |
DisplayNameField.focus(); |
|
| 113 |
}); |
|
| 114 |
--> |
|
| 115 |
</script> |
|
| 105 | 116 |
<!-- END main_block --> |
| branches/2.8.x/wb/admin/skel/themes/htt/preferences.htt | ||
|---|---|---|
| 71 | 71 |
</div> |
| 72 | 72 |
</fieldset> |
| 73 | 73 |
</form> |
| 74 |
<script type="text/javascript"> |
|
| 75 |
<!-- |
|
| 76 |
$(document).ready(function(){
|
|
| 77 |
var passwordField = $('input[name=password]');
|
|
| 78 |
passwordField.attr('autocomplete','off');
|
|
| 79 |
passwordField.val('');
|
|
| 80 |
var DisplayNameField = $('input[name=display_name]');
|
|
| 81 |
DisplayNameField.focus(); |
|
| 82 |
}); |
|
| 83 |
--> |
|
| 84 |
</script> |
|
| 85 |
|
|
| 74 | 86 |
<!-- END main_block --> |
| branches/2.8.x/wb/admin/interface/time_formats.php | ||
|---|---|---|
| 1 |
<?php |
|
| 2 |
/** |
|
| 3 |
* |
|
| 4 |
* @category admin |
|
| 5 |
* @package interface |
|
| 6 |
* @author WebsiteBaker Project |
|
| 7 |
* @copyright 2004-2009, Ryan Djurovich |
|
| 8 |
* @copyright 2009-2011, Website Baker Org. e.V. |
|
| 9 |
* @link http://www.websitebaker2.org/ |
|
| 10 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 11 |
* @platform WebsiteBaker 2.8.x |
|
| 12 |
* @requirements PHP 5.2.2 and higher |
|
| 13 |
* @version $Id$ |
|
| 14 |
* @filesource $HeadURL$ |
|
| 15 |
* @lastmodified $Date$ |
|
| 16 |
* |
|
| 17 |
* Time format list file |
|
| 18 |
* This file is used to generate a list of time formats for the user to select |
|
| 19 |
* |
|
| 20 |
*/ |
|
| 21 |
|
|
| 22 |
if(!defined('WB_URL')) {
|
|
| 23 |
header('Location: ../../../index.php');
|
|
| 24 |
exit(0); |
|
| 25 |
} |
|
| 26 |
|
|
| 27 |
// Define that this file is loaded |
|
| 28 |
if(!defined('TIME_FORMATS_LOADED')) {
|
|
| 29 |
define('TIME_FORMATS_LOADED', true);
|
|
| 30 |
} |
|
| 31 |
|
|
| 32 |
// Create array |
|
| 33 |
$TIME_FORMATS = array(); |
|
| 34 |
|
|
| 35 |
// Get the current time (in the users timezone if required) |
|
| 36 |
$actual_time = time()+ ((isset($user_time) AND $user_time == true) ? TIMEZONE : DEFAULT_TIMEZONE); |
|
| 37 |
|
|
| 38 |
// Add values to list |
|
| 39 |
$TIME_FORMATS['g:i|A'] = gmdate('g:i A', $actual_time);
|
|
| 40 |
$TIME_FORMATS['g:i|a'] = gmdate('g:i a', $actual_time);
|
|
| 41 |
$TIME_FORMATS['H:i:s'] = gmdate('H:i:s', $actual_time);
|
|
| 42 |
$TIME_FORMATS['H:i'] = gmdate('H:i', $actual_time);
|
|
| 43 |
|
|
| 44 |
// Add "System Default" to list (if we need to) |
|
| 45 |
if(isset($user_time) AND $user_time == true) {
|
|
| 46 |
if(isset($TEXT['SYSTEM_DEFAULT'])) {
|
|
| 47 |
$TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $actual_time).' ('.$TEXT['SYSTEM_DEFAULT'].')';
|
|
| 48 |
} else {
|
|
| 49 |
$TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $actual_time).' (System Default)'; |
|
| 50 |
} |
|
| 51 |
} |
|
| 52 |
|
|
| 53 |
// Reverse array so "System Default" is at the top |
|
| 54 |
$TIME_FORMATS = array_reverse($TIME_FORMATS, true); |
|
| 55 |
|
|
| 56 |
?> |
|
| 1 |
<?php |
|
| 2 |
/** |
|
| 3 |
* |
|
| 4 |
* @category admin |
|
| 5 |
* @package interface |
|
| 6 |
* @author Ryan Djurovich (2004-2009),WebsiteBaker Project |
|
| 7 |
* @copyright 2009-2012, WebsiteBaker Org. e.V. |
|
| 8 |
* @link http://www.websitebaker2.org/ |
|
| 9 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 10 |
* @platform WebsiteBaker 2.8.x |
|
| 11 |
* @requirements PHP 5.2.2 and higher |
|
| 12 |
* @version $Id$ |
|
| 13 |
* @filesource $HeadURL$ |
|
| 14 |
* @lastmodified $Date$ |
|
| 15 |
* |
|
| 16 |
* Time format list file |
|
| 17 |
* This file is used to generate a list of time formats for the user to select |
|
| 18 |
* |
|
| 19 |
*/ |
|
| 20 |
|
|
| 21 |
/* -------------------------------------------------------- */ |
|
| 22 |
// Must include code to stop this file being accessed directly |
|
| 23 |
if(!defined('WB_PATH')) {
|
|
| 24 |
require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); |
|
| 25 |
throw new IllegalFileException(); |
|
| 26 |
} |
|
| 27 |
/* -------------------------------------------------------- */ |
|
| 28 |
|
|
| 29 |
// Define that this file is loaded |
|
| 30 |
if(!defined('TIME_FORMATS_LOADED')) {
|
|
| 31 |
define('TIME_FORMATS_LOADED', true);
|
|
| 32 |
} |
|
| 33 |
|
|
| 34 |
// Create array |
|
| 35 |
$TIME_FORMATS = array(); |
|
| 36 |
|
|
| 37 |
// Get the current time (in the users timezone if required) |
|
| 38 |
$actual_time = time()+ ((isset($user_time) AND $user_time == true) ? TIMEZONE : DEFAULT_TIMEZONE); |
|
| 39 |
|
|
| 40 |
// Add values to list |
|
| 41 |
$TIME_FORMATS['h:i|A|T'] = gmdate('h:i A T', $actual_time);
|
|
| 42 |
$TIME_FORMATS['h:i|a|T'] = gmdate('h:i a T', $actual_time);
|
|
| 43 |
$TIME_FORMATS['H:i:s|T'] = gmdate('H:i:s T', $actual_time);
|
|
| 44 |
$TIME_FORMATS['H:i|T'] = gmdate('H:i T', $actual_time);
|
|
| 45 |
|
|
| 46 |
// Add "System Default" to list (if we need to) |
|
| 47 |
if(isset($user_time) AND $user_time == true) {
|
|
| 48 |
if(isset($TEXT['SYSTEM_DEFAULT'])) {
|
|
| 49 |
$TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $actual_time).' ('.$TEXT['SYSTEM_DEFAULT'].')';
|
|
| 50 |
} else {
|
|
| 51 |
$TIME_FORMATS['system_default'] = gmdate(DEFAULT_TIME_FORMAT, $actual_time).' (System Default)'; |
|
| 52 |
} |
|
| 53 |
} |
|
| 54 |
|
|
| 55 |
// Reverse array so "System Default" is at the top |
|
| 56 |
$TIME_FORMATS = array_reverse($TIME_FORMATS, true); |
|
| 57 |
|
|
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.3');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1804');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1805');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/admin/interface/date_formats.php | ||
|---|---|---|
| 1 |
<?php |
|
| 2 |
/** |
|
| 3 |
* |
|
| 4 |
* @category admin |
|
| 5 |
* @package interface |
|
| 6 |
* @author WebsiteBaker Project |
|
| 7 |
* @copyright 2004-2009, Ryan Djurovich |
|
| 8 |
* @copyright 2009-2011, Website Baker Org. e.V. |
|
| 9 |
* @link http://www.websitebaker2.org/ |
|
| 10 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 11 |
* @platform WebsiteBaker 2.8.x |
|
| 12 |
* @requirements PHP 5.2.2 and higher |
|
| 13 |
* @version $Id$ |
|
| 14 |
* @filesource $HeadURL$ |
|
| 15 |
* @lastmodified $Date$ |
|
| 16 |
* |
|
| 17 |
* Date format list file |
|
| 18 |
* This file is used to generate a list of date formats for the user to select |
|
| 19 |
* |
|
| 20 |
*/ |
|
| 21 |
|
|
| 22 |
if(!defined('WB_URL')) {
|
|
| 23 |
header('Location: ../../../index.php');
|
|
| 24 |
exit(0); |
|
| 25 |
} |
|
| 26 |
|
|
| 27 |
// Define that this file is loaded |
|
| 28 |
if(!defined('DATE_FORMATS_LOADED')) {
|
|
| 29 |
define('DATE_FORMATS_LOADED', true);
|
|
| 30 |
} |
|
| 31 |
|
|
| 32 |
// Create array |
|
| 33 |
$DATE_FORMATS = array(); |
|
| 34 |
|
|
| 35 |
// Get the current time (in the users timezone if required) |
|
| 36 |
$actual_time = time()+ ((isset($user_time) && $user_time == true) ? TIMEZONE : DEFAULT_TIMEZONE); |
|
| 37 |
|
|
| 38 |
// Add values to list |
|
| 39 |
$DATE_FORMATS['l,|jS|F,|Y'] = gmdate('l, jS F, Y', $actual_time);
|
|
| 40 |
$DATE_FORMATS['jS|F,|Y'] = gmdate('jS F, Y', $actual_time);
|
|
| 41 |
$DATE_FORMATS['d|M|Y'] = gmdate('d M Y', $actual_time);
|
|
| 42 |
$DATE_FORMATS['M|d|Y'] = gmdate('M d Y', $actual_time);
|
|
| 43 |
$DATE_FORMATS['D|M|d,|Y'] = gmdate('D M d, Y', $actual_time);
|
|
| 44 |
$DATE_FORMATS['d-m-Y'] = gmdate('d-m-Y', $actual_time).' (D-M-Y)';
|
|
| 45 |
$DATE_FORMATS['m-d-Y'] = gmdate('m-d-Y', $actual_time).' (M-D-Y)';
|
|
| 46 |
$DATE_FORMATS['d.m.Y'] = gmdate('d.m.Y', $actual_time).' (D.M.Y)';
|
|
| 47 |
$DATE_FORMATS['m.d.Y'] = gmdate('m.d.Y', $actual_time).' (M.D.Y)';
|
|
| 48 |
$DATE_FORMATS['d/m/Y'] = gmdate('d/m/Y', $actual_time).' (D/M/Y)';
|
|
| 49 |
$DATE_FORMATS['m/d/Y'] = gmdate('m/d/Y', $actual_time).' (M/D/Y)';
|
|
| 50 |
$DATE_FORMATS['j.n.Y'] = gmdate('j.n.Y', $actual_time).' (j.n.Y)';
|
|
| 51 |
|
|
| 52 |
// Add "System Default" to list (if we need to) |
|
| 53 |
if(isset($user_time) && $user_time == true) |
|
| 54 |
{
|
|
| 55 |
if(isset($TEXT['SYSTEM_DEFAULT'])) |
|
| 56 |
{
|
|
| 57 |
$DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $actual_time).' ('.$TEXT['SYSTEM_DEFAULT'].')';
|
|
| 58 |
} else {
|
|
| 59 |
$DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $actual_time).' (System Default)'; |
|
| 60 |
} |
|
| 61 |
} |
|
| 62 |
|
|
| 63 |
// Reverse array so "System Default" is at the top |
|
| 64 |
$DATE_FORMATS = array_reverse($DATE_FORMATS, true); |
|
| 65 |
|
|
| 66 |
?> |
|
| 1 |
<?php |
|
| 2 |
/** |
|
| 3 |
* |
|
| 4 |
* @category admin |
|
| 5 |
* @package interface |
|
| 6 |
* @author Ryan Djurovich (2004-2009),WebsiteBaker Project |
|
| 7 |
* @copyright 2009-2012, WebsiteBaker Org. e.V. |
|
| 8 |
* @link http://www.websitebaker2.org/ |
|
| 9 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 10 |
* @platform WebsiteBaker 2.8.x |
|
| 11 |
* @requirements PHP 5.2.2 and higher |
|
| 12 |
* @version $Id$ |
|
| 13 |
* @filesource $HeadURL$ |
|
| 14 |
* @lastmodified $Date$ |
|
| 15 |
* |
|
| 16 |
* Date format list file |
|
| 17 |
* This file is used to generate a list of date formats for the user to select |
|
| 18 |
* |
|
| 19 |
*/ |
|
| 20 |
|
|
| 21 |
/* -------------------------------------------------------- */ |
|
| 22 |
// Must include code to stop this file being accessed directly |
|
| 23 |
if(!defined('WB_PATH')) {
|
|
| 24 |
require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); |
|
| 25 |
throw new IllegalFileException(); |
|
| 26 |
} |
|
| 27 |
/* -------------------------------------------------------- */ |
|
| 28 |
|
|
| 29 |
// Define that this file is loaded |
|
| 30 |
if(!defined('DATE_FORMATS_LOADED')) {
|
|
| 31 |
define('DATE_FORMATS_LOADED', true);
|
|
| 32 |
} |
|
| 33 |
|
|
| 34 |
// Create array |
|
| 35 |
$DATE_FORMATS = array(); |
|
| 36 |
|
|
| 37 |
// Get the current time (in the users timezone if required) |
|
| 38 |
$actual_time = time()+ ((isset($user_time) && $user_time == true) ? TIMEZONE : DEFAULT_TIMEZONE); |
|
| 39 |
|
|
| 40 |
// Add values to list |
|
| 41 |
$DATE_FORMATS['l,|jS|F,|Y'] = gmdate('l, jS F, Y', $actual_time);
|
|
| 42 |
$DATE_FORMATS['jS|F,|Y'] = gmdate('jS F, Y', $actual_time);
|
|
| 43 |
$DATE_FORMATS['d|M|Y'] = gmdate('d M Y', $actual_time);
|
|
| 44 |
$DATE_FORMATS['M|d|Y'] = gmdate('M d Y', $actual_time);
|
|
| 45 |
$DATE_FORMATS['D|M|d,|Y'] = gmdate('D M d, Y', $actual_time);
|
|
| 46 |
$DATE_FORMATS['d-m-Y'] = gmdate('d-m-Y', $actual_time).' (D-M-Y)';
|
|
| 47 |
$DATE_FORMATS['m-d-Y'] = gmdate('m-d-Y', $actual_time).' (M-D-Y)';
|
|
| 48 |
$DATE_FORMATS['d.m.Y'] = gmdate('d.m.Y', $actual_time).' (D.M.Y)';
|
|
| 49 |
$DATE_FORMATS['m.d.Y'] = gmdate('m.d.Y', $actual_time).' (M.D.Y)';
|
|
| 50 |
$DATE_FORMATS['d/m/Y'] = gmdate('d/m/Y', $actual_time).' (D/M/Y)';
|
|
| 51 |
$DATE_FORMATS['m/d/Y'] = gmdate('m/d/Y', $actual_time).' (M/D/Y)';
|
|
| 52 |
$DATE_FORMATS['j.n.Y'] = gmdate('j.n.Y', $actual_time).' (j.n.Y)';
|
|
| 53 |
|
|
| 54 |
// Add "System Default" to list (if we need to) |
|
| 55 |
if(isset($user_time) && $user_time == true) |
|
| 56 |
{
|
|
| 57 |
if(isset($TEXT['SYSTEM_DEFAULT'])) |
|
| 58 |
{
|
|
| 59 |
$DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $actual_time).' ('.$TEXT['SYSTEM_DEFAULT'].')';
|
|
| 60 |
} else {
|
|
| 61 |
$DATE_FORMATS['system_default'] = gmdate(DEFAULT_DATE_FORMAT, $actual_time).' (System Default)'; |
|
| 62 |
} |
|
| 63 |
} |
|
| 64 |
|
|
| 65 |
// Reverse array so "System Default" is at the top |
|
| 66 |
$DATE_FORMATS = array_reverse($DATE_FORMATS, true); |
|
| branches/2.8.x/wb/admin/users/users.php | ||
|---|---|---|
| 25 | 25 |
|
| 26 | 26 |
if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
|
| 27 | 27 |
|
| 28 |
$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']); |
|
| 29 |
$aActionRequest = (isset(${$requestMethod})) ? ${$requestMethod} : null;
|
|
| 30 |
|
|
| 28 | 31 |
$action = 'cancel'; |
| 32 |
|
|
| 29 | 33 |
// Set parameter 'action' as alternative to javascript mechanism |
| 30 |
$action = (isset($_POST['modify']) ? 'modify' : $action );
|
|
| 31 |
$action = (isset($_POST['delete']) ? 'delete' : $action );
|
|
| 32 |
$action = (isset($_POST['delete_outdated']) ? 'delete_outdated' : $action );
|
|
| 34 |
$action = (isset($aActionRequest['modify']) ? 'modify' : $action );
|
|
| 35 |
$action = (isset($aActionRequest['delete']) ? 'delete' : $action );
|
|
| 36 |
$action = (isset($aActionRequest['delete_outdated']) ? 'delete_outdated' : $action );
|
|
| 33 | 37 |
|
| 34 | 38 |
switch ($action): |
| 35 | 39 |
case 'modify' : |
| ... | ... | |
| 189 | 193 |
$template->parse('show_add_loginname', '', true);
|
| 190 | 194 |
$template->parse('main', 'main_block', false);
|
| 191 | 195 |
$template->pparse('output', 'page');
|
| 192 |
// Print admin footer |
|
| 193 |
$admin->print_footer(); |
|
| 194 | 196 |
break; |
| 195 | 197 |
case 'delete' : |
| 196 | 198 |
// Print header |
| ... | ... | |
| 221 | 223 |
} else {
|
| 222 | 224 |
$admin->print_success($MESSAGE['USERS_DELETED']); |
| 223 | 225 |
} |
| 224 |
// Print admin footer |
|
| 225 |
$admin->print_footer(); |
|
| 226 | 226 |
break; |
| 227 | 227 |
case 'delete_outdated' : |
| 228 | 228 |
$admin = new admin('Access', 'users_delete');
|
| 229 |
|
|
| 230 | 229 |
$user_id = intval($admin->checkIDKEY('user_id_activation_id', 0, $_SERVER['REQUEST_METHOD']));
|
| 231 | 230 |
// Check if user id is a valid number and doesnt equal 1 |
| 232 | 231 |
if($user_id == 0){
|
| ... | ... | |
| 243 | 242 |
} else {
|
| 244 | 243 |
$admin->print_success($MESSAGE['USERS_DELETED']); |
| 245 | 244 |
} |
| 246 |
// Print admin footer |
|
| 247 |
$admin->print_footer(); |
|
| 248 |
|
|
| 249 |
|
|
| 250 | 245 |
break; |
| 251 | 246 |
default: |
| 252 | 247 |
break; |
| 253 | 248 |
endswitch; |
| 249 |
|
|
| 250 |
|
|
| 251 |
|
|
| 252 |
// Print admin footer |
|
| 253 |
$admin->print_footer(); |
|
| 254 |
|
|
| branches/2.8.x/wb/admin/users/index.php | ||
|---|---|---|
| 77 | 77 |
$template->set_var('STATUS', 'class="user-active"' );
|
| 78 | 78 |
$template->parse('list', 'list_block', true);
|
| 79 | 79 |
// Loop through users |
| 80 |
while($user = $results->fetchRow()) {
|
|
| 80 |
while($user = $results->fetchRow(MYSQL_ASSOC)) {
|
|
| 81 | 81 |
$template->set_var('VALUE',$admin->getIDKEY($user['user_id']));
|
| 82 | 82 |
$template->set_var('STATUS', ($user['active']==false ? 'class="user-inactive"' : 'class="user-active"') );
|
| 83 | 83 |
$template->set_var('NAME', $user['display_name'].' ('.$user['username'].')');
|
| ... | ... | |
| 141 | 141 |
while($aUser = $oRes->fetchRow(MYSQL_ASSOC)) {
|
| 142 | 142 |
$template->set_var('VALUE',$admin->getIDKEY($aUser['user_id']));
|
| 143 | 143 |
$template->set_var('STATUS', '') ;
|
| 144 |
$template->set_var('NAME', $aUser['display_name'].' ('.$aUser['username'].')');
|
|
| 144 |
$template->set_var('NAME', $aUser['display_name'].' ('.$aUser['username'].')'.' ['.$aUser['email'].']');
|
|
| 145 | 145 |
$template->parse('list_confirmed_activation', 'list_confirmed_activation_block', true);
|
| 146 | 146 |
} |
| 147 | 147 |
$template->parse('show_confirmed_activation', 'show_confirmed_activation_block',true);
|
| 148 | 148 |
} |
| 149 | 149 |
} else { $nNumRows = 0; }
|
| 150 | 150 |
|
| 151 |
} else {
|
|
| 152 |
$nNumRows = 0; |
|
| 151 | 153 |
} |
| 152 | 154 |
|
| 153 | 155 |
if ( $nNumRows == 0){
|
| branches/2.8.x/wb/admin/login/index.php | ||
|---|---|---|
| 16 | 16 |
*/ |
| 17 | 17 |
|
| 18 | 18 |
// Include the configuration file |
| 19 |
if(!defined('WB_URL') && file_exists(realpath('../../config.php'))) {
|
|
| 20 |
require('../../config.php');
|
|
| 19 |
$config_file = realpath('../../config.php');
|
|
| 20 |
if(file_exists($config_file) && !defined('WB_URL'))
|
|
| 21 |
{
|
|
| 22 |
require_once($config_file); |
|
| 21 | 23 |
} |
| 22 | 24 |
|
| 23 |
//require_once(WB_PATH."/framework/class.login.php"); |
|
| 24 | 25 |
if(!class_exists('login', false)){ require_once(WB_PATH.'/framework/class.login.php'); }
|
| 25 | 26 |
if(!class_exists('frontend', false)){ require_once(WB_PATH.'/framework/class.frontend.php'); }
|
| 26 | 27 |
|
| ... | ... | |
| 72 | 73 |
'GROUPS_TABLE' => TABLE_PREFIX."groups", |
| 73 | 74 |
) |
| 74 | 75 |
); |
| 75 |
//$admin->print_footer(); |
|
| branches/2.8.x/wb/admin/admintools/tool.php | ||
|---|---|---|
| 14 | 14 |
* @lastmodified $Date$ |
| 15 | 15 |
* |
| 16 | 16 |
*/ |
| 17 |
require('../../config.php');
|
|
| 18 |
require_once(WB_PATH.'/framework/class.admin.php'); |
|
| 17 |
|
|
| 18 |
$config_file = realpath('../../config.php');
|
|
| 19 |
if(file_exists($config_file) && !defined('WB_URL'))
|
|
| 20 |
{
|
|
| 21 |
require_once($config_file); |
|
| 22 |
} |
|
| 23 |
|
|
| 24 |
if(!class_exists('admin', false)){
|
|
| 25 |
include(WB_PATH.'/framework/class.admin.php'); |
|
| 26 |
$admin = new admin('Admintools','admintools');
|
|
| 27 |
} |
|
| 28 |
|
|
| 19 | 29 |
require_once(WB_PATH.'/framework/functions.php'); |
| 20 | 30 |
|
| 21 |
$toolDir = (isset($_GET['tool']) && (trim($_GET['tool']) != '') ? trim($_GET['tool']) : ''); |
|
| 22 |
$doSave = (isset($_POST['save_settings']) || (isset($_POST['action']) && strtolower($_POST['action']) == 'save')); |
|
| 31 |
$toolDir = (isset($_GET['tool']) && (trim($_GET['tool']) != '') ? trim($_GET['tool']) : ''); |
|
| 32 |
$doSave = (isset($_POST['save_settings']) || (isset($_POST['action']) && strtolower($_POST['action']) == 'save')); |
|
| 33 |
|
|
| 23 | 34 |
// test for valid tool name |
| 24 | 35 |
if(preg_match('/^[a-z][a-z_\-0-9]{2,}$/i', $toolDir)) {
|
| 25 | 36 |
// Check if tool is installed |
| branches/2.8.x/wb/framework/class.admin.php | ||
|---|---|---|
| 21 | 21 |
throw new IllegalFileException(); |
| 22 | 22 |
} |
| 23 | 23 |
/* -------------------------------------------------------- */ |
| 24 |
require_once(WB_PATH.'/framework/class.wb.php'); |
|
| 25 | 24 |
|
| 25 |
// Load the other required class files if they are not already loaded |
|
| 26 |
if(!class_exists('wb', false)){ include(WB_PATH.'/framework/class.wb.php'); }
|
|
| 27 |
|
|
| 26 | 28 |
// Get WB version |
| 27 | 29 |
require_once(ADMIN_PATH.'/interface/version.php'); |
| 28 | 30 |
|
| branches/2.8.x/wb/modules/admin.php | ||
|---|---|---|
| 15 | 15 |
* |
| 16 | 16 |
*/ |
| 17 | 17 |
|
| 18 |
// Stop this file being access directly |
|
| 19 |
if(defined('WB_PATH') == false)
|
|
| 20 |
{
|
|
| 21 |
die('<h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2>');
|
|
| 18 |
/* -------------------------------------------------------- */ |
|
| 19 |
// Must include code to stop this file being accessed directly |
|
| 20 |
if(!defined('WB_PATH')) {
|
|
| 21 |
require_once((dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); |
|
| 22 |
throw new IllegalFileException(); |
|
| 22 | 23 |
} |
| 24 |
/* -------------------------------------------------------- */ |
|
| 25 |
// Create new admin object, you can set the next variable in your module |
|
| 26 |
// to print with or without header, default is with header |
|
| 27 |
// it is recommed to set the variable before including the /modules/admin.php |
|
| 28 |
$admin_header = (!isset($admin_header)) ? true : $admin_header; |
|
| 29 |
if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
|
|
| 30 |
$admin = new admin('Pages', 'pages_modify',(bool)$admin_header);
|
|
| 23 | 31 |
|
| 24 |
// Get page id |
|
| 25 |
$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']); |
|
| 26 |
$page_id = intval(isset(${$requestMethod}['page_id'])) ? ${$requestMethod}['page_id'] : (isset($page_id) ? intval($page_id) : 0);
|
|
| 27 |
if( ($page_id == 0)) {
|
|
| 28 |
header("Location: index.php");
|
|
| 32 |
$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']); |
|
| 33 |
$aActionRequest = (isset(${$requestMethod})) ? ${$requestMethod} : null;
|
|
| 34 |
|
|
| 35 |
$page_id = isset($aActionRequest['page_id']) ? intval($aActionRequest['page_id']) : (isset($page_id) ? intval($page_id) : 0); |
|
| 36 |
$section_id = isset($aActionRequest['section_id']) ? intval($aActionRequest['section_id']) : (isset($section_id) ? intval($section_id) : 0); |
|
| 37 |
|
|
| 38 |
if( ($page_id == 0) ||( $section_id == 0) ) {
|
|
| 39 |
$admin->send_header("Location: index.php");
|
|
| 29 | 40 |
exit(0); |
| 30 | 41 |
} |
| 31 | 42 |
|
| 32 |
// Get section id if there is one |
|
| 33 |
$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']); |
|
| 34 |
$section_id = intval(isset(${$requestMethod}['section_id'])) ? ${$requestMethod}['section_id'] : (isset($section_id) ? intval($section_id) : 0);
|
|
| 35 |
if( ($section_id == 0) && isset($section_required)) {
|
|
| 36 |
header("Location: $section_required");
|
|
| 37 |
exit(0); |
|
| 38 |
} |
|
| 39 |
/* |
|
| 40 |
// be sure is is numeric |
|
| 41 |
$page_id = intval($page_id); |
|
| 42 |
$section_id = intval($section_id); |
|
| 43 |
*/ |
|
| 44 | 43 |
// Create js back link |
| 45 | 44 |
// $js_back = 'javascript: history.go(-1);'; |
| 46 | 45 |
$js_back = ADMIN_URL.'/pages/sections.php?page_id='.$page_id; |
| 47 |
// Create new admin object, you can set the next variable in your module |
|
| 48 |
// to print with or without header, default is with header |
|
| 49 |
// it is recommed to set the variable before including the /modules/admin.php |
|
| 50 |
$admin_header = (!isset($admin_header)) ? true : $admin_header; |
|
| 51 |
require_once(WB_PATH.'/framework/class.admin.php'); |
|
| 52 |
$admin = new admin('Pages', 'pages_modify',(bool)$admin_header);
|
|
| 46 |
|
|
| 53 | 47 |
// Get perms |
| 54 | 48 |
// unset($admin_header); |
| 55 | 49 |
|
Also available in: Unified diff
! show more information in awaiting activation /admin/users
! set input passord to autocomplete off /admin/users and /admin/prfeferences
! add Timezone abbreviation to time format
! change time and date formats fill with leading zeros
! optimize REQUEST_METHOD to get page_id and section_id
! more request vars are possible by this method