Changeset 8021 for branches


Ignore:
Timestamp:
Dec 7, 2010, 1:40:09 PM (13 years ago)
Author:
patdenice
Message:

merge r8020 from trunk to branch 2.1
Feature 2048: Send data to piwigo server anonymously (like php and mysql versions)

Location:
branches/2.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1

    • Property svn:mergeinfo changed
      /trunkmerged: 8020
  • branches/2.1/admin/include/functions.php

    r7723 r8021  
    17021702  }
    17031703
     1704  // Send anonymous data to piwigo server
     1705  if ($_SERVER['HTTP_HOST'] != 'localhost' and $step==0
     1706    and preg_match('#^http://(?:[a-z]+\.)?piwigo\.org#', $src))
     1707  {
     1708    global $conf;
     1709
     1710    $src = add_url_params($src, array(
     1711      'uuid' => hash_hmac('md5', get_absolute_root_url(), $conf['secret_key']),
     1712      'os' => urlencode(PHP_OS),
     1713      'phpversion' => urlencode(phpversion()),
     1714      'dbengine' => urlencode(DB_ENGINE),
     1715      'dbversion' => urlencode(pwg_get_db_version()),
     1716      )
     1717    );
     1718    $src = str_replace('&', '&', $src);
     1719  }
     1720
    17041721  // After 3 redirections, return false
    17051722  if ($step > 3) return false;
Note: See TracChangeset for help on using the changeset viewer.