diff options
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/composer/build-xhprof.sh | 2 | ||||
| -rw-r--r-- | misc/cron/archive.php | 5 | ||||
| -rw-r--r-- | misc/cron/updatetoken.php | 10 | ||||
| m--------- | misc/log-analytics | 0 | ||||
| -rw-r--r-- | misc/others/ExampleMatomoTracker.php | 17 | ||||
| -rw-r--r-- | misc/others/ExamplePiwikTracker.php | 17 | ||||
| -rw-r--r-- | misc/others/tracker_simpleImageTracker.php | 8 |
7 files changed, 25 insertions, 34 deletions
diff --git a/misc/composer/build-xhprof.sh b/misc/composer/build-xhprof.sh index fb9741d0ec..88864db8eb 100755 --- a/misc/composer/build-xhprof.sh +++ b/misc/composer/build-xhprof.sh @@ -2,7 +2,7 @@ if ! type phpize &> /dev/null; then echo "phpize missing, skipping build" - echo "If you installed PHP via Aptitude, you can install phpize w/ 'sudo apt-get install php5-dev'" + echo "If you installed PHP via Aptitude, you can install phpize w/ 'sudo apt-get install php7-dev'" exit fi diff --git a/misc/cron/archive.php b/misc/cron/archive.php index 955b18664d..e7ac710d14 100644 --- a/misc/cron/archive.php +++ b/misc/cron/archive.php @@ -1,12 +1,9 @@ <?php /** - * Piwik - free/libre analytics platform + * Matomo - free/libre analytics platform * * @link https://matomo.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - * @category Piwik - * @package Piwik */ if (!defined('PIWIK_DOCUMENT_ROOT')) { diff --git a/misc/cron/updatetoken.php b/misc/cron/updatetoken.php index b10a21d347..c05dfb5a52 100644 --- a/misc/cron/updatetoken.php +++ b/misc/cron/updatetoken.php @@ -1,12 +1,9 @@ <?php /** - * Piwik - free/libre analytics platform + * Matomo - free/libre analytics platform * * @link https://matomo.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - * @category Piwik - * @package Piwik */ namespace Piwik; @@ -56,10 +53,7 @@ if($piwikDomain) { $environment = new Environment('cli'); $environment->init(); -$token = Db::get()->fetchOne("SELECT token_auth - FROM " . Common::prefixTable("user") . " - WHERE superuser_access = 1 - ORDER BY date_registered ASC"); +$token = Piwik::requestTemporarySystemAuthToken('LogImporter', 48); $filename = $environment->getContainer()->get('path.tmp') . '/cache/token.php'; diff --git a/misc/log-analytics b/misc/log-analytics -Subproject b3973f3cd0cb773eb9cf3bfff439cc43640c5f1 +Subproject 7266244870722c912a00b0ac51b85aa788bd624 diff --git a/misc/others/ExampleMatomoTracker.php b/misc/others/ExampleMatomoTracker.php new file mode 100644 index 0000000000..4f784b0159 --- /dev/null +++ b/misc/others/ExampleMatomoTracker.php @@ -0,0 +1,17 @@ +<?php +// Example file to demonstrate MatomoTracker.php +// See https://matomo.org/docs/tracking-api/ +require_once '../../vendor/matomo/matomo-php-tracker/MatomoTracker.php'; +MatomoTracker::$URL = 'http://localhost/trunk/'; + +$matomoTracker = new MatomoTracker($idSite = 1); +// You can manually set the Visitor details (resolution, time, plugins) +// See all other ->set* functions available in the MatomoTracker class +$matomoTracker->setResolution(1600, 1400); + +// Sends Tracker request via http +$matomoTracker->doTrackPageView('Document title of current page view'); +// You can also track Goal conversions +$matomoTracker->doTrackGoal($idGoal = 1, $revenue = 42); + +echo 'done';
\ No newline at end of file diff --git a/misc/others/ExamplePiwikTracker.php b/misc/others/ExamplePiwikTracker.php deleted file mode 100644 index 5daa2d7701..0000000000 --- a/misc/others/ExamplePiwikTracker.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php -// Example file to demonstrate PiwikTracker.php -// See http://piwik.org/docs/tracking-api/ -require_once '../../libs/PiwikTracker/PiwikTracker.php'; -PiwikTracker::$URL = 'http://localhost/trunk/'; - -$piwikTracker = new PiwikTracker($idSite = 1); -// You can manually set the Visitor details (resolution, time, plugins) -// See all other ->set* functions available in the PiwikTracker class -$piwikTracker->setResolution(1600, 1400); - -// Sends Tracker request via http -$piwikTracker->doTrackPageView('Document title of current page view'); -// You can also track Goal conversions -$piwikTracker->doTrackGoal($idGoal = 1, $revenue = 42); - -echo 'done';
\ No newline at end of file diff --git a/misc/others/tracker_simpleImageTracker.php b/misc/others/tracker_simpleImageTracker.php index bf4ac796c5..aa81319560 100644 --- a/misc/others/tracker_simpleImageTracker.php +++ b/misc/others/tracker_simpleImageTracker.php @@ -1,9 +1,9 @@ <?php -// -- Piwik Tracking API init -- -require_once "../../libs/PiwikTracker/PiwikTracker.php"; -PiwikTracker::$URL = 'http://localhost/matomo-master/'; +// -- Matomo Tracking API init -- +require_once '../../vendor/matomo/matomo-php-tracker/MatomoTracker.php'; +MatomoTracker::$URL = 'http://localhost/matomo-master/'; // Example 1: Tracks a pageview for Website id = {$IDSITE} -$trackingURL = Piwik_getUrlTrackPageView($idSite = 16, $customTitle = 'This title will appear in the report Actions > Page titles'); +$trackingURL = Matomo_getUrlTrackPageView($idSite = 16, $customTitle = 'This title will appear in the report Actions > Page titles'); ?> <html> |