- modification : less configuration parameters in administration

  screen. These parameters are move to include/config_default.inc.php.

- new : ability to add a single picture to caddie from picture.php

- new : contextual help, only a few pages are available.

- new : ability to delete users from admin/user_list

- modification : reorganization of configuration file

- new : configuration parameter use_exif_mapping

- improvement : MOD hidemail added to standard


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

1 files changed, 19 insertions, 2 deletions

diff --git a/include/page_tail.php b/include/page_tail.php
index 5e4a977e6..33f6900cf 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -29,13 +29,11 @@ $template->set_filenames(array('tail'=>'footer.tpl'));
 $template->assign_vars(
   array(
     'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
-    'MAIL'=>$conf['mail_webmaster'],
     
     'L_GEN_TIME' => $lang['generation_time'],
     'L_SQL_QUERIES_IN' => $lang['sql_queries_in'],
     'L_SEND_MAIL' => $lang['send_mail'],
     'L_TITLE_MAIL' => $lang['title_send_mail'],
-    'L_WEBMASTER'=>$lang['webmaster'],
     'L_POWERED_BY'=>$lang['powered_by']
     ));
 //------------------------------------------------------------- generation time
@@ -56,6 +54,25 @@ if ($conf['show_gt'])
           'SQL_TIME' => number_format($page['queries_time'],3,'.',' ').' s'));
 }
 
+//--------------------------------------------------------------------- contact
+
+if (!$user['is_the_guest'])
+{
+  $query = '
+SELECT '.$conf['user_fields']['email'].'
+  FROM '.USERS_TABLE.'
+  WHERE '.$conf['user_fields']['id'].' = '.$conf['webmaster_id'].'
+;';
+  list($email) = mysql_fetch_array(pwg_query($query));
+  
+  $template->assign_block_vars(
+    'contact',
+    array(
+      'MAIL' => $email
+      )
+    );
+}
+
 //
 // Generate the page
 //