adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 2048: send technical details only to get_version_list.php of PEM API.

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@8084 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2010-12-11 21:20:12 +00:00
parent ea64e421cb
commit 1b5260522e
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions.php
+20 -18
View File
@@ -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;
}
?>
admin/include/languages.class.php
+1 -1
View File
@@ -205,7 +205,7 @@ UPDATE '.USER_INFOS_TABLE.'
$version = PHPWG_VERSION;
$versions_to_check = array();
$url = PEM_URL . '/api/get_version_list.php';
if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result))
if (fetchRemote($url, $result, $get_data, get_hosting_technical_details()) and $pem_versions = @unserialize($result))
{
if (!preg_match('/^\d+\.\d+\.\d+/', $version))
{
admin/include/plugins.class.php
+1 -1
View File
@@ -299,7 +299,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
$version = PHPWG_VERSION;
$versions_to_check = array();
$url = PEM_URL . '/api/get_version_list.php';
if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result))
if (fetchRemote($url, $result, $get_data, get_hosting_technical_details()) and $pem_versions = @unserialize($result))
{
if (!preg_match('/^\d+\.\d+\.\d+/', $version))
{
admin/include/themes.class.php
+1 -1
View File
@@ -456,7 +456,7 @@ SELECT
$version = PHPWG_VERSION;
$versions_to_check = array();
$url = PEM_URL . '/api/get_version_list.php';
if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result))
if (fetchRemote($url, $result, $get_data, get_hosting_technical_details()) and $pem_versions = @unserialize($result))
{
if (!preg_match('/^\d+\.\d+\.\d+/', $version))
{