summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLester Caine <lester@lsces.co.uk>2026-05-14 09:52:56 +0100
committerLester Caine <lester@lsces.co.uk>2026-05-14 09:52:56 +0100
commit8f4f17a1f154889b70509d051cf102bd93bed892 (patch)
treef41c02abf02f42790be2c9c56acbb228dc380eca
parent457ba69e560f940ebf6109064ed6c5de87515ffa (diff)
downloadstats-8f4f17a1f154889b70509d051cf102bd93bed892.tar.gz
stats-8f4f17a1f154889b70509d051cf102bd93bed892.tar.bz2
stats-8f4f17a1f154889b70509d051cf102bd93bed892.zip
php-cs-fixer tidies to php8.5 standards
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
-rw-r--r--admin/schema_inc.php10
-rw-r--r--admin/upgrades/1.0.1.php48
-rwxr-xr-x[-rw-r--r--]css/stats.css0
-rwxr-xr-x[-rw-r--r--]icons/nodata.gifbin1686 -> 1686 bytes
-rwxr-xr-x[-rw-r--r--]icons/nodata.pngbin1617 -> 1617 bytes
-rwxr-xr-x[-rw-r--r--]icons/pkg_stats.gifbin1091 -> 1091 bytes
-rwxr-xr-x[-rw-r--r--]icons/pkg_stats.pngbin2199 -> 2199 bytes
-rwxr-xr-xincludes/bit_setup_inc.php10
-rw-r--r--includes/classes/Statistics.php10
-rw-r--r--pv_chart.php2
-rw-r--r--referrers.php6
-rwxr-xr-x[-rw-r--r--]templates/admin_stats.tpl0
-rwxr-xr-x[-rw-r--r--]templates/footer_inc.tpl0
-rw-r--r--templates/index.php2
-rwxr-xr-x[-rw-r--r--]templates/referrer_stats.tpl0
-rwxr-xr-x[-rw-r--r--]templates/referrer_stats_ctm_inc.tpl0
-rwxr-xr-x[-rw-r--r--]templates/search_stats.tpl0
-rwxr-xr-x[-rw-r--r--]templates/stats.tpl0
18 files changed, 44 insertions, 44 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 4142e7e..4f82505 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -39,17 +39,17 @@ $gBitInstaller->registerPackageInfo( STATS_PKG_NAME, [
] );
// ### Indexes
-$indices = array (
+$indices = [
'stats_referer_url_idx' => [ 'table' => 'stats_referer_urls', 'cols' => 'referer_url', 'opts' => 'UNIQUE' ],
'stats_referer_map_user_idx' => [ 'table' => 'stats_referer_users_map', 'cols' => 'user_id', 'opts' => null ],
-);
+];
// 'stats_referer_map_url_idx' => [ 'table' => 'stats_referer_urls', 'cols' => 'referer_url_id', 'opts' => NULL ],
$gBitInstaller->registerSchemaIndexes( STATS_PKG_NAME, $indices );
// ### Sequences
-$sequences = array (
- 'stats_referer_url_id_seq' => [ 'start' => 1 ]
-);
+$sequences = [
+ 'stats_referer_url_id_seq' => [ 'start' => 1 ],
+];
$gBitInstaller->registerSchemaSequences( STATS_PKG_NAME, $sequences );
// ### Default Preferences
diff --git a/admin/upgrades/1.0.1.php b/admin/upgrades/1.0.1.php
index 4506763..d6ced7f 100644
--- a/admin/upgrades/1.0.1.php
+++ b/admin/upgrades/1.0.1.php
@@ -4,42 +4,42 @@
*/
global $gBitInstaller;
-$infoHash = array(
+$infoHash = [
'package' => STATS_PKG_NAME,
'version' => str_replace( '.php', '', basename( __FILE__ )),
'description' => "Add referer URL tracking for user registrations.",
'post_upgrade' => NULL,
-);
-$gBitInstaller->registerPackageUpgrade( $infoHash, array(
- array( 'DATADICT' => array(
- array( 'CREATE' => array(
+];
+$gBitInstaller->registerPackageUpgrade( $infoHash, [
+ [ 'DATADICT' => [
+ [ 'CREATE' => [
'stats_referer_urls' => "
referer_url_id I4 PRIMARY,
referer_url C(4096) NOTNULL
- ",
- )),
- array( 'CREATEINDEX' => array(
- 'stats_referer_url_idx' => array( 'stats_referer_urls', 'referer_url', array() ),
- )),
- array( 'CREATESEQUENCE' => array(
+ ",
+ ]],
+ [ 'CREATEINDEX' => [
+ 'stats_referer_url_idx' => [ 'stats_referer_urls', 'referer_url', [] ],
+ ]],
+ [ 'CREATESEQUENCE' => [
'stats_referer_url_id_seq',
- )),
- array( 'CREATE' => array(
+ ]],
+ [ 'CREATE' => [
'stats_referer_users_map' => "
referer_url_id I4 PRIMARY,
user_id I4 PRIMARY
CONSTRAINT '
, CONSTRAINT `stats_referer_users_url_ref` FOREIGN KEY (`referer_url_id`) REFERENCES `".BIT_DB_PREFIX."stats_referer_urls` (`referer_url_id`)
, CONSTRAINT `stats_referer_users_user_ref` FOREIGN KEY (`user_id`) REFERENCES `".BIT_DB_PREFIX."users_users` (`user_id`) '
- ",
- )),
- array( 'CREATEINDEX' => array(
- 'stats_referer_urls_idx' => array( 'stats_referer_urls', 'referer_url', array() ),
- 'stats_referer_map_url_idx' => array( 'stats_referer_users_map', 'referer_url_id', array() ),
- 'stats_referer_map_user_idx' => array( 'stats_referer_users_map', 'user_id', array() ),
- )),
- array( 'CREATESEQUENCE' => array(
+ ",
+ ]],
+ [ 'CREATEINDEX' => [
+ 'stats_referer_urls_idx' => [ 'stats_referer_urls', 'referer_url', [] ],
+ 'stats_referer_map_url_idx' => [ 'stats_referer_users_map', 'referer_url_id', [] ],
+ 'stats_referer_map_user_idx' => [ 'stats_referer_users_map', 'user_id', [] ],
+ ]],
+ [ 'CREATESEQUENCE' => [
'stats_referer_url_id_seq',
- )),
- )),
-));
+ ]],
+ ]],
+]);
diff --git a/css/stats.css b/css/stats.css
index 6fdbd5e..6fdbd5e 100644..100755
--- a/css/stats.css
+++ b/css/stats.css
diff --git a/icons/nodata.gif b/icons/nodata.gif
index 0cfe949..0cfe949 100644..100755
--- a/icons/nodata.gif
+++ b/icons/nodata.gif
Binary files differ
diff --git a/icons/nodata.png b/icons/nodata.png
index 4ed1167..4ed1167 100644..100755
--- a/icons/nodata.png
+++ b/icons/nodata.png
Binary files differ
diff --git a/icons/pkg_stats.gif b/icons/pkg_stats.gif
index 25a401e..25a401e 100644..100755
--- a/icons/pkg_stats.gif
+++ b/icons/pkg_stats.gif
Binary files differ
diff --git a/icons/pkg_stats.png b/icons/pkg_stats.png
index e4a5426..e4a5426 100644..100755
--- a/icons/pkg_stats.png
+++ b/icons/pkg_stats.png
Binary files differ
diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php
index deb36b1..4026cbe 100755
--- a/includes/bit_setup_inc.php
+++ b/includes/bit_setup_inc.php
@@ -1,6 +1,6 @@
<?php
namespace Bitweaver\Stats;
-use Bitweaver\Stats\Statistics;
+
use Bitweaver\KernelTools;
global $gBitSystem, $gBitUser ;
@@ -14,9 +14,9 @@ $pRegisterHash = [
define( 'STATS_PKG_NAME', $pRegisterHash['package_name'] );
define( 'STATS_PKG_URL', BIT_ROOT_URL . basename( $pRegisterHash['package_path'] ) . '/' );
define( 'STATS_PKG_PATH', BIT_ROOT_PATH . basename( $pRegisterHash['package_path'] ) . '/' );
-define( 'STATS_PKG_INCLUDE_PATH', BIT_ROOT_PATH . basename( $pRegisterHash['package_path'] ) . '/includes/');
+define( 'STATS_PKG_INCLUDE_PATH', BIT_ROOT_PATH . basename( $pRegisterHash['package_path'] ) . '/includes/');
define( 'STATS_PKG_CLASS_PATH', BIT_ROOT_PATH . basename( $pRegisterHash['package_path'] ) . '/includes/classes/');
-define( 'STATS_PKG_ADMIN_PATH', BIT_ROOT_PATH . basename( $pRegisterHash['package_path'] ) . '/admin/');
+define( 'STATS_PKG_ADMIN_PATH', BIT_ROOT_PATH . basename( $pRegisterHash['package_path'] ) . '/admin/');
$gBitSystem->registerPackage( $pRegisterHash );
@@ -42,7 +42,7 @@ if( $gBitSystem->isPackageActive( 'stats' )) {
}
if( !$gBitUser->isRegistered() && !empty( $_SERVER['HTTP_REFERER'] ) && strlen( $_SERVER['HTTP_REFERER'] ) > 9 ) {
- // Explode the HTTP_REFERER address to split up the string
+ // Explode the HTTP_REFERER address to split up the string
if( $ref = explode('/', $_SERVER['HTTP_REFERER']) ) {
if( count( $ref ) > 1 && $ref[2] != $_SERVER['HTTP_HOST'] ) {
// we have a standard refering URL
@@ -66,7 +66,7 @@ if( $gBitSystem->isPackageActive( 'stats' )) {
$pObject->CompleteTrans();
}
}
-
+
function stats_user_register( &$pObject ) {
if( !empty( $_COOKIE['referer_url'] ) && is_a( $pObject, 'BitUser' ) && !empty( $pObject->mUserId ) ) {
$pObject->StartTrans();
diff --git a/includes/classes/Statistics.php b/includes/classes/Statistics.php
index 1deb893..0fe0e34 100644
--- a/includes/classes/Statistics.php
+++ b/includes/classes/Statistics.php
@@ -11,11 +11,11 @@
* @subpackage Stats
**/
namespace Bitweaver\Stats;
+
use Bitweaver\BitBase;
use Bitweaver\Liberty\LibertyContent;
use Bitweaver\BitDb;
-
class Statistics extends BitBase {
/**
@@ -206,9 +206,9 @@ class Statistics extends BitBase {
$ret["pageviews"] = $this->mDb->getOne( "SELECT SUM(`pageviews`) FROM `".BIT_DB_PREFIX."stats_pageviews`" );
$ret["ppd"] = $ret["days"] ? $ret["pageviews"] / $ret["days"] : 0;
$ret["bestpvs"] = $this->mDb->getOne( "SELECT MAX(`pageviews`) FROM `".BIT_DB_PREFIX."stats_pageviews`" );
- $ret["bestday"] = $this->mDb->getOne( "SELECT `stats_day` FROM `".BIT_DB_PREFIX."stats_pageviews` WHERE `pageviews`=?",array( (int)$ret["bestpvs"] ));
+ $ret["bestday"] = $this->mDb->getOne( "SELECT `stats_day` FROM `".BIT_DB_PREFIX."stats_pageviews` WHERE `pageviews`=?",[ (int)$ret["bestpvs"] ]);
$ret["worstpvs"] = $this->mDb->getOne( "SELECT MIN(`pageviews`) FROM `".BIT_DB_PREFIX."stats_pageviews`" );
- $ret["worstday"] = $this->mDb->getOne( "SELECT `stats_day` FROM `".BIT_DB_PREFIX."stats_pageviews` WHERE `pageviews`=?",array( (int)$ret["worstpvs"] ));
+ $ret["worstday"] = $this->mDb->getOne( "SELECT `stats_day` FROM `".BIT_DB_PREFIX."stats_pageviews` WHERE `pageviews`=?",[ (int)$ret["worstpvs"] ]);
return $ret;
}
@@ -268,7 +268,7 @@ class Statistics extends BitBase {
if( $pDays != 0 ) $dfrom = $now - $pDays * 24 * 60 * 60;
$query = "SELECT `stats_day`, `pageviews` FROM `".BIT_DB_PREFIX."stats_pageviews` WHERE `stats_day`<=? AND `stats_day`>=? ORDER BY `stats_day` ASC";
- $result = $this->mDb->query( $query,array( ( int )$now, ( int )$dfrom ));
+ $result = $this->mDb->query( $query,[ ( int )$now, ( int )$dfrom ]);
$ret = [];
$n = ceil( $result->numRows() / 20 );
$i = 0;
@@ -304,7 +304,7 @@ class Statistics extends BitBase {
FROM `".BIT_DB_PREFIX."liberty_content` lc
LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_hits` liberty_content_hits
ON (lc.`content_id` = liberty_content_hits.`content_id`)
- WHERE content_type_guid=?", [ $guid ]
+ WHERE content_type_guid=?", [ $guid ],
);
if( !empty( $hits )) {
$ret['legend'][] = $gLibertySystem->getContentTypeName( $guid );
diff --git a/pv_chart.php b/pv_chart.php
index 4341f84..d6354f2 100644
--- a/pv_chart.php
+++ b/pv_chart.php
@@ -35,7 +35,7 @@ $graph = new PHPlot( 600, 600 );
$graph->SetDataValues( $data );
$graph->SetTitle( KernelTools::tra( 'Total Pageviews' ) );
$graph->SetYTitle( KernelTools::tra( 'Pageviews' ) );
-$graph->SetXTitle( KernelTools::tra( 'Time') );
+$graph->SetXTitle( KernelTools::tra( 'Time') );
$graph->SetPlotType( ( count( $data ) > 50 ) ? 'lines' : 'linepoints' );
$graph->SetDrawXDataLabels( true );
$graph->SetXLabelAngle( 90 );
diff --git a/referrers.php b/referrers.php
index 684a7a8..b1e0eb2 100644
--- a/referrers.php
+++ b/referrers.php
@@ -12,7 +12,7 @@
use Bitweaver\BitBase;
use Bitweaver\KernelTools;
use Bitweaver\Stats\Statistics;
-
+
require_once '../kernel/includes/setup_inc.php';
$gBitSystem->verifyPackage( 'stats' );
@@ -70,7 +70,7 @@ foreach( array_keys( $referers ) as $refSite ) {
}
} else {
// bing paid query
- foreach( array( 'pq' => 'Paid', 'q' => 'Organic', 'p' => 'Organic', 'unknown' => 'Unknown' ) as $key=>$title ) {
+ foreach( [ 'pq' => 'Paid', 'q' => 'Organic', 'p' => 'Organic', 'unknown' => 'Unknown' ] as $key=>$title ) {
if( $key == 'unknown' || isset( $urlParams[$key] ) ) {
array_push( $subVals, $title, BitBase::getParameter( $urlParams, $key, 'unknown' ) );
break;
@@ -96,7 +96,7 @@ function computeStats( &$pAggregateStats, &$subStats, $revenue, &$userHash ) {
@$pAggregateStats[$subStatKey]['info']['orders'] += $revenue['total_orders'];
@$pAggregateStats[$subStatKey]['info']['users'][] = $userHash;
if( empty( $pAggregateStats[$subStatKey]['values'] ) ) {
- $pAggregateStats[$subStatKey]['values'] = array();
+ $pAggregateStats[$subStatKey]['values'] = [];
}
if( $subStats ) {
computeStats( $pAggregateStats[$subStatKey]['values'], $subStats, $revenue, $userHash );
diff --git a/templates/admin_stats.tpl b/templates/admin_stats.tpl
index 7121a6f..7121a6f 100644..100755
--- a/templates/admin_stats.tpl
+++ b/templates/admin_stats.tpl
diff --git a/templates/footer_inc.tpl b/templates/footer_inc.tpl
index ad78376..ad78376 100644..100755
--- a/templates/footer_inc.tpl
+++ b/templates/footer_inc.tpl
diff --git a/templates/index.php b/templates/index.php
index 1e6de35..30a5490 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,4 +1,4 @@
-<?php
+<?php
// This is not a package.
header ("location: ../index.php");
diff --git a/templates/referrer_stats.tpl b/templates/referrer_stats.tpl
index 6265ba2..6265ba2 100644..100755
--- a/templates/referrer_stats.tpl
+++ b/templates/referrer_stats.tpl
diff --git a/templates/referrer_stats_ctm_inc.tpl b/templates/referrer_stats_ctm_inc.tpl
index 1a1b2be..1a1b2be 100644..100755
--- a/templates/referrer_stats_ctm_inc.tpl
+++ b/templates/referrer_stats_ctm_inc.tpl
diff --git a/templates/search_stats.tpl b/templates/search_stats.tpl
index 4e083f2..4e083f2 100644..100755
--- a/templates/search_stats.tpl
+++ b/templates/search_stats.tpl
diff --git a/templates/stats.tpl b/templates/stats.tpl
index 243a5af..243a5af 100644..100755
--- a/templates/stats.tpl
+++ b/templates/stats.tpl