Revision 1465
Added by Dietmar over 13 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 | 13 |
------------------------------------- 2.8.2 ------------------------------------ |
| 14 |
01 Jun-2011 Build 1464 Werner v.d.Decken(DarkViper) |
|
| 14 |
01 Jul-2011 Build 1465 Dietmar Woellbrink (Luisehahne) |
|
| 15 |
# bugfix in initialize including SecureForm |
|
| 16 |
! update admintools FTAN handling |
|
| 17 |
01 Jul-2011 Build 1464 Werner v.d.Decken(DarkViper) |
|
| 15 | 18 |
# fixed little bug in moveCssToHead() |
| 16 | 19 |
01 Jul-2011 Build 1463 Dietmar Woellbrink (Luisehahne) |
| 17 | 20 |
# fixed Ticket 1050 Bug in include/phpmailer/class.phpmailer.php with Lotus Notes |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 52 | 52 |
|
| 53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.2.RC6');
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1464');
|
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1465');
|
|
| 56 | 56 |
|
| 57 | 57 |
?> |
| branches/2.8.x/wb/admin/admintools/modules.inc | ||
|---|---|---|
| 1 |
# each line a single entry only! |
|
| 2 |
# list of all admintools which use FTAN |
|
| 3 |
code |
|
| 4 |
droplets |
|
| 5 |
output_filter |
|
| 6 |
jsadmin |
|
| 7 |
captcha_control |
|
| 8 |
pagecloner |
|
| 9 | 0 | |
| branches/2.8.x/wb/admin/admintools/tool.php | ||
|---|---|---|
| 29 | 29 |
$tool = $array[0]; |
| 30 | 30 |
} |
| 31 | 31 |
|
| 32 |
$ModulesList = array();
|
|
| 32 |
$ModulesUsingFTAN = '';
|
|
| 33 | 33 |
$admin_header = true; |
| 34 | 34 |
if(isset($_POST['save_settings'])) {
|
| 35 |
$ModulesUsingFTAN = ADMIN_PATH.'/admintools/modules.inc'; |
|
| 36 |
if(file_exists($ModulesUsingFTAN)){
|
|
| 37 |
if(($ModulesList = file($ModulesUsingFTAN, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) !== false) |
|
| 38 |
{
|
|
| 39 |
// remove remark-lines |
|
| 40 |
$ModulesList = preg_grep('/^\s*?[^#;]/', $ModulesList);
|
|
| 41 |
} |
|
| 42 |
} |
|
| 35 |
$ModulesUsingFTAN = WB_PATH.'/modules/'.$tool.'/FTAN_SUPPORTED'; |
|
| 43 | 36 |
} |
| 44 | 37 |
|
| 45 |
$admin_header = (!in_array($tool, $ModulesList));
|
|
| 38 |
$admin_header = (file_exists($ModulesUsingFTAN) && is_file($ModulesUsingFTAN)) == false;
|
|
| 46 | 39 |
$admin = new admin('admintools', 'admintools', $admin_header );
|
| 47 |
unset($ModulesList); |
|
| 48 | 40 |
|
| 49 | 41 |
// Check if tool is installed |
| 50 | 42 |
$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".preg_replace("/\W/", "", $tool)."'");
|
| branches/2.8.x/wb/framework/initialize.php | ||
|---|---|---|
| 50 | 50 |
define('OCTAL_FILE_MODE',(int) octdec($string_file_mode));
|
| 51 | 51 |
$string_dir_mode = STRING_DIR_MODE; |
| 52 | 52 |
define('OCTAL_DIR_MODE',(int) octdec($string_dir_mode));
|
| 53 |
$sSecMod = (defined('SECURE_FORM_MODULE')) ? '.'.SECURE_FORM_MODULE : '';
|
|
| 53 |
$sSecMod = (defined('SECURE_FORM_MODULE') && SECURE_FORM_MODULE != '') ? '.'.SECURE_FORM_MODULE : '';
|
|
| 54 | 54 |
$sSecMod = WB_PATH.'/framework/SecureForm'.$sSecMod.'.php'; |
| 55 | 55 |
require_once($sSecMod); |
| 56 | 56 |
if (!defined("WB_INSTALL_PROCESS")) {
|
| branches/2.8.x/wb/modules/captcha_control/FTAN_SUPPORTED | ||
|---|---|---|
| 1 |
This module supports the FTAN-System |
|
| branches/2.8.x/wb/modules/jsadmin/FTAN_SUPPORTED | ||
|---|---|---|
| 1 |
This module supports the FTAN-System |
|
| branches/2.8.x/wb/modules/output_filter/FTAN_SUPPORTED | ||
|---|---|---|
| 1 |
This module supports the FTAN-System |
|
Also available in: Unified diff
bugfix in initialize including SecureForm
update admintools FTAN handling