Skip to content
This repository was archived by the owner on Sep 19, 2022. It is now read-only.

Commit c9e3933

Browse files
vyskocilpavelvyskocilpavel
committed
Fix the table names and a name of variables for tables.
1 parent 1cc6cf7 commit c9e3933

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎config-templates/module_statisticsproxy.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
'databaseName' => 'STATS',
1818

19-
'proxyTableName' => 'statistics_proxy',
19+
'identityProvidersTableName' => 'identityProviders',
2020

21-
'servicesProxyName' => 'statistics_services',
21+
'serviceProvidersTableName' => 'serviceProviders',
2222
);

‎config-templates/tables.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#Statistics for proxy
2-
CREATE TABLE statistics_proxy (
1+
#Statistics for IdPs
2+
CREATE TABLE identityProviders (
33
year INT NOT NULL,
44
month INT NOT NULL,
55
day INT NOT NULL,
@@ -13,7 +13,7 @@ CREATE TABLE statistics_proxy (
1313
);
1414

1515
#Statistics for services
16-
CREATE TABLE statistics_services(
16+
CREATE TABLE serviceProviders(
1717
year INT NOT NULL,
1818
month INT NOT NULL,
1919
day INT NOT NULL,

‎lib/Auth/Process/DatabaseCommand.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ public static function insertLogin(&$request, &$date)
1212
$databaseConnector = new DatabaseConnector();
1313
$conn = $databaseConnector->getConnection();
1414
assert($conn != NULL);
15-
$proxyTableName = $databaseConnector->getProxyTableName();
16-
$servicesTableName = $databaseConnector->getServicesTableName();
15+
$identityProvidersTableName = $databaseConnector->getIdentityProvidersTableName();
16+
$serviceProvidersTableName = $databaseConnector->getServiceProvidersTableName();
1717
$sourceIdp = $request['saml:sp:IdP'];
1818
$service = $request['Destination']['name']['en'];
1919

20-
$sql = "INSERT INTO ".$proxyTableName."(year, month, day, sourceIdp, count) VALUES ('".$date->format('Y')."','".$date->format('m') ."','".$date->format('d')."','".$sourceIdp."','1') ON DUPLICATE KEY UPDATE count = count + 1";
20+
$sql = "INSERT INTO ".$identityProvidersTableName."(year, month, day, sourceIdp, count) VALUES ('".$date->format('Y')."','".$date->format('m') ."','".$date->format('d')."','".$sourceIdp."','1') ON DUPLICATE KEY UPDATE count = count + 1";
2121
SimpleSAML_Logger::info($sql);
2222
if ($conn->query($sql) === FALSE) {
2323
SimpleSAML_Logger::error("The login log wasn't inserted into the database.");
2424
}
2525

26-
$sql = "INSERT INTO ".$servicesTableName."(year, month, day, service, count) VALUES ('".$date->format('Y')."','".$date->format('m') ."','".$date->format('d')."','".$service."','1') ON DUPLICATE KEY UPDATE count = count + 1";
26+
$sql = "INSERT INTO ".$serviceProvidersTableName."(year, month, day, service, count) VALUES ('".$date->format('Y')."','".$date->format('m') ."','".$date->format('d')."','".$service."','1') ON DUPLICATE KEY UPDATE count = count + 1";
2727
SimpleSAML_Logger::info($sql);
2828
if ($conn->query($sql) === FALSE) {
2929
SimpleSAML_Logger::error("The login log wasn't inserted into the database.");
@@ -37,7 +37,7 @@ public static function getLoginCountPerDay()
3737
$databaseConnector = new DatabaseConnector();
3838
$conn = $databaseConnector->getConnection();
3939
assert($conn != NULL);
40-
$table_name = $databaseConnector->getProxyTableName();
40+
$table_name = $databaseConnector->getIdentityProvidersTableName();
4141
$sql = "SELECT year, month, day, SUM(count) AS count FROM ".$table_name." GROUP BY year,month,day";
4242
$result = $conn->query($sql);
4343
while($row = $result->fetch_assoc()) {
@@ -52,7 +52,7 @@ public static function getLoginCountPerDeyPerService()
5252
$databaseConnector = new DatabaseConnector();
5353
$conn = $databaseConnector->getConnection();
5454
assert($conn != NULL);
55-
$table_name = $databaseConnector->getProxyTableName();
55+
$table_name = $databaseConnector->getIdentityProvidersTableName();
5656
$sql = "SELECT year, month, sourceIdp, SUM(count) AS count FROM ".$table_name. " GROUP BY year, month, sourceIdp HAVING sourceIdp != ''";
5757
$result = $conn->query($sql);
5858
while($row = $result->fetch_assoc()) {
@@ -66,7 +66,7 @@ public static function getAccessToServicesPerMonth()
6666
$databaseConnector = new DatabaseConnector();
6767
$conn = $databaseConnector->getConnection();
6868
assert($conn != NULL);
69-
$table_name = $databaseConnector->getServicesTableName();
69+
$table_name = $databaseConnector->getServiceProvidersTableName();
7070
$sql = "SELECT year, month, service, SUM(count) AS count FROM ".$table_name." GROUP BY year, month, service HAVING service != ''";
7171
$result = $conn->query($sql);
7272
while($row = $result->fetch_assoc()) {
@@ -79,7 +79,7 @@ public static function getCountOfAllLogins()
7979
$databaseConnector = new DatabaseConnector();
8080
$conn = $databaseConnector->getConnection();
8181
assert($conn != NULL);
82-
$table_name = $databaseConnector->getProxyTableName();
82+
$table_name = $databaseConnector->getIdentityProvidersTableName();
8383
$sql = "SELECT SUM(count) AS count FROM " . $table_name;
8484
$result = $conn->query($sql);
8585
while ($row = $result->fetch_assoc()) {
@@ -100,7 +100,7 @@ public static function getCountOfAllLoginsForToday()
100100
$databaseConnector = new DatabaseConnector();
101101
$conn = $databaseConnector->getConnection();
102102
assert($conn != NULL);
103-
$table_name = $databaseConnector->getProxyTableName();
103+
$table_name = $databaseConnector->getIdentityProvidersTableName();
104104
$sql = "SELECT SUM(count) AS count FROM " . $table_name." WHERE year = ".$dateTime->format('Y')." AND month=".$dateTime->format('m')." AND day = ".$dateTime->format('d');
105105
$result = $conn->query($sql);
106106
while ($row = $result->fetch_assoc()) {
@@ -120,7 +120,7 @@ public static function getAccessCountPerService()
120120
$databaseConnector = new DatabaseConnector();
121121
$conn = $databaseConnector->getConnection();
122122
assert($conn != NULL);
123-
$table_name = $databaseConnector->getServicesTableName();
123+
$table_name = $databaseConnector->getServiceProvidersTableName();
124124
$sql = "SELECT service, SUM(count) AS count FROM ".$table_name." GROUP BY service HAVING service != ''";
125125
$result = $conn->query($sql);
126126
while($row = $result->fetch_assoc()) {
@@ -134,7 +134,7 @@ public static function getLoginCountPerIdp()
134134
$databaseConnector = new DatabaseConnector();
135135
$conn = $databaseConnector->getConnection();
136136
assert($conn != NULL);
137-
$table_name = $databaseConnector->getProxyTableName();
137+
$table_name = $databaseConnector->getIdentityProvidersTableName();
138138
$sql = "SELECT sourceIdp, SUM(count) AS count FROM ".$table_name." GROUP BY sourceIdp HAVING sourceIdp != ''";
139139
$result = $conn->query($sql);
140140
while($row = $result->fetch_assoc()) {
@@ -148,7 +148,7 @@ public static function getCountOfUsedIdp()
148148
$databaseConnector = new DatabaseConnector();
149149
$conn = $databaseConnector->getConnection();
150150
assert($conn != NULL);
151-
$table_name = $databaseConnector->getProxyTableName();
151+
$table_name = $databaseConnector->getIdentityProvidersTableName();
152152
$sql = "SELECT COUNT(*) AS count FROM (SELECT DISTINCT sourceIdp FROM ".$table_name." ) AS idps WHERE sourceIdp != ''";
153153
$result = $conn->query($sql);
154154
while($row = $result->fetch_assoc()) {
@@ -167,7 +167,7 @@ public static function getCountOfAccesedServices()
167167
$databaseConnector = new DatabaseConnector();
168168
$conn = $databaseConnector->getConnection();
169169
assert($conn != NULL);
170-
$table_name = $databaseConnector->getServicesTableName();
170+
$table_name = $databaseConnector->getServiceProvidersTableName();
171171
$sql = "SELECT COUNT(*) AS count FROM (SELECT DISTINCT service FROM ".$table_name." ) AS services WHERE service != ''";
172172
$result = $conn->query($sql);
173173
while($row = $result->fetch_assoc()) {

‎lib/Auth/Process/DatabaseConnector.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ class databaseConnector
99
private $username;
1010
private $password;
1111
private $databaseName;
12-
private $proxyTableName;
13-
private $servicesTableName;
12+
private $identityProvidersTableName;
13+
private $serviceProvidersTableName;
1414

1515
const CONFIG_FILE_NAME = 'module_statisticsproxy.php';
1616
const SERVER = 'serverName';
1717
const USER = 'userName';
1818
const PASSWORD = 'password';
1919
const DATABASE = 'databaseName';
20-
const PROXY_TABLE_NAME = 'proxyTableName';
21-
const SERVICES_TABLE_NAME = 'servicesProxyName' ;
20+
const IDP_TABLE_NAME = 'identityProvidersTableName';
21+
const SP_TABLE_NAME = 'serviceProvidersTableName' ;
2222

2323

2424

@@ -29,8 +29,8 @@ public function __construct ()
2929
$this->username = $conf->getString(self::USER);
3030
$this->password = $conf->getString(self::PASSWORD);
3131
$this->databaseName = $conf->getString(self::DATABASE);
32-
$this->proxyTableName = $conf->getString(self::PROXY_TABLE_NAME);
33-
$this->servicesTableName = $conf->getString(self::SERVICES_TABLE_NAME);
32+
$this->identityProvidersTableName = $conf->getString(self::IDP_TABLE_NAME);
33+
$this->serviceProvidersTableName = $conf->getString(self::SP_TABLE_NAME);
3434
}
3535

3636
public function getConnection()
@@ -40,15 +40,15 @@ public function getConnection()
4040
return $conn;
4141
}
4242

43-
public function getProxyTableName()
43+
public function getIdentityProvidersTableName()
4444
{
45-
return $this->proxyTableName;
45+
return $this->identityProvidersTableName;
4646

4747
}
4848

49-
public function getServicesTableName()
49+
public function getServiceProvidersTableName()
5050
{
51-
return $this->servicesTableName;
51+
return $this->serviceProvidersTableName;
5252

5353
}
5454

0 commit comments

Comments
 (0)