merge from trunk r1469:1470 into branch 1.6 (feature 470)

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1471 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 9 insertions, 0 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index c0a98eb44..c4c4bdb4d 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -388,6 +388,11 @@ $conf['webmaster_id'] = 1;
 // allow to use adviser mode
 $conf['allow_adviser'] = false;
 
+// does the guest have access ?
+// (not a security feature, set your categories "private" too)
+// If false it'll be redirected from index.php to identification.php
+$conf['guest_access'] = true;
+
 // +-----------------------------------------------------------------------+
 // |                                upload                                 |
 // +-----------------------------------------------------------------------+
diff --git a/index.php b/index.php
index b1941a717..345929e67 100644
--- a/index.php
+++ b/index.php
@@ -48,6 +48,10 @@ if ( isset( $_GET['act'] )
       ini_get('session.cookie_path'), ini_get('session.cookie_domain') );
   redirect( make_index_url() );
 }
+if ($user['is_the_guest'] and !$conf['guest_access'])
+{
+  redirect (get_root_url().'identification.php');
+}
 
 //---------------------------------------------- change of image display order
 if (isset($_GET['image_order']))