Projet

Général

Profil

Révision de644da6

Ajouté par Julien Enselme il y a plus de 9 ans

Update piwik from 2.6 to 2.7

Voir les différences:

drupal7/sites/all/modules/piwik/piwik.admin.inc
202 202
    '#type' => 'textfield',
203 203
    '#default_value' => variable_get('piwik_trackfiles_extensions', PIWIK_TRACKFILES_EXTENSIONS),
204 204
    '#description' => t('A file extension list separated by the | character that will be tracked when clicked. Regular expressions are supported. For example: !extensions', array('!extensions' => PIWIK_TRACKFILES_EXTENSIONS)),
205
    '#maxlength' => 255,
205
    '#maxlength' => 500,
206 206
    '#states' => array(
207 207
      'enabled' => array(
208 208
        ':input[name="piwik_track"]' => array('checked' => TRUE),
drupal7/sites/all/modules/piwik/piwik.info
5 5
configure = admin/config/system/piwik
6 6
files[] = piwik.test
7 7
test_dependencies[] = token
8
; Information added by Drupal.org packaging script on 2014-09-28
9
version = "7.x-2.6"
8
; Information added by Drupal.org packaging script on 2014-11-29
9
version = "7.x-2.7"
10 10
core = "7.x"
11 11
project = "piwik"
12
datestamp = "1411927985"
12
datestamp = "1417276085"
13 13

  
drupal7/sites/all/modules/piwik/piwik.install
254 254

  
255 255
  return t('Renamed "piwik_visibility" settings variable to piwik_visibility_pages.');
256 256
}
257

  
258
/**
259
 * Update list of default file extensions.
260
 */
261
function piwik_update_7205() {
262
  if (variable_get('piwik_trackfiles_extensions', '') == '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls|xml|z|zip') {
263
    variable_set('piwik_trackfiles_extensions', '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip');
264
    return t('The default extensions for download tracking have been updated.');
265
  }
266
  else {
267
    return t('Custom extensions for download tracking setting found. Update skipped!');
268
  }
269
}
drupal7/sites/all/modules/piwik/piwik.module
13 13
/**
14 14
 * Define the default file extension list that should be tracked as download.
15 15
 */
16
define('PIWIK_TRACKFILES_EXTENSIONS', '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls|xml|z|zip');
16
define('PIWIK_TRACKFILES_EXTENSIONS', '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip');
17 17

  
18 18
/**
19 19
 * Define default path exclusion list to remove tracking from admin pages,
......
231 231
      // The USER_ID value should be a unique, persistent, and non-personally
232 232
      // identifiable string identifier that represents a user or signed-in
233 233
      // account across devices.
234
      $script .= '_paq.push(["setUserId", ' . drupal_json_encode(drupal_base64_encode(drupal_get_hash_salt() . $user->uid)) . ']);';
234
      $script .= '_paq.push(["setUserId", ' . drupal_json_encode(drupal_hmac_base64($user->uid, drupal_get_private_key() . drupal_get_hash_salt())) . ']);';
235 235
    }
236 236

  
237 237
    // Set custom data.

Formats disponibles : Unified diff