Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2020-06-11 02:20:07 +0300
committerGitHub <noreply@github.com>2020-06-11 02:20:07 +0300
commit0834bbdbc6916ffbfeb62b92eaeeb6be76c5d260 (patch)
treef5a49ee83f70c82039626421d04a679d0823dc00 /plugins/Contents/tests/System/expected
parentf87703a606591de542c7e12c91a46a32088659d0 (diff)
Date factory test when date object is passed (#15998)
Diffstat (limited to 'plugins/Contents/tests/System/expected')
-rwxr-xr-x[-rw-r--r--]plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml84
-rwxr-xr-x[-rw-r--r--]plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml84
-rwxr-xr-x[-rw-r--r--]plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml84
-rwxr-xr-x[-rw-r--r--]plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml84
-rwxr-xr-x[-rw-r--r--]plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml84
5 files changed, 210 insertions, 210 deletions
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 5411be7201..918e17ddd3 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -2,10 +2,10 @@
<result>
<row>
<idSite>1</idSite>
- <idVisit>1</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
- <fingerprint>e16cf2bbaeea2c88</fingerprint>
+ <fingerprint>14db763aafccd039</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -14,7 +14,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>1</pageId>
+ <pageId>14</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -36,7 +36,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>2</pageId>
+ <pageId>15</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -58,7 +58,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>3</pageId>
+ <pageId>16</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -80,7 +80,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>4</pageId>
+ <pageId>17</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -102,7 +102,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>5</pageId>
+ <pageId>18</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -124,7 +124,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>6</pageId>
+ <pageId>19</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -146,7 +146,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>7</pageId>
+ <pageId>20</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -168,7 +168,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>8</pageId>
+ <pageId>21</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -190,7 +190,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>9</pageId>
+ <pageId>22</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -212,7 +212,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>10</pageId>
+ <pageId>23</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -234,7 +234,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>11</pageId>
+ <pageId>24</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -256,7 +256,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>12</pageId>
+ <pageId>25</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -278,7 +278,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>13</pageId>
+ <pageId>26</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -374,28 +374,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie, flash, java</plugins>
+ <plugins>cookie</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
- <pluginName>java</pluginName>
- </row>
</pluginsIcons>
</row>
<row>
<idSite>1</idSite>
- <idVisit>2</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
- <fingerprint>14db763aafccd039</fingerprint>
+ <fingerprint>e16cf2bbaeea2c88</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -404,7 +396,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>14</pageId>
+ <pageId>1</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -426,7 +418,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>15</pageId>
+ <pageId>2</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -448,7 +440,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>16</pageId>
+ <pageId>3</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -470,7 +462,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>17</pageId>
+ <pageId>4</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -492,7 +484,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>18</pageId>
+ <pageId>5</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -514,7 +506,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>19</pageId>
+ <pageId>6</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -536,7 +528,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>20</pageId>
+ <pageId>7</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -558,7 +550,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>21</pageId>
+ <pageId>8</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -580,7 +572,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>22</pageId>
+ <pageId>9</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -602,7 +594,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>23</pageId>
+ <pageId>10</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -624,7 +616,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>24</pageId>
+ <pageId>11</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -646,7 +638,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>25</pageId>
+ <pageId>12</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -668,7 +660,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>26</pageId>
+ <pageId>13</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -764,12 +756,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
</pluginsIcons>
</row>
</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 5411be7201..918e17ddd3 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<idSite>1</idSite>
- <idVisit>1</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
- <fingerprint>e16cf2bbaeea2c88</fingerprint>
+ <fingerprint>14db763aafccd039</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -14,7 +14,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>1</pageId>
+ <pageId>14</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -36,7 +36,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>2</pageId>
+ <pageId>15</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -58,7 +58,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>3</pageId>
+ <pageId>16</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -80,7 +80,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>4</pageId>
+ <pageId>17</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -102,7 +102,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>5</pageId>
+ <pageId>18</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -124,7 +124,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>6</pageId>
+ <pageId>19</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -146,7 +146,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>7</pageId>
+ <pageId>20</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -168,7 +168,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>8</pageId>
+ <pageId>21</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -190,7 +190,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>9</pageId>
+ <pageId>22</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -212,7 +212,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>10</pageId>
+ <pageId>23</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -234,7 +234,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>11</pageId>
+ <pageId>24</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -256,7 +256,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>12</pageId>
+ <pageId>25</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -278,7 +278,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>13</pageId>
+ <pageId>26</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -374,28 +374,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie, flash, java</plugins>
+ <plugins>cookie</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
- <pluginName>java</pluginName>
- </row>
</pluginsIcons>
</row>
<row>
<idSite>1</idSite>
- <idVisit>2</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
- <fingerprint>14db763aafccd039</fingerprint>
+ <fingerprint>e16cf2bbaeea2c88</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -404,7 +396,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>14</pageId>
+ <pageId>1</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -426,7 +418,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>15</pageId>
+ <pageId>2</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -448,7 +440,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>16</pageId>
+ <pageId>3</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -470,7 +462,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>17</pageId>
+ <pageId>4</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -492,7 +484,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>18</pageId>
+ <pageId>5</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -514,7 +506,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>19</pageId>
+ <pageId>6</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -536,7 +528,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>20</pageId>
+ <pageId>7</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -558,7 +550,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>21</pageId>
+ <pageId>8</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -580,7 +572,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>22</pageId>
+ <pageId>9</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -602,7 +594,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>23</pageId>
+ <pageId>10</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -624,7 +616,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>24</pageId>
+ <pageId>11</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -646,7 +638,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>25</pageId>
+ <pageId>12</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -668,7 +660,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>26</pageId>
+ <pageId>13</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -764,12 +756,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
</pluginsIcons>
</row>
</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 5411be7201..918e17ddd3 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -2,10 +2,10 @@
<result>
<row>
<idSite>1</idSite>
- <idVisit>1</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
- <fingerprint>e16cf2bbaeea2c88</fingerprint>
+ <fingerprint>14db763aafccd039</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -14,7 +14,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>1</pageId>
+ <pageId>14</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -36,7 +36,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>2</pageId>
+ <pageId>15</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -58,7 +58,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>3</pageId>
+ <pageId>16</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -80,7 +80,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>4</pageId>
+ <pageId>17</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -102,7 +102,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>5</pageId>
+ <pageId>18</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -124,7 +124,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>6</pageId>
+ <pageId>19</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -146,7 +146,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>7</pageId>
+ <pageId>20</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -168,7 +168,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>8</pageId>
+ <pageId>21</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -190,7 +190,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>9</pageId>
+ <pageId>22</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -212,7 +212,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>10</pageId>
+ <pageId>23</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -234,7 +234,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>11</pageId>
+ <pageId>24</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -256,7 +256,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>12</pageId>
+ <pageId>25</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -278,7 +278,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>13</pageId>
+ <pageId>26</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -374,28 +374,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie, flash, java</plugins>
+ <plugins>cookie</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
- <pluginName>java</pluginName>
- </row>
</pluginsIcons>
</row>
<row>
<idSite>1</idSite>
- <idVisit>2</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
- <fingerprint>14db763aafccd039</fingerprint>
+ <fingerprint>e16cf2bbaeea2c88</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -404,7 +396,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>14</pageId>
+ <pageId>1</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -426,7 +418,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>15</pageId>
+ <pageId>2</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -448,7 +440,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>16</pageId>
+ <pageId>3</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -470,7 +462,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>17</pageId>
+ <pageId>4</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -492,7 +484,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>18</pageId>
+ <pageId>5</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -514,7 +506,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>19</pageId>
+ <pageId>6</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -536,7 +528,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>20</pageId>
+ <pageId>7</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -558,7 +550,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>21</pageId>
+ <pageId>8</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -580,7 +572,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>22</pageId>
+ <pageId>9</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -602,7 +594,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>23</pageId>
+ <pageId>10</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -624,7 +616,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>24</pageId>
+ <pageId>11</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -646,7 +638,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>25</pageId>
+ <pageId>12</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -668,7 +660,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>26</pageId>
+ <pageId>13</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -764,12 +756,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
</pluginsIcons>
</row>
</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 5411be7201..918e17ddd3 100644..100755
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -2,10 +2,10 @@
<result>
<row>
<idSite>1</idSite>
- <idVisit>1</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
- <fingerprint>e16cf2bbaeea2c88</fingerprint>
+ <fingerprint>14db763aafccd039</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -14,7 +14,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>1</pageId>
+ <pageId>14</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -36,7 +36,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>2</pageId>
+ <pageId>15</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -58,7 +58,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>3</pageId>
+ <pageId>16</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -80,7 +80,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>4</pageId>
+ <pageId>17</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -102,7 +102,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>5</pageId>
+ <pageId>18</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -124,7 +124,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>6</pageId>
+ <pageId>19</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -146,7 +146,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>7</pageId>
+ <pageId>20</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -168,7 +168,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>8</pageId>
+ <pageId>21</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -190,7 +190,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>9</pageId>
+ <pageId>22</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -212,7 +212,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>10</pageId>
+ <pageId>23</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -234,7 +234,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>11</pageId>
+ <pageId>24</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -256,7 +256,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>12</pageId>
+ <pageId>25</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -278,7 +278,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>13</pageId>
+ <pageId>26</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -374,28 +374,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie, flash, java</plugins>
+ <plugins>cookie</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
- <pluginName>java</pluginName>
- </row>
</pluginsIcons>
</row>
<row>
<idSite>1</idSite>
- <idVisit>2</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
- <fingerprint>14db763aafccd039</fingerprint>
+ <fingerprint>e16cf2bbaeea2c88</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -404,7 +396,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>14</pageId>
+ <pageId>1</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -426,7 +418,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>15</pageId>
+ <pageId>2</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -448,7 +440,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>16</pageId>
+ <pageId>3</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -470,7 +462,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>17</pageId>
+ <pageId>4</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -492,7 +484,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>18</pageId>
+ <pageId>5</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -514,7 +506,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>19</pageId>
+ <pageId>6</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -536,7 +528,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>20</pageId>
+ <pageId>7</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -558,7 +550,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>21</pageId>
+ <pageId>8</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -580,7 +572,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>22</pageId>
+ <pageId>9</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -602,7 +594,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>23</pageId>
+ <pageId>10</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -624,7 +616,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>24</pageId>
+ <pageId>11</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -646,7 +638,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>25</pageId>
+ <pageId>12</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -668,7 +660,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>26</pageId>
+ <pageId>13</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -764,12 +756,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
</pluginsIcons>
</row>
</result> \ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 5411be7201..918e17ddd3 100644..100755
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -2,10 +2,10 @@
<result>
<row>
<idSite>1</idSite>
- <idVisit>1</idVisit>
- <visitIp>156.5.3.2</visitIp>
+ <idVisit>2</idVisit>
+ <visitIp>111.1.1.1</visitIp>
- <fingerprint>e16cf2bbaeea2c88</fingerprint>
+ <fingerprint>14db763aafccd039</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -14,7 +14,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>1</pageId>
+ <pageId>14</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -36,7 +36,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>2</pageId>
+ <pageId>15</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -58,7 +58,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>3</pageId>
+ <pageId>16</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -80,7 +80,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>4</pageId>
+ <pageId>17</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -102,7 +102,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>5</pageId>
+ <pageId>18</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -124,7 +124,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>6</pageId>
+ <pageId>19</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -146,7 +146,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>7</pageId>
+ <pageId>20</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -168,7 +168,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>8</pageId>
+ <pageId>21</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -190,7 +190,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>9</pageId>
+ <pageId>22</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -212,7 +212,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>10</pageId>
+ <pageId>23</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -234,7 +234,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>11</pageId>
+ <pageId>24</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -256,7 +256,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>12</pageId>
+ <pageId>25</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -278,7 +278,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>13</pageId>
+ <pageId>26</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -374,28 +374,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie, flash, java</plugins>
+ <plugins>cookie</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
- <pluginName>java</pluginName>
- </row>
</pluginsIcons>
</row>
<row>
<idSite>1</idSite>
- <idVisit>2</idVisit>
- <visitIp>111.1.1.1</visitIp>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
- <fingerprint>14db763aafccd039</fingerprint>
+ <fingerprint>e16cf2bbaeea2c88</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -404,7 +396,7 @@
<pageIdAction>2</pageIdAction>
- <pageId>14</pageId>
+ <pageId>1</pageId>
<pageLoadTime>1.15s</pageLoadTime>
<bandwidth />
<timeSpent>271</timeSpent>
@@ -426,7 +418,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>15</pageId>
+ <pageId>2</pageId>
<contentName>ImageAd</contentName>
<contentPiece>Unknown</contentPiece>
<contentTarget />
@@ -448,7 +440,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>16</pageId>
+ <pageId>3</pageId>
<contentName>ImageAd</contentName>
<contentPiece />
<contentTarget />
@@ -470,7 +462,7 @@
<timeSpentRef>120</timeSpentRef>
- <pageId>17</pageId>
+ <pageId>4</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -492,7 +484,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>18</pageId>
+ <pageId>5</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad2.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -514,7 +506,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>19</pageId>
+ <pageId>6</pageId>
<contentName>ImageAd</contentName>
<contentPiece>/path/ad.jpg</contentPiece>
<contentTarget>http://www.example.com</contentTarget>
@@ -536,7 +528,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>20</pageId>
+ <pageId>7</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -558,7 +550,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>21</pageId>
+ <pageId>8</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/</contentTarget>
@@ -580,7 +572,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>22</pageId>
+ <pageId>9</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -602,7 +594,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>23</pageId>
+ <pageId>10</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click NOW</contentPiece>
<contentTarget>http://piwik.org/download</contentTarget>
@@ -624,7 +616,7 @@
<timeSpentRef>60</timeSpentRef>
- <pageId>24</pageId>
+ <pageId>11</pageId>
<contentName>Text Ad</contentName>
<contentPiece>Click to download Piwik now</contentPiece>
<contentTarget />
@@ -646,7 +638,7 @@
<timeSpentRef>30</timeSpentRef>
- <pageId>25</pageId>
+ <pageId>12</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -668,7 +660,7 @@
<timeSpentRef>0</timeSpentRef>
- <pageId>26</pageId>
+ <pageId>13</pageId>
<contentName>Video Ad</contentName>
<contentPiece>movie.mov</contentPiece>
<contentTarget />
@@ -764,12 +756,20 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>cookie</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
<pluginName>cookie</pluginName>
</row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
</pluginsIcons>
</row>
</result> \ No newline at end of file