aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-12-23 00:27:38 +0000
committerplegall <plg@piwigo.org>2010-12-23 00:27:38 +0000
commita1e51fdc29da8727dfe515826eb0bccfae767cb0 (patch)
tree2257c66283dc910040cfca373e3e0538c8d087fb
parent598d35cf6f7a36b09932d59e15b163497f69d832 (diff)
merge r8238 from trunk to branch 2.1
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
-rw-r--r--admin/include/functions.php20
-rw-r--r--admin/include/languages.class.php2
-rw-r--r--admin/include/plugins.class.php2
-rw-r--r--admin/include/themes.class.php2
-rw-r--r--include/config_default.inc.php4
5 files changed, 3 insertions, 27 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 13c4092b1..5d27c7865 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -2036,24 +2036,4 @@ 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' => PHP_OS,
- 'pwgversion' => PHPWG_VERSION,
- 'phpversion' => phpversion(),
- 'dbengine' => DB_ENGINE,
- 'dbversion' => pwg_get_db_version(),
- );
- }
-
- return $details;
-}
?> \ No newline at end of file
diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php
index 4fd73d4af..d9537bbdd 100644
--- a/admin/include/languages.class.php
+++ b/admin/include/languages.class.php
@@ -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, 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))
{
diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php
index 169a50b76..5b620da62 100644
--- a/admin/include/plugins.class.php
+++ b/admin/include/plugins.class.php
@@ -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, 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))
{
diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php
index b00172d31..f372ef5de 100644
--- a/admin/include/themes.class.php
+++ b/admin/include/themes.class.php
@@ -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, 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))
{
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 50faea48c..694785bb8 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -485,10 +485,6 @@ $conf['template_force_compile'] = false;
// gives an empty value '' to deactivate
$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 |
// +-----------------------------------------------------------------------+