Changeset 8240 for branches

Timestamp:

Dec 23, 2010, 1:27:38 AM (13 years ago)

Author:

plg

Message:

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

Location:

branches/2.1

Files:

• admin/include/functions.php (modified) (1 diff)
• admin/include/languages.class.php (modified) (1 diff)
• admin/include/plugins.class.php (modified) (1 diff)
• admin/include/themes.class.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)

branches/2.1/admin/include/functions.php

@@ -2037 +2037 @@
   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;
-}
 ?>

branches/2.1/admin/include/languages.class.php

@@ -206 +206 @@
     $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))

branches/2.1/admin/include/plugins.class.php

@@ -300 +300 @@
     $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))

branches/2.1/admin/include/themes.class.php

@@ -457 +457 @@
     $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))

branches/2.1/include/config_default.inc.php

@@ -485 +485 @@
 // 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;
 
 // +-----------------------------------------------------------------------+