fix: permissioning not working (2 bugs)

fix: locked gallery cannot be unlocked (impossible to login)

improvement: nicer display in redirect.tpl

improvement: when a page is not accessible because of permissions (accessed 
through bookmark or email), redirect to identification.php and after 
identification to the initially requested page


git-svn-id: http://piwigo.org/svn/trunk@1052 68402e56-0260-453c-a942-63ccdbb3a9ee

include/user.inc.php

@@ -58,12 +58,11 @@ if ($conf['apache_authentication'] and isset($_SERVER['REMOTE_USER']))
   
   $user['is_the_guest'] = false;
 }
-
 $user = array_merge(
   $user,
   getuserdata(
     $user['id'],
-    defined('IN_ADMIN') and IN_ADMIN ? false : true // use cache ?
+    ( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ?
     )
   );