diff options
author | patdenice <patdenice@piwigo.org> | 2010-12-11 21:20:12 +0000 |
---|---|---|
committer | patdenice <patdenice@piwigo.org> | 2010-12-11 21:20:12 +0000 |
commit | 1b5260522e3234c122613189bf14deab445ed4c9 (patch) | |
tree | a136916373b416a0ffa5ac4544829764450eb91e /admin/include/functions.php | |
parent | ea64e421cb529637a6aa7fad7b0b881b3c224fad (diff) |
feature 2048: send technical details only to get_version_list.php of PEM API.
git-svn-id: http://piwigo.org/svn/trunk@8084 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include/functions.php')
-rw-r--r-- | admin/include/functions.php | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 463cfeb0f..6f2ce02e2 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1704,8 +1704,6 @@ function cat_admin_access($category_id) */ function fetchRemote($src, &$dest, $get_data=array(), $post_data=array(), $user_agent='Piwigo', $step=0) { - global $conf; - // Try to retrieve data from local file? if (!url_is_remote($src)) { @@ -1724,22 +1722,6 @@ function fetchRemote($src, &$dest, $get_data=array(), $post_data=array(), $user_ // After 3 redirections, return false if ($step > 3) return false; - // Send anonymous data to piwigo server - if ($conf['send_hosting_technical_details'] - and $_SERVER['HTTP_HOST'] != 'localhost' and $step==0 - and preg_match('#^http://(?:[a-z]+\.)?piwigo\.org#', $src)) - { - $post_data = array_merge($post_data, array( - 'uuid' => hash_hmac('md5', get_absolute_root_url(), $conf['secret_key']), - 'os' => urlencode(PHP_OS), - 'pwgversion' => urlencode(PHPWG_VERSION), - 'phpversion' => urlencode(phpversion()), - 'dbengine' => urlencode(DB_ENGINE), - 'dbversion' => urlencode(pwg_get_db_version()), - ) - ); - } - // Initialization $method = empty($post_data) ? 'GET' : 'POST'; $request = empty($post_data) ? '' : http_build_query($post_data, '', '&'); @@ -2062,4 +2044,24 @@ function get_fckb_tag_ids($raw_tags) return $tag_ids; } + +function get_hosting_technical_details() +{ + global $conf; + + $details = array(); + if ($conf['send_hosting_technical_details'] and $_SERVER['HTTP_HOST'] != 'localhost') + { + $details = array( + 'uuid' => hash_hmac('md5', get_absolute_root_url(), $conf['secret_key']), + 'os' => urlencode(PHP_OS), + 'pwgversion' => urlencode(PHPWG_VERSION), + 'phpversion' => urlencode(phpversion()), + 'dbengine' => urlencode(DB_ENGINE), + 'dbversion' => urlencode(pwg_get_db_version()), + ); + } + + return $details; +} ?> |