Project

General

Profile

Revision d756b39a

Added by Assos Assos about 8 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/date_ical/date_ical.info
21 21
; Includes for iCal feed import using Feeds
22 22
files[] = includes/DateiCalFeedsParser.inc
23 23

  
24
; Information added by Drupal.org packaging script on 2015-12-01
25
version = "7.x-3.8"
24
; Information added by Drupal.org packaging script on 2016-04-25
25
version = "7.x-3.9"
26 26
core = "7.x"
27 27
project = "date_ical"
28
datestamp = "1448995442"
28
datestamp = "1461609737"
29 29

  
drupal7/sites/all/modules/date_ical/date_ical.module
5 5
 * Adds ical functionality to Views, and an iCal parser to Feeds.
6 6
 */
7 7

  
8
/**
9
 * The version number of the current release. This is inserted into the PRODID
10
 * value of the iCal feeds created by Date iCal, for debugging purposes.
11
 */
12
define('DATE_ICAL_VERSION', '3.8');
13

  
14 8
/**
15 9
 * Exception class for generic exceptions thrown by this module.
16 10
 */
......
260 254
 *   Newer versions of Feeds send this value as an array containing the string.
261 255
 */
262 256
function date_ical_feeds_set_rrule($source, $entity, $target, $repeat_rule) {
263
  if (empty($repeat_rule)) {
264
    // Don't alter the entity if there's no repeat rule.
265
    return;
266
  }
267

  
268 257
  if (is_array($repeat_rule)) {
269 258
    // Newer versions of Feeds return $repeat_rule as an array containing the
270 259
    // string we returned from ParseVcalendar::parseRepeatProperty().
271 260
    $repeat_rule = reset($repeat_rule);
272 261
  }
273 262

  
263
  if (empty($repeat_rule)) {
264
    // Don't alter the entity if there's no repeat rule.
265
    return;
266
  }
267

  
274 268
  // $target looks like <field_name>:rrule, but we only need <field_name>.
275 269
  $field_name = current(explode(':', $target, 2));
276 270
  // Parse the repeat rule into RRULE, RDATE, EXRULE, and EXDATE strings.
......
281 275

  
282 276
  module_load_include('inc', 'date_ical', 'date_ical.utils');
283 277
  // This "loop" is really just to make sure we get the right array keys. It
284
  // souldn't ever execute more than once.
278
  // shouldn't ever execute more than once.
285 279
  foreach ($entity->{$field_name} as $lang => $date_values) {
286 280
    $values = _date_ical_get_repeat_dates($field_name, $repeat_data, $date_values[0], $source);
287 281
    foreach ($values as $key => $value) {
......
348 342
      'text_with_summary',
349 343
      'node_reference',
350 344
      'addressfield',
351
      'location'
345
      'location',
346
      'node_reference',
347
      'taxonomy_term_reference',
352 348
    );
353 349
    if (!$info || !in_array($info['type'], $supported_location_fields)) {
354 350
      continue;
drupal7/sites/all/modules/date_ical/includes/date_ical_plugin_row_ical_entity.inc
284 284
          }
285 285
          $location = implode(', ', $location_data);
286 286
        }
287
        elseif ($location_info['type'] == 'node_reference') {
288
        // Make sure this Node Reference actually references a node.
289
          if ($location_field['nid']) {
290
            $node = node_load($location_field['nid']);
291
            $location = $node->title;
292
          }
293
        }
294
        elseif ($location_info['type'] == 'taxonomy_term_reference') {
295
          $terms = taxonomy_term_load_multiple(array_column($items,'tid'));
296
          // Make sure that there are terms that were loaded.
297
          if ($terms) {
298
            $term_names = array();
299
            foreach ($terms as $term) {
300
              $term_names[] = $term->name;
301
            }
302
            $location = implode(', ', $term_names);
303
          }
304
        }
287 305
        else {
288 306
          $location = $location_field['value'];
289 307
        }
......
314 332
          }
315 333
        }
316 334
        elseif ($summary_info['type'] == 'taxonomy_term_reference') {
317
          $terms = taxonomy_term_load_multiple($items);
335
          $terms = taxonomy_term_load_multiple(array_column($items,'tid'));
318 336
          // Make sure that there are terms that were loaded.
319 337
          if ($terms) {
320 338
            $term_names = array();
drupal7/sites/all/modules/date_ical/includes/date_ical_plugin_style_ical_feed.inc
157 157
    }
158 158
    else {
159 159
      // Create a vcalendar object using the iCalcreator library.
160
      $config = array('unique_id' => 'Date iCal v' . DATE_ICAL_VERSION);
160
      $config = array('unique_id' => 'Date iCal');
161 161
      $vcalendar = new vcalendar($config);
162 162
      $vcalendar->setMethod('PUBLISH');
163 163

  
drupal7/sites/all/modules/date_ical/libraries/ParserVcalendar.inc
224 224
      unset($vcalendar_component->propix[$property_key]);
225 225
    }
226 226

  
227
    if (is_array($text) && isset($vcalendar_component->xprop[$property_key])) {
228
      # This is an X-PROPERTY, which iCalcreator returns as an array like array('X-PROP-NAME', value).
229
      # We only care about the value, though.
230
      $text = $text[1];
231
    }
232

  
227 233
    if ($text === FALSE) {
228 234
      if ($property_key != 'SUMMARY') {
229 235
        return NULL;
......
472 478
        $msg = "The event with UID %uid has an indefinitely repeating RRULE, which the Date Repeat module doesn't support.
473 479
          As a workaround, Date iCal set the repeat count to @count. This value can be customized in the iCal parser settings.";
474 480
        watchdog('date_ical', $msg, array('%uid' => $uid, '@count' => $count), WATCHDOG_WARNING);
475
        if ($this->config['indefinite_message_display']) {
481
        if (!empty($this->config['indefinite_message_display'])) {
476 482
          drupal_set_message(
477 483
            t("At least one of the events in this iCal feed has an indefinitely repeating RRULE, which the Date Repeat module doesn't support.<br>
478 484
              As a workaround, Date iCal set the repeat count to @count. This value can be customized in the iCal parser settings.",
......
481 487
            FALSE
482 488
          );
483 489
        }
484
        $rrule_data['value']['COUNT'] = $this->config['indefinite_count'];
490
        if (isset($this->config['indefinite_count'])) {
491
          $rrule_data['value']['COUNT'] = $this->config['indefinite_count'];
492
        }
493
        else {
494
          // Somehow, it's possible for the config values to have no setting, even though we've given them a default.
495
          // So make really sure we set the COUNT to *something*.
496
          $rrule_data['value']['COUNT'] = 52;
497
        }
485 498
      }
486 499
    }
487 500

  
488
    $rrule = trim($vcalendar_component->createRrule());
489
    $rdate = trim($vcalendar_component->createRdate());
490
    $exrule = trim($vcalendar_component->createExrule());
491
    $exdate = trim($vcalendar_component->createExdate());
501
    # Due to a bug in iCalcreator 2.20.2, any repeat property that's too long to fit on one line will be returned
502
    # verbatim, including the endline and the single-space indentation that starts the second line. Thus, we need to
503
    # remove those things ourselves.
504
    $rrule = trim(preg_replace('/\s/', '', $vcalendar_component->createRrule()));
505
    $rdate = trim(preg_replace('/\s/', '', $vcalendar_component->createRdate()));
506
    $exrule = trim(preg_replace('/\s/', '', $vcalendar_component->createExrule()));
507
    $exdate = trim(preg_replace('/\s/', '', $vcalendar_component->createExdate()));
508

  
492 509
    return "$rrule|$rdate|$exrule|$exdate";
493 510
  }
494 511

  
drupal7/sites/all/modules/date_ical/libraries/windowsZones.json
5 5
      "_number": "$Revision: 9178 $"
6 6
    },
7 7
    "generation": {
8
      "_date": "$Date: 2013-08-08 13:59:22 -0500 (Thu, 08 Aug 2013) $"
8
      "_date": "$Date: 2016-03-16 13:59:22 -0500 (Wed, 16 Mar 2016) $"
9 9
    },
10 10
    "windowsZones": {
11 11
      "mapTimezones": [
......
158 158
        },
159 159
        {
160 160
          "mapZone": {
161
            "_other": "Greenwich Standard Time",
161
            "_other": "Morocco Standard Time",
162 162
            "_territory": "EH",
163 163
            "_type": "Africa/El_Aaiun"
164 164
          }
......
426 426
          "mapZone": {
427 427
            "_other": "Alaskan Standard Time",
428 428
            "_territory": "US",
429
            "_type": "America/Anchorage America/Juneau America/Nome America/Sitka America/Yakutat"
429
            "_type": "America/Anchorage America/Juneau America/Metlakatla America/Nome America/Sitka America/Yakutat"
430 430
          }
431 431
        },
432 432
        {
......
527 527
            "_type": "America/Buenos_Aires America/Argentina/La_Rioja America/Argentina/Rio_Gallegos America/Argentina/Salta America/Argentina/San_Juan America/Argentina/San_Luis America/Argentina/Tucuman America/Argentina/Ushuaia America/Catamarca America/Cordoba America/Jujuy America/Mendoza"
528 528
          }
529 529
        },
530
        {
531
          "mapZone": {
532
            "_other": "Eastern Standard Time (Mexico)",
533
            "_territory": "001",
534
            "_type": "America/Cancun"
535
          }
536
        },
537
        {
538
          "mapZone": {
539
            "_other": "Eastern Standard Time (Mexico)",
540
            "_territory": "MX",
541
            "_type": "America/Cancun"
542
          }
543
        },
530 544
        {
531 545
          "mapZone": {
532 546
            "_other": "Venezuela Standard Time",
......
636 650
          "mapZone": {
637 651
            "_other": "US Mountain Standard Time",
638 652
            "_territory": "CA",
639
            "_type": "America/Dawson_Creek America/Creston"
653
            "_type": "America/Dawson_Creek America/Creston America/Fort_Nelson"
640 654
          }
641 655
        },
642 656
        {
......
650 664
          "mapZone": {
651 665
            "_other": "Mountain Standard Time",
652 666
            "_territory": "US",
653
            "_type": "America/Denver America/Boise America/Shiprock"
667
            "_type": "America/Denver America/Boise"
654 668
          }
655 669
        },
656 670
        {
......
678 692
          "mapZone": {
679 693
            "_other": "SA Eastern Standard Time",
680 694
            "_territory": "BR",
681
            "_type": "America/Fortaleza America/Belem America/Maceio America/Recife America/Santarem"
695
            "_type": "America/Fortaleza America/Araguaina America/Belem America/Maceio America/Recife America/Santarem"
682 696
          }
683 697
        },
684 698
        {
......
697 711
        },
698 712
        {
699 713
          "mapZone": {
700
            "_other": "Eastern Standard Time",
714
            "_other": "SA Western Standard Time",
701 715
            "_territory": "TC",
702 716
            "_type": "America/Grand_Turk"
703 717
          }
......
853 867
          "mapZone": {
854 868
            "_other": "SA Western Standard Time",
855 869
            "_territory": "BR",
856
            "_type": "America/Manaus America/Boa_Vista America/Eirunepe America/Porto_Velho America/Rio_Branco"
870
            "_type": "America/Manaus America/Boa_Vista America/Porto_Velho"
857 871
          }
858 872
        },
859 873
        {
......
888 902
          "mapZone": {
889 903
            "_other": "Central Standard Time (Mexico)",
890 904
            "_territory": "MX",
891
            "_type": "America/Mexico_City America/Bahia_Banderas America/Cancun America/Merida America/Monterrey"
905
            "_type": "America/Mexico_City America/Bahia_Banderas America/Merida America/Monterrey"
892 906
          }
893 907
        },
894 908
        {
......
977 991
        },
978 992
        {
979 993
          "mapZone": {
980
            "_other": "SA Western Standard Time",
981
            "_territory": "TT",
982
            "_type": "America/Port_of_Spain"
994
            "_other": "Eastern Standard Time",
995
            "_territory": "HT",
996
            "_type": "America/Port-au-Prince"
983 997
          }
984 998
        },
985 999
        {
986 1000
          "mapZone": {
987
            "_other": "Eastern Standard Time",
988
            "_territory": "HT",
989
            "_type": "America/Port-au-Prince"
1001
            "_other": "SA Western Standard Time",
1002
            "_territory": "TT",
1003
            "_type": "America/Port_of_Spain"
990 1004
          }
991 1005
        },
992 1006
        {
......
1012 1026
        },
1013 1027
        {
1014 1028
          "mapZone": {
1015
            "_other": "Pacific Standard Time (Mexico)",
1016
            "_territory": "001",
1017
            "_type": "America/Santa_Isabel"
1018
          }
1019
        },
1020
        {
1021
          "mapZone": {
1022
            "_other": "Pacific Standard Time (Mexico)",
1023
            "_territory": "MX",
1024
            "_type": "America/Santa_Isabel"
1029
            "_other": "SA Pacific Standard Time",
1030
            "_territory": "BR",
1031
            "_type": "America/Rio_Branco America/Eirunepe"
1025 1032
          }
1026 1033
        },
1027 1034
        {
......
1056 1063
          "mapZone": {
1057 1064
            "_other": "E. South America Standard Time",
1058 1065
            "_territory": "BR",
1059
            "_type": "America/Sao_Paulo America/Araguaina"
1066
            "_type": "America/Sao_Paulo"
1060 1067
          }
1061 1068
        },
1062 1069
        {
......
1133 1140
          "mapZone": {
1134 1141
            "_other": "Pacific Standard Time",
1135 1142
            "_territory": "MX",
1136
            "_type": "America/Tijuana"
1143
            "_type": "America/Tijuana America/Santa_Isabel"
1137 1144
          }
1138 1145
        },
1139 1146
        {
......
1201 1208
        },
1202 1209
        {
1203 1210
          "mapZone": {
1204
            "_other": "Pacific SA Standard Time",
1211
            "_other": "New Zealand Standard Time",
1205 1212
            "_territory": "AQ",
1206
            "_type": "Antarctica/Palmer"
1213
            "_type": "Antarctica/McMurdo"
1207 1214
          }
1208 1215
        },
1209 1216
        {
1210 1217
          "mapZone": {
1211
            "_other": "SA Eastern Standard Time",
1218
            "_other": "Pacific SA Standard Time",
1212 1219
            "_territory": "AQ",
1213
            "_type": "Antarctica/Rothera"
1220
            "_type": "Antarctica/Palmer"
1214 1221
          }
1215 1222
        },
1216 1223
        {
1217 1224
          "mapZone": {
1218
            "_other": "New Zealand Standard Time",
1225
            "_other": "SA Eastern Standard Time",
1219 1226
            "_territory": "AQ",
1220
            "_type": "Antarctica/South_Pole Antarctica/McMurdo"
1227
            "_type": "Antarctica/Rothera"
1221 1228
          }
1222 1229
        },
1223 1230
        {
......
1451 1458
            "_type": "Asia/Hong_Kong"
1452 1459
          }
1453 1460
        },
1454
        {
1455
          "mapZone": {
1456
            "_other": "SE Asia Standard Time",
1457
            "_territory": "MN",
1458
            "_type": "Asia/Hovd"
1459
          }
1460
        },
1461 1461
        {
1462 1462
          "mapZone": {
1463 1463
            "_other": "North Asia East Standard Time",
......
1514 1514
            "_type": "Asia/Kabul"
1515 1515
          }
1516 1516
        },
1517
        {
1518
          "mapZone": {
1519
            "_other": "Russia Time Zone 11",
1520
            "_territory": "001",
1521
            "_type": "Asia/Kamchatka"
1522
          }
1523
        },
1524
        {
1525
          "mapZone": {
1526
            "_other": "Russia Time Zone 11",
1527
            "_territory": "RU",
1528
            "_type": "Asia/Kamchatka Asia/Anadyr"
1529
          }
1530
        },
1517 1531
        {
1518 1532
          "mapZone": {
1519 1533
            "_other": "Pakistan Standard Time",
......
1553 1567
          "mapZone": {
1554 1568
            "_other": "North Asia Standard Time",
1555 1569
            "_territory": "RU",
1556
            "_type": "Asia/Krasnoyarsk"
1570
            "_type": "Asia/Krasnoyarsk Asia/Novokuznetsk"
1557 1571
          }
1558 1572
        },
1559 1573
        {
......
1588 1602
          "mapZone": {
1589 1603
            "_other": "Magadan Standard Time",
1590 1604
            "_territory": "RU",
1591
            "_type": "Asia/Magadan Asia/Anadyr Asia/Kamchatka"
1605
            "_type": "Asia/Magadan"
1592 1606
          }
1593 1607
        },
1594 1608
        {
......
1614 1628
        },
1615 1629
        {
1616 1630
          "mapZone": {
1617
            "_other": "E. Europe Standard Time",
1618
            "_territory": "001",
1619
            "_type": "Asia/Nicosia"
1620
          }
1621
        },
1622
        {
1623
          "mapZone": {
1624
            "_other": "E. Europe Standard Time",
1631
            "_other": "GTB Standard Time",
1625 1632
            "_territory": "CY",
1626 1633
            "_type": "Asia/Nicosia"
1627 1634
          }
......
1637 1644
          "mapZone": {
1638 1645
            "_other": "N. Central Asia Standard Time",
1639 1646
            "_territory": "RU",
1640
            "_type": "Asia/Novosibirsk Asia/Novokuznetsk Asia/Omsk"
1647
            "_type": "Asia/Novosibirsk Asia/Omsk"
1641 1648
          }
1642 1649
        },
1643 1650
        {
......
1656 1663
        },
1657 1664
        {
1658 1665
          "mapZone": {
1659
            "_other": "Korea Standard Time",
1666
            "_other": "North Korea Standard Time",
1667
            "_territory": "001",
1668
            "_type": "Asia/Pyongyang"
1669
          }
1670
        },
1671
        {
1672
          "mapZone": {
1673
            "_other": "North Korea Standard Time",
1660 1674
            "_territory": "KP",
1661 1675
            "_type": "Asia/Pyongyang"
1662 1676
          }
......
1728 1742
          "mapZone": {
1729 1743
            "_other": "China Standard Time",
1730 1744
            "_territory": "CN",
1731
            "_type": "Asia/Shanghai Asia/Chongqing Asia/Harbin Asia/Kashgar Asia/Urumqi"
1745
            "_type": "Asia/Shanghai"
1732 1746
          }
1733 1747
        },
1734 1748
        {
......
1745 1759
            "_type": "Asia/Singapore"
1746 1760
          }
1747 1761
        },
1762
        {
1763
          "mapZone": {
1764
            "_other": "Russia Time Zone 10",
1765
            "_territory": "001",
1766
            "_type": "Asia/Srednekolymsk"
1767
          }
1768
        },
1769
        {
1770
          "mapZone": {
1771
            "_other": "Russia Time Zone 10",
1772
            "_territory": "RU",
1773
            "_type": "Asia/Srednekolymsk"
1774
          }
1775
        },
1748 1776
        {
1749 1777
          "mapZone": {
1750 1778
            "_other": "Taipei Standard Time",
......
1836 1864
            "_type": "Asia/Ulaanbaatar Asia/Choibalsan"
1837 1865
          }
1838 1866
        },
1867
        {
1868
          "mapZone": {
1869
            "_other": "Central Asia Standard Time",
1870
            "_territory": "CN",
1871
            "_type": "Asia/Urumqi"
1872
          }
1873
        },
1839 1874
        {
1840 1875
          "mapZone": {
1841 1876
            "_other": "SE Asia Standard Time",
......
1868 1903
          "mapZone": {
1869 1904
            "_other": "Yakutsk Standard Time",
1870 1905
            "_territory": "RU",
1871
            "_type": "Asia/Yakutsk Asia/Khandyga"
1906
            "_type": "Asia/Yakutsk Asia/Chita Asia/Khandyga"
1872 1907
          }
1873 1908
        },
1874 1909
        {
......
2097 2132
        },
2098 2133
        {
2099 2134
          "mapZone": {
2100
            "_other": "W. Central Africa Standard Time",
2135
            "_other": "Cape Verde Standard Time",
2101 2136
            "_territory": "ZZ",
2102
            "_type": "Etc/GMT-1"
2137
            "_type": "Etc/GMT+1"
2103 2138
          }
2104 2139
        },
2105 2140
        {
2106 2141
          "mapZone": {
2107
            "_other": "South Africa Standard Time",
2142
            "_other": "Hawaiian Standard Time",
2108 2143
            "_territory": "ZZ",
2109
            "_type": "Etc/GMT-2"
2144
            "_type": "Etc/GMT+10"
2110 2145
          }
2111 2146
        },
2112 2147
        {
2113 2148
          "mapZone": {
2114
            "_other": "E. Africa Standard Time",
2115
            "_territory": "ZZ",
2116
            "_type": "Etc/GMT-3"
2149
            "_other": "UTC-11",
2150
            "_territory": "001",
2151
            "_type": "Etc/GMT+11"
2117 2152
          }
2118 2153
        },
2119 2154
        {
2120 2155
          "mapZone": {
2121
            "_other": "Arabian Standard Time",
2156
            "_other": "UTC-11",
2122 2157
            "_territory": "ZZ",
2123
            "_type": "Etc/GMT-4"
2158
            "_type": "Etc/GMT+11"
2124 2159
          }
2125 2160
        },
2126 2161
        {
2127 2162
          "mapZone": {
2128
            "_other": "West Asia Standard Time",
2129
            "_territory": "ZZ",
2130
            "_type": "Etc/GMT-5"
2163
            "_other": "Dateline Standard Time",
2164
            "_territory": "001",
2165
            "_type": "Etc/GMT+12"
2131 2166
          }
2132 2167
        },
2133 2168
        {
2134 2169
          "mapZone": {
2135
            "_other": "Central Asia Standard Time",
2170
            "_other": "Dateline Standard Time",
2136 2171
            "_territory": "ZZ",
2137
            "_type": "Etc/GMT-6"
2172
            "_type": "Etc/GMT+12"
2138 2173
          }
2139 2174
        },
2140 2175
        {
2141 2176
          "mapZone": {
2142
            "_other": "SE Asia Standard Time",
2177
            "_other": "UTC-02",
2178
            "_territory": "001",
2179
            "_type": "Etc/GMT+2"
2180
          }
2181
        },
2182
        {
2183
          "mapZone": {
2184
            "_other": "UTC-02",
2143 2185
            "_territory": "ZZ",
2144
            "_type": "Etc/GMT-7"
2186
            "_type": "Etc/GMT+2"
2145 2187
          }
2146 2188
        },
2147 2189
        {
2148 2190
          "mapZone": {
2149
            "_other": "Singapore Standard Time",
2191
            "_other": "SA Eastern Standard Time",
2150 2192
            "_territory": "ZZ",
2151
            "_type": "Etc/GMT-8"
2193
            "_type": "Etc/GMT+3"
2152 2194
          }
2153 2195
        },
2154 2196
        {
2155 2197
          "mapZone": {
2156
            "_other": "Tokyo Standard Time",
2198
            "_other": "SA Western Standard Time",
2157 2199
            "_territory": "ZZ",
2158
            "_type": "Etc/GMT-9"
2200
            "_type": "Etc/GMT+4"
2159 2201
          }
2160 2202
        },
2161 2203
        {
2162 2204
          "mapZone": {
2163
            "_other": "West Pacific Standard Time",
2205
            "_other": "SA Pacific Standard Time",
2164 2206
            "_territory": "ZZ",
2165
            "_type": "Etc/GMT-10"
2207
            "_type": "Etc/GMT+5"
2166 2208
          }
2167 2209
        },
2168 2210
        {
2169 2211
          "mapZone": {
2170
            "_other": "Central Pacific Standard Time",
2212
            "_other": "Central America Standard Time",
2171 2213
            "_territory": "ZZ",
2172
            "_type": "Etc/GMT-11"
2214
            "_type": "Etc/GMT+6"
2173 2215
          }
2174 2216
        },
2175 2217
        {
2176 2218
          "mapZone": {
2177
            "_other": "UTC+12",
2178
            "_territory": "001",
2179
            "_type": "Etc/GMT-12"
2219
            "_other": "US Mountain Standard Time",
2220
            "_territory": "ZZ",
2221
            "_type": "Etc/GMT+7"
2180 2222
          }
2181 2223
        },
2182 2224
        {
2183 2225
          "mapZone": {
2184
            "_other": "UTC+12",
2226
            "_other": "W. Central Africa Standard Time",
2185 2227
            "_territory": "ZZ",
2186
            "_type": "Etc/GMT-12"
2228
            "_type": "Etc/GMT-1"
2187 2229
          }
2188 2230
        },
2189 2231
        {
2190 2232
          "mapZone": {
2191
            "_other": "Tonga Standard Time",
2233
            "_other": "West Pacific Standard Time",
2192 2234
            "_territory": "ZZ",
2193
            "_type": "Etc/GMT-13"
2235
            "_type": "Etc/GMT-10"
2194 2236
          }
2195 2237
        },
2196 2238
        {
2197 2239
          "mapZone": {
2198
            "_other": "Cape Verde Standard Time",
2240
            "_other": "Central Pacific Standard Time",
2199 2241
            "_territory": "ZZ",
2200
            "_type": "Etc/GMT+1"
2242
            "_type": "Etc/GMT-11"
2201 2243
          }
2202 2244
        },
2203 2245
        {
2204 2246
          "mapZone": {
2205
            "_other": "UTC-02",
2247
            "_other": "UTC+12",
2206 2248
            "_territory": "001",
2207
            "_type": "Etc/GMT+2"
2249
            "_type": "Etc/GMT-12"
2208 2250
          }
2209 2251
        },
2210 2252
        {
2211 2253
          "mapZone": {
2212
            "_other": "UTC-02",
2254
            "_other": "UTC+12",
2213 2255
            "_territory": "ZZ",
2214
            "_type": "Etc/GMT+2"
2256
            "_type": "Etc/GMT-12"
2215 2257
          }
2216 2258
        },
2217 2259
        {
2218 2260
          "mapZone": {
2219
            "_other": "SA Eastern Standard Time",
2261
            "_other": "Tonga Standard Time",
2220 2262
            "_territory": "ZZ",
2221
            "_type": "Etc/GMT+3"
2263
            "_type": "Etc/GMT-13"
2222 2264
          }
2223 2265
        },
2224 2266
        {
2225 2267
          "mapZone": {
2226
            "_other": "SA Western Standard Time",
2268
            "_other": "Line Islands Standard Time",
2227 2269
            "_territory": "ZZ",
2228
            "_type": "Etc/GMT+4"
2270
            "_type": "Etc/GMT-14"
2229 2271
          }
2230 2272
        },
2231 2273
        {
2232 2274
          "mapZone": {
2233
            "_other": "SA Pacific Standard Time",
2275
            "_other": "South Africa Standard Time",
2234 2276
            "_territory": "ZZ",
2235
            "_type": "Etc/GMT+5"
2277
            "_type": "Etc/GMT-2"
2236 2278
          }
2237 2279
        },
2238 2280
        {
2239 2281
          "mapZone": {
2240
            "_other": "Central America Standard Time",
2282
            "_other": "E. Africa Standard Time",
2241 2283
            "_territory": "ZZ",
2242
            "_type": "Etc/GMT+6"
2284
            "_type": "Etc/GMT-3"
2243 2285
          }
2244 2286
        },
2245 2287
        {
2246 2288
          "mapZone": {
2247
            "_other": "US Mountain Standard Time",
2289
            "_other": "Arabian Standard Time",
2248 2290
            "_territory": "ZZ",
2249
            "_type": "Etc/GMT+7"
2291
            "_type": "Etc/GMT-4"
2250 2292
          }
2251 2293
        },
2252 2294
        {
2253 2295
          "mapZone": {
2254
            "_other": "Hawaiian Standard Time",
2296
            "_other": "West Asia Standard Time",
2255 2297
            "_territory": "ZZ",
2256
            "_type": "Etc/GMT+10"
2298
            "_type": "Etc/GMT-5"
2257 2299
          }
2258 2300
        },
2259 2301
        {
2260 2302
          "mapZone": {
2261
            "_other": "UTC-11",
2262
            "_territory": "001",
2263
            "_type": "Etc/GMT+11"
2303
            "_other": "Central Asia Standard Time",
2304
            "_territory": "ZZ",
2305
            "_type": "Etc/GMT-6"
2264 2306
          }
2265 2307
        },
2266 2308
        {
2267 2309
          "mapZone": {
2268
            "_other": "UTC-11",
2310
            "_other": "SE Asia Standard Time",
2269 2311
            "_territory": "ZZ",
2270
            "_type": "Etc/GMT+11"
2312
            "_type": "Etc/GMT-7"
2271 2313
          }
2272 2314
        },
2273 2315
        {
2274 2316
          "mapZone": {
2275
            "_other": "Dateline Standard Time",
2276
            "_territory": "001",
2277
            "_type": "Etc/GMT+12"
2317
            "_other": "Singapore Standard Time",
2318
            "_territory": "ZZ",
2319
            "_type": "Etc/GMT-8"
2278 2320
          }
2279 2321
        },
2280 2322
        {
2281 2323
          "mapZone": {
2282
            "_other": "Dateline Standard Time",
2324
            "_other": "Tokyo Standard Time",
2283 2325
            "_territory": "ZZ",
2284
            "_type": "Etc/GMT+12"
2326
            "_type": "Etc/GMT-9"
2285 2327
          }
2286 2328
        },
2287 2329
        {
......
2370 2412
        },
2371 2413
        {
2372 2414
          "mapZone": {
2373
            "_other": "GTB Standard Time",
2415
            "_other": "E. Europe Standard Time",
2416
            "_territory": "001",
2417
            "_type": "Europe/Chisinau"
2418
          }
2419
        },
2420
        {
2421
          "mapZone": {
2422
            "_other": "E. Europe Standard Time",
2374 2423
            "_territory": "MD",
2375 2424
            "_type": "Europe/Chisinau"
2376 2425
          }
......
2463 2512
          "mapZone": {
2464 2513
            "_other": "FLE Standard Time",
2465 2514
            "_territory": "UA",
2466
            "_type": "Europe/Kiev Europe/Simferopol Europe/Uzhgorod Europe/Zaporozhye"
2515
            "_type": "Europe/Kiev Europe/Uzhgorod Europe/Zaporozhye"
2467 2516
          }
2468 2517
        },
2469 2518
        {
......
2524 2573
        },
2525 2574
        {
2526 2575
          "mapZone": {
2527
            "_other": "Kaliningrad Standard Time",
2576
            "_other": "Belarus Standard Time",
2577
            "_territory": "001",
2578
            "_type": "Europe/Minsk"
2579
          }
2580
        },
2581
        {
2582
          "mapZone": {
2583
            "_other": "Belarus Standard Time",
2528 2584
            "_territory": "BY",
2529 2585
            "_type": "Europe/Minsk"
2530 2586
          }
......
2547 2603
          "mapZone": {
2548 2604
            "_other": "Russian Standard Time",
2549 2605
            "_territory": "RU",
2550
            "_type": "Europe/Moscow Europe/Samara Europe/Volgograd"
2606
            "_type": "Europe/Moscow Europe/Simferopol Europe/Volgograd"
2551 2607
          }
2552 2608
        },
2553 2609
        {
......
2599 2655
            "_type": "Europe/Rome"
2600 2656
          }
2601 2657
        },
2658
        {
2659
          "mapZone": {
2660
            "_other": "Russia Time Zone 3",
2661
            "_territory": "001",
2662
            "_type": "Europe/Samara"
2663
          }
2664
        },
2665
        {
2666
          "mapZone": {
2667
            "_other": "Russia Time Zone 3",
2668
            "_territory": "RU",
2669
            "_type": "Europe/Samara"
2670
          }
2671
        },
2602 2672
        {
2603 2673
          "mapZone": {
2604 2674
            "_other": "W. Europe Standard Time",
......
2795 2865
            "_type": "MST7MDT"
2796 2866
          }
2797 2867
        },
2868
        {
2869
          "mapZone": {
2870
            "_other": "Pacific Standard Time",
2871
            "_territory": "ZZ",
2872
            "_type": "PST8PDT"
2873
          }
2874
        },
2798 2875
        {
2799 2876
          "mapZone": {
2800 2877
            "_other": "Samoa Standard Time",
......
2823 2900
            "_type": "Pacific/Auckland"
2824 2901
          }
2825 2902
        },
2903
        {
2904
          "mapZone": {
2905
            "_other": "Central Pacific Standard Time",
2906
            "_territory": "PG",
2907
            "_type": "Pacific/Bougainville"
2908
          }
2909
        },
2910
        {
2911
          "mapZone": {
2912
            "_other": "SA Pacific Standard Time",
2913
            "_territory": "CL",
2914
            "_type": "Pacific/Easter"
2915
          }
2916
        },
2826 2917
        {
2827 2918
          "mapZone": {
2828 2919
            "_other": "Central Pacific Standard Time",
......
2914 3005
            "_type": "Pacific/Johnston"
2915 3006
          }
2916 3007
        },
3008
        {
3009
          "mapZone": {
3010
            "_other": "Line Islands Standard Time",
3011
            "_territory": "001",
3012
            "_type": "Pacific/Kiritimati"
3013
          }
3014
        },
3015
        {
3016
          "mapZone": {
3017
            "_other": "Line Islands Standard Time",
3018
            "_territory": "KI",
3019
            "_type": "Pacific/Kiritimati"
3020
          }
3021
        },
2917 3022
        {
2918 3023
          "mapZone": {
2919 3024
            "_other": "UTC+12",
......
2942 3047
            "_type": "Pacific/Niue"
2943 3048
          }
2944 3049
        },
3050
        {
3051
          "mapZone": {
3052
            "_other": "Central Pacific Standard Time",
3053
            "_territory": "NF",
3054
            "_type": "Pacific/Norfolk"
3055
          }
3056
        },
2945 3057
        {
2946 3058
          "mapZone": {
2947 3059
            "_other": "Central Pacific Standard Time",
......
3046 3158
            "_territory": "WF",
3047 3159
            "_type": "Pacific/Wallis"
3048 3160
          }
3049
        },
3050
        {
3051
          "mapZone": {
3052
            "_other": "Pacific Standard Time",
3053
            "_territory": "ZZ",
3054
            "_type": "PST8PDT"
3055
          }
3056 3161
        }
3057 3162
      ]
3058 3163
    }
drupal7/sites/all/modules/ds/ds.info
13 13
files[] = tests/ds.forms.test
14 14
configure = admin/structure/ds
15 15

  
16
; Information added by Drupal.org packaging script on 2016-02-11
17
version = "7.x-2.13"
16
; Information added by Drupal.org packaging script on 2016-04-26
17
version = "7.x-2.14"
18 18
core = "7.x"
19 19
project = "ds"
20
datestamp = "1455211441"
20
datestamp = "1461696967"
21 21

  
drupal7/sites/all/modules/ds/modules/ds_devel/ds_devel.info
5 5
dependencies[] = ds
6 6
dependencies[] = devel
7 7

  
8
; Information added by Drupal.org packaging script on 2016-02-11
9
version = "7.x-2.13"
8
; Information added by Drupal.org packaging script on 2016-04-26
9
version = "7.x-2.14"
10 10
core = "7.x"
11 11
project = "ds"
12
datestamp = "1455211441"
12
datestamp = "1461696967"
13 13

  
drupal7/sites/all/modules/ds/modules/ds_extras/ds_extras.info
5 5
dependencies[] = ds
6 6
configure = admin/structure/ds/list/extras
7 7

  
8
; Information added by Drupal.org packaging script on 2016-02-11
9
version = "7.x-2.13"
8
; Information added by Drupal.org packaging script on 2016-04-26
9
version = "7.x-2.14"
10 10
core = "7.x"
11 11
project = "ds"
12
datestamp = "1455211441"
12
datestamp = "1461696967"
13 13

  
drupal7/sites/all/modules/ds/modules/ds_format/ds_format.info
5 5
dependencies[] = ds
6 6
configure = admin/structure/ds/list/extras
7 7

  
8
; Information added by Drupal.org packaging script on 2016-02-11
9
version = "7.x-2.13"
8
; Information added by Drupal.org packaging script on 2016-04-26
9
version = "7.x-2.14"
10 10
core = "7.x"
11 11
project = "ds"
12
datestamp = "1455211441"
12
datestamp = "1461696967"
13 13

  
drupal7/sites/all/modules/ds/modules/ds_forms/ds_forms.info
4 4
package = "Display Suite"
5 5
dependencies[] = ds
6 6

  
7
; Information added by Drupal.org packaging script on 2016-02-11
8
version = "7.x-2.13"
7
; Information added by Drupal.org packaging script on 2016-04-26
8
version = "7.x-2.14"
9 9
core = "7.x"
10 10
project = "ds"
11
datestamp = "1455211441"
11
datestamp = "1461696967"
12 12

  
drupal7/sites/all/modules/ds/modules/ds_search/ds_search.info
5 5
dependencies[] = ds
6 6
configure = admin/structure/ds/list/search
7 7

  
8
; Information added by Drupal.org packaging script on 2016-02-11
9
version = "7.x-2.13"
8
; Information added by Drupal.org packaging script on 2016-04-26
9
version = "7.x-2.14"
10 10
core = "7.x"
11 11
project = "ds"
12
datestamp = "1455211441"
12
datestamp = "1461696967"
13 13

  
drupal7/sites/all/modules/ds/modules/ds_ui/ds_ui.info
4 4
package = "Display Suite"
5 5
dependencies[] = ds
6 6

  
7
; Information added by Drupal.org packaging script on 2016-02-11
8
version = "7.x-2.13"
7
; Information added by Drupal.org packaging script on 2016-04-26
8
version = "7.x-2.14"
9 9
core = "7.x"
10 10
project = "ds"
11
datestamp = "1455211441"
11
datestamp = "1461696967"
12 12

  
drupal7/sites/all/modules/ds/tests/ds_exportables_test/ds_exportables_test.info
4 4
core = 7.x
5 5
hidden = TRUE
6 6

  
7
; Information added by Drupal.org packaging script on 2016-02-11
8
version = "7.x-2.13"
7
; Information added by Drupal.org packaging script on 2016-04-26
8
version = "7.x-2.14"
9 9
core = "7.x"
10 10
project = "ds"
11
datestamp = "1455211441"
11
datestamp = "1461696967"
12 12

  
drupal7/sites/all/modules/ds/tests/ds_test.info
5 5
dependencies[] = ds_extras
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2016-02-11
9
version = "7.x-2.13"
8
; Information added by Drupal.org packaging script on 2016-04-26
9
version = "7.x-2.14"
10 10
core = "7.x"
11 11
project = "ds"
12
datestamp = "1455211441"
12
datestamp = "1461696967"
13 13

  
drupal7/sites/all/modules/fivestar/fivestar.info
4 4
core = 7.x
5 5
dependencies[] = votingapi
6 6
configure = admin/config/content/fivestar
7
files[] = fivestar.migrate.inc
7 8
files[] = test/fivestar.base.test
8 9
files[] = test/fivestar.field.test
9 10

  
10
; Information added by Drupal.org packaging script on 2014-03-17
11
version = "7.x-2.1"
11
; Information added by Drupal.org packaging script on 2016-04-23
12
version = "7.x-2.2"
12 13
core = "7.x"
13 14
project = "fivestar"
14
datestamp = "1395087839"
15
datestamp = "1461406444"
15 16

  
drupal7/sites/all/modules/fivestar/fivestar.module
69 69
function fivestar_permission() {
70 70
  return array(
71 71
    'rate content' => array(
72
      'title' => t('rate content'),
72
      'title' => t('Use Fivestar to rate content'),
73 73
    ),
74 74
  );
75 75
}
......
350 350
 * suggestion by ChristianAdamski in issue 1289832-3.
351 351
 */
352 352
function fivestar_form_comment_form_alter(&$form, &$form_state, $form_id) {
353
  $is_fivestar = FALSE;
353
  $fivestar_field_keys = array();
354 354
  if (isset($form['comment_output_below'])) {
355 355
    foreach($form['comment_output_below'] as $key => $value) {
356
      if (is_array($value) && !empty($value['#field_type'])) {
357
        if ($value['#field_type'] =='fivestar') {
358
          $is_fivestar = TRUE;
359
          $fivestar_key = $key;
360
        }
356
      if (is_array($value) && !empty($value['#field_type']) && $value['#field_type'] == 'fivestar') {
357
        $fivestar_field_keys[] = $key;
361 358
      }
362 359
    }
363 360
  }
364
  if ($is_fivestar) {
365
    unset($form['comment_output_below'][$fivestar_key]);
361
  if ($fivestar_field_keys) {
362
    foreach ($fivestar_field_keys as $key) {
363
      unset($form['comment_output_below'][$key]);
364
    }
366 365
  }
367 366
}
368 367

  
......
440 439

  
441 440
  $form_state['settings'] = $settings;
442 441

  
442
  // Define default settings.
443
  $default_settings = array(
444
    'allow_clear' => FALSE,
445
    // Taken from installation file.
446
    'allow_ownvote' => TRUE,
447
    'allow_revote' => TRUE,
448
    'autosubmit' => TRUE,
449
    'description' => '',
450
    'required' => FALSE,
451
    'stars' => 5,
452
    'tag' => 'vote',
453
    'widget' => array(
454
      'name' => 'default',
455
      'css' => 'default',
456
    ),
457
  );
458

  
459
  // Merge default settings.
460
  $settings = $settings + $default_settings;
461

  
443 462
  $form['vote'] = array(
444 463
    '#type' => 'fivestar',
445 464
    '#stars' => $settings['stars'],
446
    '#auto_submit' => isset($settings['autosubmit']) ? $settings['autosubmit'] : TRUE,
465
    '#auto_submit' => $settings['autosubmit'],
447 466
    '#allow_clear' => $settings['allow_clear'],
448 467
    '#allow_revote' => $settings['allow_revote'],
449 468
    '#allow_ownvote' => $settings['allow_ownvote'],
450
    '#required' => isset($settings['required']) ? $settings['required'] : FALSE,
451
    '#widget' => isset($settings['widget']) ? $settings['widget'] : array('name' => 'default', 'css' => 'default'),
469
    '#required' => $settings['required'],
470
    '#widget' => $settings['widget'],
452 471
    '#values' => $values,
453 472
    '#settings' => $settings,
454 473
    '#description' => $settings['description'],
......
498 517

  
499 518
  // We need to process the 'fivestar' element with the new values.
500 519
  $form['vote']['#values'] = $values;
501
  $new_element = fivestar_expand($form['vote']);
520
  // Also need to pass on form_state and the complete form, just like form_builder() does.
521
  $new_element = fivestar_expand($form['vote'], $form_state, $form_state['complete form']);
502 522
  // Update the description. Since it doesn't account of our cast vote above.
503 523
  // TODO: Look into all this, I honestly don't like it and it's a bit weird.
504 524
  $form['vote']['vote']['#description'] = isset($new_element['vote']['#description']) ? $new_element['vote']['#description'] : '';
......
549 569
/**
550 570
 * Process callback for fivestar_element -- see fivestar_element()
551 571
 */
552
function fivestar_expand($element) {
572
function fivestar_expand($element, $form_state, $complete_form) {
553 573
  if (!_fivestar_allow_vote($element)){
554 574
    $element['#input'] = FALSE;
555 575
  }
......
562 582
  $values = $element['#values'];
563 583
  $class[] = 'clearfix';
564 584

  
585
  $title = 'it';
586
  if (isset($element['#settings']['entity_id']) && isset($element['#settings']['entity_type'])) {
587
    $entity_id = $element['#settings']['entity_id'];
588
    $entity = entity_load($element['#settings']['entity_type'], array($entity_id));
589
    $entity = $entity[$entity_id];
590
    $title = $entity->title;
591
  } elseif (isset($complete_form['#node'])) {
592
    $title = $complete_form['#node']->title;
593
  }
565 594
  $options = array('-' => t('Select rating'));
566 595
  for ($i = 1; $i <= $element['#stars']; $i++) {
567 596
    $this_value = ceil($i * 100/$element['#stars']);
568
    $options[$this_value] = t('Give it @star/@count', array('@star' => $i, '@count' => $element['#stars']));
597
    $options[$this_value] = t('Give @title @star/@count', array('@title' => $title, '@star' => $i, '@count' => $element['#stars']));
569 598
  }
570 599
  // Display clear button only if enabled.
571 600
  if ($element['#allow_clear'] == TRUE) {
drupal7/sites/all/modules/fivestar/includes/fivestar.field.inc
80 80
  $form['allow_revote'] = array(
81 81
    '#type' => 'checkbox',
82 82
    '#title' => t('Allow users to re-vote on already voted content.'),
83
    '#default_value' => isset($instance['settings']['allow_revote']) ? $instance['settings']['allow_revote'] : FALSE,
83
    '#default_value' => isset($instance['settings']['allow_revote']) ? $instance['settings']['allow_revote'] : TRUE,
84 84
    '#return_value' => 1,
85 85
  );
86 86

  
87 87
  $form['allow_ownvote'] = array(
88 88
    '#type' => 'checkbox',
89 89
    '#title' => t('Allow users to vote on their own content.'),
90
    '#default_value' => isset($instance['settings']['allow_ownvote']) ? $instance['settings']['allow_ownvote'] : FALSE,
90
    '#default_value' => isset($instance['settings']['allow_ownvote']) ? $instance['settings']['allow_ownvote'] : TRUE,
91 91
    '#return_value' => 1,
92 92
  );
93 93

  
......
133 133
    else {
134 134
      $rating = (isset($items[$delta]['rating'])) ? $items[$delta]['rating'] : 0;
135 135
    }
136
    $target = _fivestar_field_target($entity, $field, $instance, $item, $langcode);    
136
    $target = _fivestar_field_target($entity, $field, $instance, $item, $langcode);
137 137
    if (!empty($target)) {
138 138
      if ($entity_type == 'comment' && $op == 'delete') {
139 139
        $target['vote_source'] = $entity->hostname;
......
358 358
      ),
359 359
    ),
360 360
    'fivestar_formatter_rating' => array(
361
      'label' => t('Rating (i.e. 4.2/5)'),
361
      'label' => t('Rating (e.g. 4.2/5)'),
362 362
      'field types' => array('fivestar'),
363 363
    ),
364 364
    'fivestar_formatter_percentage' => array(
365
      'label' => t('Percentage (i.e. 92)'),
365
      'label' => t('Percentage (e.g. 92)'),
366 366
      'field types' => array('fivestar'),
367 367
    ),
368 368
  );
drupal7/sites/all/modules/piwik/piwik.admin.inc
214 214
    ),
215 215
  );
216 216

  
217
  $colorbox_dependencies = '<div class="admin-requirements">';
218
  $colorbox_dependencies .= t('Requires: !module-list', array('!module-list' => (module_exists('colorbox') ? t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => 'Colorbox')) : t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => 'Colorbox')))));
219
  $colorbox_dependencies .= '</div>';
220

  
221
  $form['tracking']['linktracking']['piwik_trackcolorbox'] = array(
222
    '#type' => 'checkbox',
223
    '#title' => t('Track content in colorbox modal dialogs'),
224
    '#default_value' => variable_get('piwik_trackcolorbox', 1),
225
    '#description' => t('Enable to track the content shown in colorbox modal windows.') . $colorbox_dependencies,
226
    '#disabled' => (module_exists('colorbox') ? FALSE : TRUE),
227
  );
228

  
217 229
  // Message specific configurations.
218 230
  $form['tracking']['messagetracking'] = array(
219 231
    '#type' => 'fieldset',
......
476 488

  
477 489
/**
478 490
 * Layout for the custom variables table in the admin settings form.
491
 *
492
 * @param array $variables
493
 *   An array contains the form elements.
494
 *
495
 * @return string
496
 *   The rendered output.
479 497
 */
480 498
function theme_piwik_admin_custom_var_table($variables) {
481 499
  $form = $variables['form'];
......
537 555
  return $element;
538 556
}
539 557

  
558
/**
559
 * @param array $value
560
 *   An array of token values.
561
 *
562
 * @return array
563
 *   A unique array of invalid tokens.
564
 */
540 565
function _piwik_get_forbidden_tokens($value) {
541 566
  $invalid_tokens = array();
542 567
  $value_tokens = is_string($value) ? token_scan($value) : $value;
......
554 579
/**
555 580
 * Validate if a string contains forbidden tokens not allowed by privacy rules.
556 581
 *
557
 * @param $token_string
582
 * @param string $token_string
558 583
 *   A string with one or more tokens to be validated.
584
 *
559 585
 * @return boolean
560 586
 *   TRUE if blacklisted token has been found, otherwise FALSE.
561 587
 */
drupal7/sites/all/modules/piwik/piwik.admin.js
73 73
        vals.push(Drupal.t('Outbound links'));
74 74
        vals.push(Drupal.t('Downloads'));
75 75
      }
76
      if ($('input#edit-piwik-trackcolorbox', context).is(':checked')) {
77
        vals.push(Drupal.t('Colorbox'));
78
      }
76 79
      if (!vals.length) {
77 80
        return Drupal.t('Not tracked');
78 81
      }
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-11-29
9
version = "7.x-2.7"
8
; Information added by Drupal.org packaging script on 2016-04-23
9
version = "7.x-2.8"
10 10
core = "7.x"
11 11
project = "piwik"
12
datestamp = "1417276085"
12
datestamp = "1461442443"
13 13

  
drupal7/sites/all/modules/piwik/piwik.install
36 36
  variable_del('piwik_roles');
37 37
  variable_del('piwik_site_id');
38 38
  variable_del('piwik_site_search');
39
  variable_del('piwik_trackcolorbox');
39 40
  variable_del('piwik_trackmailto');
40 41
  variable_del('piwik_track'); // interrims solution
41 42
  variable_del('piwik_trackfiles_extensions');
......
67 68
  $t = get_t();
68 69

  
69 70
  switch ($phase) {
70
    case 'runtime' :
71
    case 'runtime':
71 72
      // Module cannot validate piwik URL without external HTTP requests.
72 73
      if (variable_get('drupal_http_request_fails', TRUE) && !system_check_http_request()) {
73
        $requirements['http requests'] = array(
74
        $requirements['piwik_http_requests'] = array(
74 75
          'title' => $t('HTTP request status'),
75 76
          'value' => $t('Fails'),
76 77
          'severity' => REQUIREMENT_ERROR,
drupal7/sites/all/modules/piwik/piwik.js
19 19

  
20 20
  // Colorbox: This event triggers when the transition has completed and the
21 21
  // newly loaded content has been revealed.
22
  $(document).bind("cbox_complete", function () {
23
    var href = $.colorbox.element().attr("href");
24
    if (href) {
25
      _paq.push(["setCustomUrl", href]);
26
      _paq.push(["trackPageView"]);
27
    }
28
  });
22
  if (Drupal.settings.piwik.trackColorbox) {
23
    $(document).bind("cbox_complete", function () {
24
      var href = $.colorbox.element().attr("href");
25
      if (href) {
26
        _paq.push(["setCustomUrl", href]);
27
        _paq.push(["trackPageView"]);
28
      }
29
    });
30
  }
29 31

  
30 32
});
31 33

  
drupal7/sites/all/modules/piwik/piwik.module
112 112
    $link_settings = array();
113 113
    $link_settings['trackMailto'] = variable_get('piwik_trackmailto', 1);
114 114

  
115
    if (module_exists('colorbox') && ($track_colorbox = variable_get('googleanalytics_trackcolorbox', 1))) {
116
      $link_settings['trackColorbox'] = $track_colorbox;
117
    }
118

  
115 119
    drupal_add_js(array('piwik' => $link_settings), 'setting');
116 120
    drupal_add_js(drupal_get_path('module', 'piwik') . '/piwik.js');
117 121

  
......
132 136

  
133 137
      if (!empty($titles)) {
134 138
        // Encode title, at least to keep "/" intact.
135
        $titles = array_map('urlencode', $titles);
139
        $titles = array_map('rawurlencode', $titles);
136 140

  
137 141
        $set_document_title = drupal_json_encode(implode('/', $titles));
138 142
      }
......
231 235
      // The USER_ID value should be a unique, persistent, and non-personally
232 236
      // identifiable string identifier that represents a user or signed-in
233 237
      // account across devices.
234
      $script .= '_paq.push(["setUserId", ' . drupal_json_encode(drupal_hmac_base64($user->uid, drupal_get_private_key() . drupal_get_hash_salt())) . ']);';
238
      $script .= '_paq.push(["setUserId", ' . drupal_json_encode(piwik_user_id_hash($user->uid)) . ']);';
235 239
    }
236 240

  
237 241
    // Set custom data.
......
348 352
  }
349 353
}
350 354

  
355
/**
356
 * Generate user id hash to implement USER_ID.
357
 *
358
 * The USER_ID value should be a unique, persistent, and non-personally
359
 * identifiable string identifier that represents a user or signed-in
360
 * account across devices.
361
 *
362
 * @param int $uid
363
 *   User id.
364
 *
365
 * @return string
366
 *   User id hash.
367
 */
368
function piwik_user_id_hash($uid) {
369
  return drupal_hmac_base64($uid, drupal_get_private_key() . drupal_get_hash_salt());
370
}
371

  
351 372
/**
352 373
 * Implements hook_field_extra_fields().
353 374
 */
drupal7/sites/all/modules/piwik/piwik.variable.inc
40 40

  
41 41
/**
42 42
 * Validate Piwik site ID variable.
43
 *
44
 * @param array $variable
45
 *
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff