archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r8238 from trunk to branch 2.1

Browse source 
feature 2048 removed (and was never released): no data are sent anonymously to piwigo.org for statistics purpose


git-svn-id: http://piwigo.org/svn/branches/2.1@8240 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-12-23 00:27:38 +00:00
parent 598d35cf6f
commit a1e51fdc29
5 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
admin/include/functions.php
View file

@ -2036,24 +2036,4 @@ function get_fckb_tag_ids($raw_tags)
return $tag_ids; 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' => PHP_OS,
'pwgversion' => PHPWG_VERSION,
'phpversion' => phpversion(),
'dbengine' => DB_ENGINE,
'dbversion' => pwg_get_db_version(),
);
}
return $details;
}
?> ?>

2
admin/include/languages.class.php
View file

@ -205,7 +205,7 @@ UPDATE '.USER_INFOS_TABLE.'
$version = PHPWG_VERSION; $version = PHPWG_VERSION;
$versions_to_check = array(); $versions_to_check = array();
$url = PEM_URL . '/api/get_version_list.php'; $url = PEM_URL . '/api/get_version_list.php';
if (fetchRemote($url, $result, $get_data, get_hosting_technical_details()) and $pem_versions = @unserialize($result)) if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result))
{ {
if (!preg_match('/^\d+\.\d+\.\d+/', $version)) if (!preg_match('/^\d+\.\d+\.\d+/', $version))
{ {

2
admin/include/plugins.class.php
View file

@ -299,7 +299,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
$version = PHPWG_VERSION; $version = PHPWG_VERSION;
$versions_to_check = array(); $versions_to_check = array();
$url = PEM_URL . '/api/get_version_list.php'; $url = PEM_URL . '/api/get_version_list.php';
if (fetchRemote($url, $result, $get_data, get_hosting_technical_details()) and $pem_versions = @unserialize($result)) if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result))
{ {
if (!preg_match('/^\d+\.\d+\.\d+/', $version)) if (!preg_match('/^\d+\.\d+\.\d+/', $version))
{ {

2
admin/include/themes.class.php
View file

@ -456,7 +456,7 @@ SELECT
$version = PHPWG_VERSION; $version = PHPWG_VERSION;
$versions_to_check = array(); $versions_to_check = array();
$url = PEM_URL . '/api/get_version_list.php'; $url = PEM_URL . '/api/get_version_list.php';
if (fetchRemote($url, $result, $get_data, get_hosting_technical_details()) and $pem_versions = @unserialize($result)) if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result))
{ {
if (!preg_match('/^\d+\.\d+\.\d+/', $version)) if (!preg_match('/^\d+\.\d+\.\d+/', $version))
{ {

4
include/config_default.inc.php
View file

@ -485,10 +485,6 @@ $conf['template_force_compile'] = false;
// gives an empty value '' to deactivate // gives an empty value '' to deactivate
$conf['show_php_errors'] = E_ALL; $conf['show_php_errors'] = E_ALL;
// sends your hosting PHP and MySQL versions to piwigo.org as anonymously as
// possible, for statistics purpose. No personnal data are transmitted
$conf['send_hosting_technical_details'] = true;
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
// | authentication | // | authentication |
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+