diff options
author | mattab <matthieu.aubry@gmail.com> | 2018-01-19 02:04:22 +0300 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2018-01-19 02:04:22 +0300 |
commit | 24417051edd14a653755c966c8767599b6fa0834 (patch) | |
tree | d738d730dfe0434ce4b9a50044ba924aff5e2124 /plugins | |
parent | 65289709547f533bab68505f49627d7466a0745f (diff) | |
parent | f89cd439af7a0f8efb17b8b5b0ade56b93ba5ab7 (diff) |
git checkout -b danikachhour-totals 3.x-devMerge branch '3.x-dev' of github.com:matomo-org/matomo into 3.x-dev git pull
https://github.com/danikachhour/matomo.git totals
Diffstat (limited to 'plugins')
26 files changed, 241 insertions, 82 deletions
diff --git a/plugins/Annotations/stylesheets/annotations.less b/plugins/Annotations/stylesheets/annotations.less index eef8f9c478..6270ebbe05 100755 --- a/plugins/Annotations/stylesheets/annotations.less +++ b/plugins/Annotations/stylesheets/annotations.less @@ -15,7 +15,7 @@ .annotation-manager { text-align: left; - margin-top: 5px; + margin-top: 30px; .new-annotation-row { height: 145px; @@ -39,10 +39,19 @@ } } +span.annotation { + display: block; + font-size: 20px; + color: black; + font-style: normal; + text-align: left; + padding-left: 10px; +} + .annotations-header { display: inline-block; width: 128px; - text-align: right; + text-align: left; font-size: 12px; font-style: italic; margin-bottom: 8px; @@ -52,16 +61,24 @@ .annotation-controls { display: inline-block; - margin-left: 132px; + margin:0; + padding: 50px 0px 10px 10px; + color: transparent; +} + +.annotation-controls a:hover { + text-decoration: underline; } + .annotation-controls>a { - font-size: 11px; - font-style: italic; - color: @theme-color-text-lighter; + font-size:14px; + font-style: normal; + color: black; cursor: pointer; padding: 3px 0 6px 0; display: inline-block; + margin:0; } .annotation-controls>a:hover { @@ -74,15 +91,17 @@ .annotation-list table { width: 100%; + } .annotation-list-range { - display: inline-block; - font-size: 12px; + display: block; + font-size: 15px; font-style: italic; color: @theme-color-text-lighter; vertical-align: top; margin: 0 0 8px 8px; + padding-bottom: 20px; } .empty-annotation-list, .annotation-list .loadingPiwik { @@ -94,15 +113,16 @@ } .annotation-meta { - width: 128px; - text-align: right; + width: 159px; + text-align: left; vertical-align: top; font-size: 14px; + padding-top: 10px; } .annotation-user { - font-style: italic; - font-size: 11px; + font-style: normal; + font-size: 13px; color: @theme-color-text-light; } @@ -113,7 +133,7 @@ .annotation-period { display: inline-block; - font-style: italic; + font-style: normal; margin: 0 8px 8px 8px; vertical-align: top; } @@ -127,6 +147,7 @@ .annotation-enter-edit-mode { cursor: pointer; + font-size: 15px; } .annotation-edit, .new-annotation-edit { @@ -147,15 +168,15 @@ } .delete-annotation { - font-size: 12px; - font-style: italic; - color: red; + font-size: 15px; + color: #666666; text-decoration: none; - display: inline-block; + display: NONE; } .delete-annotation:hover { - text-decoration: underline; + color: #cc3300; + text-decoration: none; } .annotation-manager .submit { @@ -163,9 +184,11 @@ } .edit-annotation { - font-size: 10px; - color: @theme-color-text-lighter; + font-size: 13px; + color: black; font-style: italic; + padding: 6px 5px; + margin-top: -5px; } .edit-annotation:hover { @@ -202,3 +225,19 @@ border: 1px solid #e4e5e4; border-radius: 4px; } + +a.add-annotation { + margin: 0; +} + +td.padding { + padding: 1px 5px 6px 5px; +} + +td.wider { + width: 80px; +} + +a.font { + font-size: 14px; +} diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig index ab0a8a2ca6..c90e99a428 100755 --- a/plugins/Annotations/templates/_annotation.twig +++ b/plugins/Annotations/templates/_annotation.twig @@ -8,23 +8,32 @@ <img src="plugins/Morpheus/images/star_empty.png"/> {% endif %} </div> - <div class="annotation-period {% if annotation.canEditOrDelete %}annotation-enter-edit-mode{% endif %}">({{ annotation.date }})</div> + + <div class="annotation-period {% if annotation.canEditOrDelete %}annotation-enter-edit-mode{% endif %}">{{ annotation.date }}</div> {% if annotation.canEditOrDelete %} <div class="annotation-period-edit" style="display:none;"> - <a href="#">{{ annotation.date }}</a> + <a href="#" class= "font">{{ annotation.date }}</a> <div class="datepicker" style="display:none;"/> </div> {% endif %} </td> + + {% if annotation.user is defined and userLogin != 'anonymous' %} + <td class="annotation-user-cell"> + <span class="annotation-user">{{ annotation.user }}</span><br/> + + </td> + {% endif %} + + <td class="annotation-value"> <div class="annotation-view-mode"> <span {% if annotation.canEditOrDelete %}title="{{ 'Annotations_ClickToEdit'|translate }}" class="annotation-enter-edit-mode"{% endif %}>{{ annotation.note|raw }}</span> - {% if annotation.canEditOrDelete %} - <a href="#" class="edit-annotation annotation-enter-edit-mode" title="{{ 'Annotations_ClickToEdit'|translate }}">{{ 'General_Edit'|translate }}...</a> - {% endif %} </div> - {% if annotation.canEditOrDelete %} + + + {% if annotation.canEditOrDelete %} <div class="annotation-edit-mode" style="display:none;"> <div class="input-field"> <input class="annotation-edit browser-default" type="text" value="{{ annotation.note|raw }}"/> @@ -35,13 +44,19 @@ </div> {% endif %} </td> - {% if annotation.user is defined and userLogin != 'anonymous' %} - <td class="annotation-user-cell"> - <span class="annotation-user">{{ annotation.user }}</span><br/> - {% if annotation.canEditOrDelete %} - <a href="#" class="delete-annotation" style="display:none;" title="{{ 'Annotations_ClickToDelete'|translate }}">{{ 'General_Delete'|translate }}</a> - {% endif %} - </td> - {% endif %} -</tr> +<td class = "wider"> +{% if annotation.canEditOrDelete %} + + <span class="table-action edit-annotation annotation-enter-edit-mode" title="{{ 'Annotations_ClickToEdit'|translate }}"> + <span class="icon-edit"></span> + </span> + + <a class="delete-annotation" title="Delete"> + <span class="icon-delete"></span> + </a> +{% endif %} +</td> + + +</tr> diff --git a/plugins/Annotations/templates/_annotationList.twig b/plugins/Annotations/templates/_annotationList.twig index c5a0db951c..e7f8a503e3 100755 --- a/plugins/Annotations/templates/_annotationList.twig +++ b/plugins/Annotations/templates/_annotationList.twig @@ -5,18 +5,23 @@ {% endif %} <table> + + {% for annotation in annotations %} {% include "@Annotations/_annotation.twig" %} {% endfor %} + + <tr class="new-annotation-row" style="display:none;" data-date="{{ selectedDate }}"> <td class="annotation-meta"> <div class="annotation-star"> </div> <div class="annotation-period-edit"> - <a href="#">{{ selectedDate }}</a> + <a href="#" class="font">{{ selectedDate }}</a> <div class="datepicker" style="display:none;"/> </div> </td> + <td class="annotation-user-cell"><span class="annotation-user">{{ userLogin }}</span></td> <td class="annotation-value"> <div class="input-field"> <input type="text" value="" @@ -26,7 +31,6 @@ <input type="button" class="btn new-annotation-save" value="{{ 'General_Save'|translate }}"/> <input type="button" class="btn new-annotation-cancel" value="{{ 'General_Cancel'|translate }}"/> </td> - <td class="annotation-user-cell"><span class="annotation-user">{{ userLogin }}</span></td> </tr> </table> diff --git a/plugins/Annotations/templates/getAnnotationManager.twig b/plugins/Annotations/templates/getAnnotationManager.twig index e700e2cc5d..3a3899334d 100755 --- a/plugins/Annotations/templates/getAnnotationManager.twig +++ b/plugins/Annotations/templates/getAnnotationManager.twig @@ -4,7 +4,7 @@ {% endif %}> <div class="annotations-header"> - <span>{{ 'Annotations_Annotations'|translate }}</span> + <span class= "annotation">{{ 'Annotations_Annotations'|translate }}</span> </div> <div class="annotation-list-range">{{ startDatePretty }}{% if startDate != endDate %} — {{ endDatePretty }}{% endif %}</div> @@ -17,11 +17,16 @@ </div> <div class="annotation-controls"> + {% if canUserAddNotes %} - <a href="#" class="add-annotation" title="{{ 'Annotations_CreateNewAnnotation'|translate }}">{{ 'Annotations_CreateNewAnnotation'|translate }}</a> + <a class="add-annotation"> + <span class="icon-add"></span> + {{ 'Annotations_CreateNewAnnotation'|translate }} + </a> {% elseif userLogin == 'anonymous' %} <a href="index.php?module=Login">{{ 'Annotations_LoginToAnnotate'|translate }}</a> {% endif %} + </div> </div> diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index f432043548..fc5eaec066 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -406,5 +406,13 @@ class CoreHome extends \Piwik\Plugin $translationKeys[] = 'CoreHome_ShortcutCalendar'; $translationKeys[] = 'CoreHome_ShortcutSearch'; $translationKeys[] = 'CoreHome_ShortcutHelp'; + $translationKeys[] = 'CoreHome_HomeShortcut'; + $translationKeys[] = 'CoreHome_PageUpShortcutDescription'; + $translationKeys[] = 'CoreHome_EndShortcut'; + $translationKeys[] = 'CoreHome_PageDownShortcutDescription'; + + $translationKeys[] = 'CoreHome_MacPageUp'; + $translationKeys[] = 'CoreHome_MacPageDown'; + } } diff --git a/plugins/CoreHome/angularjs/selector/selector.directive.less b/plugins/CoreHome/angularjs/selector/selector.directive.less index 14382fd394..779d4c3b33 100644 --- a/plugins/CoreHome/angularjs/selector/selector.directive.less +++ b/plugins/CoreHome/angularjs/selector/selector.directive.less @@ -7,7 +7,7 @@ .font-default(11px, 12px); display: inline-block; width: 100%; - padding: 11px 19px 10px; + padding: 10px 15px 11px 13px; white-space: nowrap; cursor: pointer; text-transform: uppercase; @@ -23,7 +23,7 @@ } .icon { - padding-left: 6px; + padding-right: 6px; display: inline-block; vertical-align: top; @@ -33,7 +33,7 @@ } .icon:not(.icon-fixed) { - float: right; + float: left; &:after { clear:right; content: ' '; diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less index d9634a30f2..22ff6c205c 100644 --- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less +++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less @@ -4,9 +4,6 @@ } .siteSelector { a.title { - .icon.collapsed { - margin-top: -1px; - } .icon.collapsed.iconHidden { visibility: visible; } @@ -56,11 +53,11 @@ } .siteSelector.piwikSelector a.title { - padding: 11px 30px 10px 19px; + padding: 10px 15px 11px 13px; - .icon:not(.icon-fixed) { + /*.icon:not(.icon-fixed) { margin-right: -11px; - } + }*/ > span { max-width: 161px; diff --git a/plugins/CoreHome/javascripts/corehome.js b/plugins/CoreHome/javascripts/corehome.js index 76f6554573..3ae506f777 100755 --- a/plugins/CoreHome/javascripts/corehome.js +++ b/plugins/CoreHome/javascripts/corehome.js @@ -111,6 +111,24 @@ $( document ).ready(function() { } }); + var isMac = navigator.userAgent.indexOf('Mac OS X') != -1; + + if (isMac) { + list.append($('<dt />').text(_pk_translate("CoreHome_MacPageUp")).css('width','auto')); + } else { + list.append($('<dt />').text(_pk_translate("CoreHome_HomeShortcut")).css('width','auto')); + } + + list.append($('<dd />').text(_pk_translate('CoreHome_PageUpShortcutDescription'))); + + if (isMac) { + list.append($('<dt />').text(_pk_translate("CoreHome_MacPageDown")).css('width','auto')); + } else { + list.append($('<dt />').text(_pk_translate("CoreHome_EndShortcut")).css('width','auto')); + } + + list.append($('<dd />').text(_pk_translate('CoreHome_PageDownShortcutDescription'))); + piwikHelper.modalConfirm('#shortcuthelp'); }); -});
\ No newline at end of file +}); diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index 1ec3c66d1e..ff867de15a 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -18,10 +18,12 @@ "DonateCall2": "Matomo needs your continued support to grow and thrive.", "DonateCall3": "If you feel that Matomo has added significant value to your business or endeavour, %1$splease consider donating%2$s or %3$spurchasing a premium feature%4$s. Every penny will help.", "DonateFormInstructions": "Click on the slider to select an amount, then click subscribe to donate.", + "EndShortcut": "End", "ExceptionNotWhitelistedIP": "You cannot use this Matomo as your IP %s is not whitelisted", "ExcludeRowsWithLowPopulation": "All rows are shown %s Exclude low population", "ExternalHelp": "Help (opens in new tab)", "FlattenDataTable": "The report is hierarchical %s Make it flat", + "HomeShortcut": "Home", "HowMuchIsPiwikWorth": "How much is Matomo worth to you?", "IncludeRowsWithLowPopulation": "Rows with low population are hidden %s Show all rows", "InjectedHostEmailBody": "Hello, I tried to access Matomo today and encountered the unknown hostname warning.", @@ -66,6 +68,8 @@ "ClickRowToExpandOrContract": "Click this row to expand or contract the subtable.", "UndoPivotBySubtable": "This report has been pivoted %s Undo pivot", "NoSuchPage": "This page does not exist", + "PageUpShortcutDescription": "to get to the top of the page", + "PageDownShortcutDescription": "to get to the bottom of the page", "PivotBySubtable": "This report is not pivoted %1$s Pivot by %2$s", "SystemSummaryWidget": "System Summary", "SystemSummaryNWebsites": "%d websites", @@ -80,6 +84,9 @@ "OneClickUpdateNotPossibleAsMultiServerEnvironment": "The one-click update is not available as you are using Matomo with multiple servers. Please download the latest version from %1$s to proceed.", "AdblockIsMaybeUsed": "In case you are using an ad blocker, please disable it for this site to make sure Matomo works without any issues.", "ChangeCurrentWebsite": "Choose a website, currently selected website: %s", - "LeadingAnalyticsPlatformRespectsYourPrivacy": "The leading open analytics platform that respects your privacy." + "LeadingAnalyticsPlatformRespectsYourPrivacy": "The leading open analytics platform that respects your privacy.", + + "MacPageUp": "Fn + Left arrow", + "MacPageDown": "Fn + Right arrow" } } diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less index 11e4582c2b..0659b508c6 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less +++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less @@ -281,6 +281,9 @@ table.dataTable img { &:hover { text-decoration: underline; } + @media print{ + display: none; + } } .datatableRelatedReports { @@ -288,6 +291,9 @@ table.dataTable img { font-size: 12px; padding-bottom: 5px; margin-top: 6px; + @media print{ + display: none; + } } .datatableRelatedReports span { diff --git a/plugins/CoreHome/stylesheets/dataTable/_rowActions.less b/plugins/CoreHome/stylesheets/dataTable/_rowActions.less index 9bd0475d21..d6c445883e 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_rowActions.less +++ b/plugins/CoreHome/stylesheets/dataTable/_rowActions.less @@ -21,6 +21,9 @@ table.dataTable .dataTableRowActions a { color: @theme-color-text; } } + @media print{ + display: none; + } } table.dataTable .dataTableRowActions a.leftmost { diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less index 9d9c05d6c7..e21c560963 100644 --- a/plugins/CoreHome/stylesheets/layout.less +++ b/plugins/CoreHome/stylesheets/layout.less @@ -414,4 +414,3 @@ nav { margin-bottom: -20px !important; } } - diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index 23e07b87c0..c6fc807eec 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -5,8 +5,8 @@ {% set updateCheck %} <span id="updateCheckLinkContainer"> - {{ 'CoreHome_CheckForUpdates'|translate }} <span class="icon icon-fixed icon-reload"></span> + {{ 'CoreHome_CheckForUpdates'|translate }} </span> {% endset %} diff --git a/plugins/CoreVisualizations/stylesheets/jqplot.css b/plugins/CoreVisualizations/stylesheets/jqplot.css index 05a92a8e2f..41ffa2f960 100644 --- a/plugins/CoreVisualizations/stylesheets/jqplot.css +++ b/plugins/CoreVisualizations/stylesheets/jqplot.css @@ -160,7 +160,6 @@ a.rowevolution-startmulti { .rowevolution table.metrics td.text img { max-width: 16px; max-height: 16px; - vertical-align: bottom; } .multirowevolution table.metrics td.text { diff --git a/plugins/ExamplePlugin/README.md b/plugins/ExamplePlugin/README.md index fa70e946c8..f39a5b49fc 100644 --- a/plugins/ExamplePlugin/README.md +++ b/plugins/ExamplePlugin/README.md @@ -1,4 +1,4 @@ -# Piwik ExamplePlugin Plugin +# Matomo ExamplePlugin Plugin ## Description diff --git a/plugins/ExampleTheme/README.md b/plugins/ExampleTheme/README.md index 0cb889be35..d1f3f451d7 100644 --- a/plugins/ExampleTheme/README.md +++ b/plugins/ExampleTheme/README.md @@ -1,4 +1,4 @@ -# Piwik ExampleTheme Theme +# Matomo ExampleTheme Theme ## Description diff --git a/plugins/ExampleVisualization/README.md b/plugins/ExampleVisualization/README.md index 79c04726ff..a6adc19f8c 100644 --- a/plugins/ExampleVisualization/README.md +++ b/plugins/ExampleVisualization/README.md @@ -1,4 +1,4 @@ -# Piwik SimpleTableVisualizationExample Plugin +# Matomo SimpleTableVisualizationExample Plugin ## Description diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less index f2dfcc2302..a9b1e07088 100644 --- a/plugins/Live/stylesheets/live.less +++ b/plugins/Live/stylesheets/live.less @@ -275,6 +275,10 @@ a.visitor-log-visitor-profile-link { margin-top: -2px; margin-bottom: -3px; } + + @media print { + display: none; + } } .visitorLog { @@ -370,4 +374,20 @@ a.visitor-log-visitor-profile-link { .own-visitor-column { margin: 10px 0; } -}
\ No newline at end of file +} + +@media print{ + .col.s12.m3{ + width: 20%; + } + + .row .col.s12.own-visitor-column{ + width: 15%; + margin-top: 10px; + margin-bottom: 10px; + } + + .col.s12.m7.column { + width:65%; + } +} diff --git a/plugins/Morpheus/javascripts/piwikHelper.js b/plugins/Morpheus/javascripts/piwikHelper.js index 1206a9b569..777c726e53 100644 --- a/plugins/Morpheus/javascripts/piwikHelper.js +++ b/plugins/Morpheus/javascripts/piwikHelper.js @@ -248,6 +248,12 @@ var piwikHelper = { delete options.fixedFooter; } + if (options && !options.ready) { + options.ready = function () { + $(".modal.open a").focus(); + }; + } + domElem.show(); $content.openModal(options); }, diff --git a/plugins/Morpheus/stylesheets/ui/_cards.less b/plugins/Morpheus/stylesheets/ui/_cards.less index 4589d53999..01d3fc6bdf 100644 --- a/plugins/Morpheus/stylesheets/ui/_cards.less +++ b/plugins/Morpheus/stylesheets/ui/_cards.less @@ -7,6 +7,12 @@ h1, h2, h3, h4 { } } +.card.hoverable:hover{ + @media print{ + box-shadow:0 2px 5px 0 rgba(0,0,0,0.16), 0 2px 10px 0 rgba(0,0,0,0.12); + } +} + .card { h1, h2, h3, h4 { color: @theme-color-text; @@ -43,4 +49,4 @@ h1, h2, h3, h4 { .card-table + .tableActionBar { margin: 0 0 0 -20px; -}
\ No newline at end of file +} diff --git a/plugins/Morpheus/templates/maintenance.tpl b/plugins/Morpheus/templates/maintenance.tpl index 9d2cccab8f..edc16e32ad 100644 --- a/plugins/Morpheus/templates/maintenance.tpl +++ b/plugins/Morpheus/templates/maintenance.tpl @@ -23,7 +23,7 @@ <div class="content"> <p> - We will be back up and running again soon, so please try again later. Your analytics data will continue to be tracked as normal. Thank you for your patience. + We will be back up and running again soon, so please try again later. %trackMessage% Thank you for your patience. </p> </div> diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less index 5d24df1b1d..dccbb713ac 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less @@ -43,10 +43,28 @@ padding-bottom: 5px; } + @media print{ + .add_new_site{ + display: none; + } + + .row .col.s6{ + width: 100%; + } + + .row .col.s3{ + display: none; + } + + } + .site_search { padding: 0; text-align: center; border: 0 !important; + @media print{ + display: none; + } } .multisites-evolution, diff --git a/plugins/RssWidget/RssRenderer.php b/plugins/RssWidget/RssRenderer.php index 51c831cd4c..8673443216 100644 --- a/plugins/RssWidget/RssRenderer.php +++ b/plugins/RssWidget/RssRenderer.php @@ -46,8 +46,7 @@ class RssRenderer $content = Http::fetchRemoteFile($this->url); $rss = simplexml_load_string($content); } catch (\Exception $e) { - echo "Error while importing feed: {$e->getMessage()}\n"; - exit; + throw new \Exception("Error while importing feed: {$e->getMessage()}\n"); } $output = '<div style="padding:10px 15px;"><ul class="rss">'; diff --git a/plugins/RssWidget/Widgets/RssChangelog.php b/plugins/RssWidget/Widgets/RssChangelog.php index 4f215fd6a6..9a58d0c367 100644 --- a/plugins/RssWidget/Widgets/RssChangelog.php +++ b/plugins/RssWidget/Widgets/RssChangelog.php @@ -20,20 +20,25 @@ class RssChangelog extends \Piwik\Widget\Widget $config->setName('Matomo Changelog'); } + private function getFeed($URL) { + $rss = new RssRenderer($URL); + $rss->setCountPosts(1); + $rss->showDescription(true); + $rss->showContent(false); + return $rss->get(); + } + public function render() - { + { try { - $rss = new RssRenderer('http://feeds.feedburner.com/PiwikReleases'); - $rss->setCountPosts(1); - $rss->showDescription(true); - $rss->showContent(false); - - return $rss->get(); - + return $this->getFeed('https://feeds.feedburner.com/PiwikReleases'); } catch (\Exception $e) { - - return $this->error($e); - } + try { + return $this->getFeed('http://feeds.feedburner.com/PiwikReleases'); + } catch (\Exception $e) { + return $this->error($e); + } + } } /** diff --git a/plugins/RssWidget/Widgets/RssPiwik.php b/plugins/RssWidget/Widgets/RssPiwik.php index 9cf78247a0..2234488c49 100644 --- a/plugins/RssWidget/Widgets/RssPiwik.php +++ b/plugins/RssWidget/Widgets/RssPiwik.php @@ -20,18 +20,23 @@ class RssPiwik extends \Piwik\Widget\Widget $config->setName('Matomo.org Blog'); } + private function getFeed($URL){ + $rss = new RssRenderer($URL); + $rss->showDescription(true); + return $rss->get(); + } + public function render() { try { - $rss = new RssRenderer('http://feeds.feedburner.com/Piwik'); - $rss->showDescription(true); - - return $rss->get(); - + return $this->getFeed('https://feeds.feedburner.com/Piwik'); } catch (\Exception $e) { - - return $this->error($e); - } + try { + return $this->getFeed('http://feeds.feedburner.com/Piwik'); + } catch (\Exception $e) { + return $this->error($e); + } + } } /** diff --git a/plugins/UserCountry/VisitorGeolocator.php b/plugins/UserCountry/VisitorGeolocator.php index 1c517075a1..67d84ee859 100644 --- a/plugins/UserCountry/VisitorGeolocator.php +++ b/plugins/UserCountry/VisitorGeolocator.php @@ -189,7 +189,7 @@ class VisitorGeolocator $this->logger->debug('Updating visit with idvisit = {idVisit} (IP = {ip}). Changes: {changes}', array( 'idVisit' => $idVisit, 'ip' => $ip, - 'changes' => $valuesToUpdate + 'changes' => json_encode($valuesToUpdate) )); $this->dao->updateVisits($valuesToUpdate, $idVisit); @@ -309,4 +309,4 @@ class VisitorGeolocator } return self::$defaultLocationCache; } -}
\ No newline at end of file +} |