diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2018-01-10 21:45:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-10 21:45:20 +0300 |
commit | 82a9b1b0a01dc20928d50134233e167f0116472d (patch) | |
tree | a85fb5ecde6e9b9bacdd20f4310919daf674ab59 /misc | |
parent | 92cb21b63c7b971579a9f0e3da57cc7d425a3c4f (diff) |
Further Piwik.org => Matomo.org replacements (#12415)
* renaming more Piwik mentions
* some more updates
* fix some tests
* support matomo partially as require string
* fix tests
* fix failing system test
* fix tests
* fix system test
* fix test
Diffstat (limited to 'misc')
-rw-r--r-- | misc/How to install Piwik.html | 4 | ||||
-rw-r--r-- | misc/cron/archive.php | 4 | ||||
-rwxr-xr-x | misc/cron/archive.sh | 2 | ||||
-rw-r--r-- | misc/internal-docs/content-tracking.md | 2 | ||||
-rw-r--r-- | misc/others/api_rest_call.php | 2 | ||||
-rw-r--r-- | misc/others/uninstall-delete-piwik-directory.php | 2 | ||||
-rw-r--r-- | misc/others/widget_example_lastvisits.html | 2 | ||||
-rw-r--r-- | misc/user/index.html | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/misc/How to install Piwik.html b/misc/How to install Piwik.html index 9d1695b6e7..52a043927d 100644 --- a/misc/How to install Piwik.html +++ b/misc/How to install Piwik.html @@ -1,8 +1,8 @@ <html> <head> - <meta http-equiv="refresh" content="0;url=https://piwik.org/docs/installation/"/> + <meta http-equiv="refresh" content="0;url=https://matomo.org/docs/installation/"/> <meta name="robots" content="noindex,nofollow"> </head> -<body>You will be redirected to the Piwik Installation documentation on <a href='https://piwik.org/docs/installation/'>https://piwik.org/docs/installation/</a> +<body>You will be redirected to the Piwik Installation documentation on <a href='https://matomo.org/docs/installation/'>https://matomo.org/docs/installation/</a> </body> </html> diff --git a/misc/cron/archive.php b/misc/cron/archive.php index 97f5e51a86..dfe5e3a287 100644 --- a/misc/cron/archive.php +++ b/misc/cron/archive.php @@ -40,7 +40,7 @@ if (Piwik\Common::isPhpCliMode()) { Using this 'archive.php' script is no longer recommended. Please use '/path/to/php $piwikHome/console core:archive " . implode(' ', $_SERVER['argv']) . "' instead. To get help use '/path/to/php $piwikHome/console core:archive --help' -See also: https://piwik.org/docs/setup-auto-archiving/ +See also: https://matomo.org/docs/setup-auto-archiving/ If you cannot use the console because it requires CLI try 'php archive.php --url=http://your.piwik/path' @@ -60,7 +60,7 @@ try 'php archive.php --url=http://your.piwik/path' if(!isset($_GET['token_auth'])) { echo " <b>You must specify the Super User token_auth as a parameter to this script, eg. <code>?token_auth=XYZ</code> if you wish to run this script through the browser. </b><br> -However it is recommended to run it <a href='https://piwik.org/docs/setup-auto-archiving/'>via cron in the command line</a>, since it can take a long time to run.<br/> +However it is recommended to run it <a href='https://matomo.org/docs/setup-auto-archiving/'>via cron in the command line</a>, since it can take a long time to run.<br/> In a shell, execute for example the following to trigger archiving on the local Piwik server:<br/> <code>$ /path/to/php /path/to/piwik/console core:archive --url=http://your-website.org/path/to/piwik/</code> \n\n"; diff --git a/misc/cron/archive.sh b/misc/cron/archive.sh index e47a19b875..6b9a9d8ec6 100755 --- a/misc/cron/archive.sh +++ b/misc/cron/archive.sh @@ -32,7 +32,7 @@ PIWIK_PATH="$PIWIK_CRON_FOLDER"/../../console CONSOLE_CMD="$PHP_BIN -q $PIWIK_PATH core:archive --url=http://example.org" -MESSAGE="\n\n WARNING: this script archive.sh is DEPRECATED! \n\nPlease update your cron as explained in the documentation: https://piwik.org/docs/setup-auto-archiving/ \n\n" +MESSAGE="\n\n WARNING: this script archive.sh is DEPRECATED! \n\nPlease update your cron as explained in the documentation: https://matomo.org/docs/setup-auto-archiving/ \n\n" echo $MESSAGE; diff --git a/misc/internal-docs/content-tracking.md b/misc/internal-docs/content-tracking.md index 903ed32c8c..d6ad9a02cd 100644 --- a/misc/internal-docs/content-tracking.md +++ b/misc/internal-docs/content-tracking.md @@ -1,6 +1,6 @@ # Technical concept for implementing Content Tracking [#4996](#4996) -See https://github.com/piwik/piwik/issues/4996 for explanation of the actual feature. +See https://github.com/matomo-org/piwik/issues/4996 for explanation of the actual feature. This is the technical concept for implementing content tracking. We won't plan anything to death but a little bit of thinking upfront makes sense :) Feel free to contribute and let us know if you have any objections! If your thoughts are not technical please comment on the actual issue [#4996](#4996). diff --git a/misc/others/api_rest_call.php b/misc/others/api_rest_call.php index b6275f8755..0c7e143626 100644 --- a/misc/others/api_rest_call.php +++ b/misc/others/api_rest_call.php @@ -6,7 +6,7 @@ exit; // REMOVE this line to run the script $token_auth = 'anonymous'; // we call the REST API and request the 100 first keywords for the last month for the idsite=7 -$url = "http://demo.piwik.org/"; +$url = "https://demo.matomo.org/"; $url .= "?module=API&method=Referrers.getKeywords"; $url .= "&idSite=7&period=month&date=yesterday"; $url .= "&format=PHP&filter_limit=20"; diff --git a/misc/others/uninstall-delete-piwik-directory.php b/misc/others/uninstall-delete-piwik-directory.php index ac606bb721..9d81e831aa 100644 --- a/misc/others/uninstall-delete-piwik-directory.php +++ b/misc/others/uninstall-delete-piwik-directory.php @@ -9,7 +9,7 @@ exit; // Remove this line before using the script // 4) Go with your browser to http://your-site/uninstall-delete-piwik-directory.php // 5) The folder http://your-site/piwik/ should now be deleted! // We hope you enjoyed Piwik. If you have any feedback why you stopped using Piwik, -// please let us know at hello@piwik.org - we are interested by your experience +// please let us know at hello@matomo.org - we are interested by your experience function unlinkRecursive($dir) { if (!$dh = @opendir($dir)) return "Warning: folder $dir couldn't be read by PHP"; diff --git a/misc/others/widget_example_lastvisits.html b/misc/others/widget_example_lastvisits.html index d9aa0478eb..0446fc7672 100644 --- a/misc/others/widget_example_lastvisits.html +++ b/misc/others/widget_example_lastvisits.html @@ -4,7 +4,7 @@ <div id="widgetIframe"> <iframe width="800" height="450" - src="https://piwik.org/demo/index.php?module=Widgetize&action=iframe&moduleToWidgetize=VisitsSummary&actionToWidgetize=getEvolutionGraph&idSite=1&period=week&date=last52&columns[]=nb_visits&disableLink=1" + src="https://matomo.org/demo/index.php?module=Widgetize&action=iframe&moduleToWidgetize=VisitsSummary&actionToWidgetize=getEvolutionGraph&idSite=1&period=week&date=last52&columns[]=nb_visits&disableLink=1" scrolling="no" frameborder="0" marginheight="0" marginwidth="0"></iframe> </div> </body> diff --git a/misc/user/index.html b/misc/user/index.html index 876ebadd73..c14c54ee99 100644 --- a/misc/user/index.html +++ b/misc/user/index.html @@ -1 +1 @@ -This directory stores the custom logo for this Piwik server. Learn more: <a href="https://piwik.org/faq/new-to-piwik/faq_129/">How do I customise the logo in Piwik?</a> +This directory stores the custom logo for this Piwik server. Learn more: <a href="https://matomo.org/faq/new-to-piwik/faq_129/">How do I customise the logo in Piwik?</a> |