aboutsummaryrefslogtreecommitdiffstats
path: root/identification.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-01-12 20:50:46 +0000
committerrvelices <rv-github@modusoptimus.com>2012-01-12 20:50:46 +0000
commit6a115001ba122c2084e28353e025f7c8c5f62335 (patch)
treeb6c15c78fc725c9d87ce7ded08d67e6d612fc362 /identification.php
parent65590487d4f07d81a3e47899c2454df187d3f23a (diff)
bug 2553 hide menubar/register on indentification page if gallery is locked or guest_access is false
git-svn-id: http://piwigo.org/svn/trunk@12878 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'identification.php')
-rw-r--r--identification.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/identification.php b/identification.php
index 9a3128536..4a8e65e6b 100644
--- a/identification.php
+++ b/identification.php
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2008-2012 Piwigo Team http://piwigo.org |
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
// +-----------------------------------------------------------------------+
@@ -82,21 +82,25 @@ $template->set_filenames( array('identification'=>'identification.tpl') );
$template->assign(
array(
- 'U_LOST_PASSWORD' => get_root_url().'password.php',
'U_REDIRECT' => $redirect_to,
'F_LOGIN_ACTION' => get_root_url().'identification.php',
'authorize_remembering' => $conf['authorize_remembering'],
));
-if ($conf['allow_user_registration'])
+if (!$conf['gallery_locked'] && $conf['allow_user_registration'])
{
$template->assign('U_REGISTER', get_root_url().'register.php' );
}
+if (!$conf['gallery_locked'])
+{
+ $template->assign('U_LOST_PASSWORD', get_root_url().'password.php' );
+}
+
// include menubar
$themeconf = $template->get_template_vars('themeconf');
-if (!isset($themeconf['hide_menu_on']) OR !in_array('theIdentificationPage', $themeconf['hide_menu_on']))
+if (!$conf['gallery_locked'] && (!isset($themeconf['hide_menu_on']) OR !in_array('theIdentificationPage', $themeconf['hide_menu_on'])))
{
include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
}