Commit 48cf9b7d authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/9.x 43290 to 43296

parents 0331b651 0affa249
......@@ -1422,7 +1422,7 @@ class UsersLib extends TikiLib
if (!empty($res['valid']) && $pass == $res['valid']) // used for validation of user account before activation
return array(USER_VALID, $user);
if ($validate_phase && $res['waiting'] == 'u')
if ($res['waiting'] == 'u')
return array(ACCOUNT_WAITING_USER, $user);
if ($res['waiting'] == 'a')
return array(ACCOUNT_DISABLED, $user);
......
{* $Id$ *}
{* Module layout with controls *}
{if !isset($module_position)}{assign var=module_position value=' '}{/if}
{if !isset($module_ord)}{assign var=module_ord value=' '}{/if}
{if !isset($module_position)}{assign var=module_position value=''}{/if}
{if !isset($module_ord)}{assign var=module_ord value=''}{/if}
{capture name=name}{$module_name|replace:"+":"_"|cat:$module_position|cat:$module_ord|escape}{/capture}
{if !empty($module_params.topclass)}<div class="{$module_params.topclass}">{/if}
{if $module_nobox neq 'y'}
......@@ -87,4 +87,4 @@
</div>
</div>
{/if}
{if !empty($module_params.topclass)}</div>{/if}
\ No newline at end of file
{if !empty($module_params.topclass)}</div>{/if}
......@@ -296,16 +296,17 @@ if ($isvalid) {
// - referer url (e.g. http://example.com/tiki/tiki-index.php?page=Homepage ) is the homepage (tikiIndex),
// - referer url complete path ( e.g. /tiki/tiki-index.php?page=Homepage ) is the homepage,
// - referer url relative path ( e.g. tiki-index.php?page=Homepage ) is the homepage
// - referer url SEF page ( e.g. /tiki/Homepage ) is the homepage
// - one of the three cases listed above, but compared to anonymous page instead of global homepage
//
// - last case ($tikiIndex_full != '') :
// wiki homepage could have been saved as 'tiki-index.php' instead of 'tiki-index.php?page=Homepage'.
// ... so we also need to check against : homepage + '?page=' + default wiki pagename
//
if ($prefs['limitedGoGroupHome'] == 'n' || $url == $prefs['site_tikiIndex'] || $url_path == $prefs['site_tikiIndex'] || basename($url_path) == $prefs['site_tikiIndex'] || ($anonymous_homepage != '' && ($url == $anonymous_homepage || $url_path == $anonymous_homepage || basename($url_path) == $anonymous_homepage)) || ($tikiIndex_full != '' && basename($url_path) == $tikiIndex_full)) {
include_once('tiki-sefurl.php');
if ($prefs['limitedGoGroupHome'] == 'n' || $url == $prefs['site_tikiIndex'] || $url_path == $prefs['site_tikiIndex'] || basename($url_path) == $prefs['site_tikiIndex'] || ($anonymous_homepage != '' && ($url == $anonymous_homepage || $url_path == $anonymous_homepage || basename($url_path) == $anonymous_homepage)) || filter_out_sefurl($anonymous_homepage) == basename($url_path) || ($tikiIndex_full != '' && basename($url_path) == $tikiIndex_full)) {
$groupHome = $userlib->get_user_default_homepage($user);
if ($groupHome != '') {
include_once('tiki-sefurl.php');
$url = (preg_match('/^(\/|https?:)/', $groupHome)) ? $groupHome : filter_out_sefurl('tiki-index.php?page=' . urlencode($groupHome));
}
}
......
......@@ -82,6 +82,7 @@ if ($isvalid) {
} else {
$user = $_REQUEST['user'];
$_SESSION["$user_cookie_site"] = $user;
TikiLib::lib('menu')->empty_menu_cache();
}
}
if (!empty($prefs['url_after_validation']) && !$wasAdminValidation) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment