Changeset 8240


Ignore:
Timestamp:
12/23/10 01:27:38 (8 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:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/admin/include/functions.php

    r8124 r8240  
    20372037  return $tag_ids; 
    20382038} 
    2039  
    2040 function get_hosting_technical_details() 
    2041 { 
    2042   global $conf; 
    2043  
    2044   $details = array(); 
    2045   if ($conf['send_hosting_technical_details'] and $_SERVER['HTTP_HOST'] != 'localhost') 
    2046   { 
    2047     $details = array( 
    2048       'uuid' => hash_hmac('md5', get_absolute_root_url(), $conf['secret_key']), 
    2049       'os' => PHP_OS, 
    2050       'pwgversion' => PHPWG_VERSION, 
    2051       'phpversion' => phpversion(), 
    2052       'dbengine' => DB_ENGINE, 
    2053       'dbversion' => pwg_get_db_version(), 
    2054     ); 
    2055   } 
    2056  
    2057   return $details; 
    2058 } 
    20592039?> 
  • branches/2.1/admin/include/languages.class.php

    r8086 r8240  
    206206    $versions_to_check = array(); 
    207207    $url = PEM_URL . '/api/get_version_list.php'; 
    208     if (fetchRemote($url, $result, $get_data, get_hosting_technical_details()) and $pem_versions = @unserialize($result)) 
     208    if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result)) 
    209209    { 
    210210      if (!preg_match('/^\d+\.\d+\.\d+/', $version)) 
  • branches/2.1/admin/include/plugins.class.php

    r8086 r8240  
    300300    $versions_to_check = array(); 
    301301    $url = PEM_URL . '/api/get_version_list.php'; 
    302     if (fetchRemote($url, $result, $get_data, get_hosting_technical_details()) and $pem_versions = @unserialize($result)) 
     302    if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result)) 
    303303    { 
    304304      if (!preg_match('/^\d+\.\d+\.\d+/', $version)) 
  • branches/2.1/admin/include/themes.class.php

    r8086 r8240  
    457457    $versions_to_check = array(); 
    458458    $url = PEM_URL . '/api/get_version_list.php'; 
    459     if (fetchRemote($url, $result, $get_data, get_hosting_technical_details()) and $pem_versions = @unserialize($result)) 
     459    if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result)) 
    460460    { 
    461461      if (!preg_match('/^\d+\.\d+\.\d+/', $version)) 
  • branches/2.1/include/config_default.inc.php

    r8086 r8240  
    485485// gives an empty value '' to deactivate 
    486486$conf['show_php_errors'] = E_ALL; 
    487  
    488 // sends your hosting PHP and MySQL versions to piwigo.org as anonymously as 
    489 // possible, for statistics purpose. No personnal data are transmitted 
    490 $conf['send_hosting_technical_details'] = true; 
    491487 
    492488// +-----------------------------------------------------------------------+ 
Note: See TracChangeset for help on using the changeset viewer.