From 1aaee9c88324d5d5eb45e53f80c1242e814631a3 Mon Sep 17 00:00:00 2001 From: patdenice Date: Wed, 6 Jun 2012 15:43:40 +0000 Subject: merge r15575 from trunk to branch 23 bug:2647 External ImageMagick does not work anymore on 1and1 servers git-svn-id: http://piwigo.org/svn/branches/2.3@15576 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions.inc.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'include/functions.inc.php') diff --git a/include/functions.inc.php b/include/functions.inc.php index f6b8303b6..15baa8fef 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -1649,4 +1649,23 @@ function get_branch_from_version($version) { return implode('.', array_slice(explode('.', $version), 0, 2)); } + +/** + * return hostname with gethostbyaddr and keep it in database + */ +function get_host($force_update=false) +{ + global $conf; + + if (!isset($conf['host']) or $force_update) + { + $conf['host'] = 'undefined'; + if ($host = @gethostbyaddr($_SERVER['SERVER_ADDR'])) + { + $conf['host'] = $host; + } + conf_update_param('host', $conf['host']); + } + return $conf['host']; +} ?> \ No newline at end of file -- cgit v1.2.3