aboutsummaryrefslogtreecommitdiffstats
path: root/include/page_tail.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-02-01 22:07:26 +0000
committerplegall <plg@piwigo.org>2006-02-01 22:07:26 +0000
commit864acc9f954e4f5b7c21d2aaeab13ae2a2d5d0db (patch)
tree59dcb5f1078e7288f2adad09ed70f0a62bb2db67 /include/page_tail.php
parentbb181b04cf3e4984cb1dfbe95e5521ad917fab76 (diff)
Applying coding style guidelines to r1018 and r1019.
New function get_webmaster_mail_address used in include/page_tail.php and include/functions_mail.inc.php. Nothing else than functions in include/functions*, init_conf_mail() was useless in include/functions_mail.inc.php because $conf_mail is only used in function pwg_mail. bug fixed: files include/functions_mail.inc.php and include/functions_notification.inc.php had been commited in DOS format! Unix file format is the only file format authorized. git-svn-id: http://piwigo.org/svn/trunk@1021 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/page_tail.php32
1 files changed, 13 insertions, 19 deletions
diff --git a/include/page_tail.php b/include/page_tail.php
index f2a719e3d..20c66be0d 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -36,6 +36,19 @@ $template->assign_vars(
'L_TITLE_MAIL' => $lang['title_send_mail'],
'L_POWERED_BY'=>$lang['powered_by']
));
+
+//--------------------------------------------------------------------- contact
+
+if (!$user['is_the_guest'])
+{
+ $template->assign_block_vars(
+ 'contact',
+ array(
+ 'MAIL' => get_webmaster_mail_address()
+ )
+ );
+}
+
//------------------------------------------------------------- generation time
if ($conf['show_gt'])
{
@@ -62,25 +75,6 @@ if ($conf['show_queries'])
);
}
-//--------------------------------------------------------------------- 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
//