Index: /extensions/AdditionalPages/additional_page.php =================================================================== --- /extensions/AdditionalPages/additional_page.php (revision 9344) +++ /extensions/AdditionalPages/additional_page.php (revision 9345) @@ -2,4 +2,26 @@ if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); + +function check_random_index_redirect() +{ + global $conf; + + if (!empty($conf['ap_random_index_redirect'])) + { + $random_index_redirect = array(); + foreach ($conf['ap_random_index_redirect'] as $random_url => $random_url_condition) + { + if (empty($random_url_condition) or eval($random_url_condition)) + { + $random_index_redirect[] = $random_url; + } + } + if (!empty($random_index_redirect)) + { + redirect($random_index_redirect[mt_rand(0, count($random_index_redirect)-1)]); + } + } + return true; +} global $template, $user; @@ -39,4 +61,5 @@ if ($user['level'] < $row['level']) { + if ($page['ap_homepage'] and check_random_index_redirect()) return; page_forbidden(l10n('You are not authorized to access the requested page')); } @@ -48,5 +71,5 @@ if (!in_array($user['status'], $authorized_users)) { - if ($page['ap_homepage']) return; + if ($page['ap_homepage'] and check_random_index_redirect()) return; page_forbidden(l10n('You are not authorized to access the requested page')); } @@ -64,5 +87,5 @@ if (empty($groups)) { - if ($page['ap_homepage']) return; + if ($page['ap_homepage'] and check_random_index_redirect()) return; page_forbidden(l10n('You are not authorized to access the requested page')); } Index: /extensions/AdditionalPages/admin/config.inc.php =================================================================== --- /extensions/AdditionalPages/admin/config.inc.php (revision 9344) +++ /extensions/AdditionalPages/admin/config.inc.php (revision 9345) @@ -74,9 +74,15 @@ // Parametrage du template -$template->assign('ap_conf', $conf['AP']); +$template->assign(array( + 'ap_conf' => $conf['AP'], + 'SHOW_MENU' => (!isset($mb_conf['mbAdditionalPages']) or $mb_conf['mbAdditionalPages'] > 0), + 'AMM_INSTALLED' => defined('AMM_PATH'), + ) +); -if (!isset($mb_conf['mbAdditionalPages']) or $mb_conf['mbAdditionalPages'] == abs($mb_conf['mbAdditionalPages'])) +if (defined('AMM_PATH')) { - $template->assign('SHOW_MENU', true); + load_language('plugin.lang', AMM_PATH); + $template->assign('AMM_URI', get_admin_plugin_menu_link(AMM_PATH.'admin/plugin_admin.php')); } Index: /extensions/AdditionalPages/admin/template/config.tpl =================================================================== --- /extensions/AdditionalPages/admin/template/config.tpl (revision 9344) +++ /extensions/AdditionalPages/admin/template/config.tpl (revision 9345) @@ -69,12 +69,14 @@ + {if !$AMM_INSTALLED}