';
exit();
}
- }
}
function setup_style($style)
diff --git a/index.php b/index.php
index 8a94b9d18..426ed0513 100644
--- a/index.php
+++ b/index.php
@@ -25,16 +25,7 @@
// | USA. |
// +-----------------------------------------------------------------------+
-//----------------------------------------------------------- include
define('PHPWG_ROOT_PATH','./');
include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
-if ( $conf['access'] == 'restricted' )
-{
- if ( isset( $_COOKIE['id'] ) ) $url = 'category';
- else $url = 'identification';
-}
-else $url = 'category';
-// redirection
-$url.= '.php';
-redirect( $url );
+redirect('category.php');
?>
diff --git a/install/config.sql b/install/config.sql
index 62fabe6f6..512a35c1a 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -6,7 +6,6 @@ INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_language
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_template','default','Default gallery style');
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_maxwidth','','maximum width authorized for displaying images');
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_maxheight','','maximum height authorized for the displaying images');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('access','free','access type to your gallery (free|restricted)');
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nb_comment_page','10','number of comments to display on each page');
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('upload_maxfilesize','150','maximum filesize for the uploaded pictures');
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('upload_maxwidth','800','maximum width authorized for the uploaded images');
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index dac80109e..971f155e6 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -41,8 +41,6 @@ $lang['storage'] = 'Directory';
$lang['edit'] = 'Edit';
$lang['authorized'] = 'Authorized';
$lang['forbidden'] = 'Forbidden';
-$lang['free'] = 'Free';
-$lang['restricted'] = 'Restricted';
$lang['public'] = 'public';
$lang['private'] = 'private';
$lang['metadata']='Metadata';
@@ -152,7 +150,6 @@ $lang['conf_prefix'] = 'Thumbnail prefix';
$lang['conf_prefix_info'] = 'Thumbnails use this prefix. Do not fill if your not sure.';
$lang['conf_prefix_error'] = 'Thumbnail\'s prefix must only contain characters among : a to z (case insensitive), "-" or "_"';
$lang['conf_access'] = 'Access type';
-$lang['conf_access_info'] = '- free : anyone can enter the site, any visitor can create an account in order to customize the appareance of the website - restricted : the webmaster create accounts. Only registered users can enter the site';
$lang['conf_log_info'] = 'Keep an history of visits on your website ? Visits will be shown in the history section of the administration panel';
$lang['conf_notification'] = 'Mail notification';
$lang['conf_notification_info'] = 'Automated mail notification for adminsitrators (and only for them) when a user add a comment or upload a picture.';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 36ec3b6f3..93c8a4148 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -41,8 +41,6 @@ $lang['update'] = 'Synchroniser';
$lang['edit'] = 'Editer';
$lang['authorized'] = 'Autorisé';
$lang['forbidden'] = 'Interdit';
-$lang['free'] = 'Libre';
-$lang['restricted'] = 'Restreint';
$lang['public'] = 'Publique';
$lang['private'] = 'Privée';
$lang['metadata']='Métadonnées';
@@ -153,8 +151,6 @@ $lang['conf_prefix'] = 'Pr
$lang['conf_prefix_info'] = 'Les noms des fichiers miniatures en sont préfixé. Laissez vide en cas de doute.';
$lang['conf_prefix_thumbnail_error'] = 'Le préfixe doit être uniquement composé des caractères suivant : a-z, "-" ou "_"';
$lang['conf_access'] = 'Type d\'acces';
-$lang['conf_access_info'] = '- libre : n\'importe qui peut accéder à vos photos, tous les visiteurs peuvent se créer un compte pour pouvoir personnaliser l\'affichage
-- restreint : l\'administrateur s\'occupe de créer des comptes, seuls les personnes membres peuvent accéder au site';
$lang['conf_log_info'] = 'historiser les visites sur le site ? Les visites seront visibles dans l\'historique de l\'administration';
$lang['conf_notification'] = 'Notification par mail';
$lang['conf_notification_info'] = 'Notification automatique par mail des administrateurs (seuls les administrateurs) lors de l\'ajout d\'un commentaire, ou lors de l\'ajout d\'une image.';
diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl
index e53723ab4..0585d70a9 100644
--- a/template/default/admin/configuration.tpl
+++ b/template/default/admin/configuration.tpl
@@ -27,11 +27,6 @@