Skip to content
Snippets Groups Projects
Commit c9e39332 authored by Pavel Vyskočil's avatar Pavel Vyskočil
Browse files

Fix the table names and a name of variables for tables.

parent 1cc6cf72
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
config-templates/module_statisticsproxy.php
+ 2
− 2
View file @ c9e39332
...@@ -16,7 +16,7 @@ $config = array( ...@@ -16,7 +16,7 @@ $config = array(
'databaseName' => 'STATS', 'databaseName' => 'STATS',
'proxyTableName' => 'statistics_proxy', 'identityProvidersTableName' => 'identityProviders',
'servicesProxyName' => 'statistics_services', 'serviceProvidersTableName' => 'serviceProviders',
); );
\ No newline at end of file
config-templates/tables.sql
+ 3
− 3
View file @ c9e39332
#Statistics for proxy #Statistics for IdPs
CREATE TABLE statistics_proxy ( CREATE TABLE identityProviders (
year INT NOT NULL, year INT NOT NULL,
month INT NOT NULL, month INT NOT NULL,
day INT NOT NULL, day INT NOT NULL,
...@@ -13,7 +13,7 @@ CREATE TABLE statistics_proxy ( ...@@ -13,7 +13,7 @@ CREATE TABLE statistics_proxy (
); );
#Statistics for services #Statistics for services
CREATE TABLE statistics_services( CREATE TABLE serviceProviders(
year INT NOT NULL, year INT NOT NULL,
month INT NOT NULL, month INT NOT NULL,
day INT NOT NULL, day INT NOT NULL,
......
lib/Auth/Process/DatabaseCommand.php
+ 13
− 13
View file @ c9e39332
...@@ -12,18 +12,18 @@ class DatabaseCommand ...@@ -12,18 +12,18 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$proxyTableName = $databaseConnector->getProxyTableName(); $identityProvidersTableName = $databaseConnector->getIdentityProvidersTableName();
$servicesTableName = $databaseConnector->getServicesTableName(); $serviceProvidersTableName = $databaseConnector->getServiceProvidersTableName();
$sourceIdp = $request['saml:sp:IdP']; $sourceIdp = $request['saml:sp:IdP'];
$service = $request['Destination']['name']['en']; $service = $request['Destination']['name']['en'];
$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"; $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";
SimpleSAML_Logger::info($sql); SimpleSAML_Logger::info($sql);
if ($conn->query($sql) === FALSE) { if ($conn->query($sql) === FALSE) {
SimpleSAML_Logger::error("The login log wasn't inserted into the database."); SimpleSAML_Logger::error("The login log wasn't inserted into the database.");
} }
$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"; $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";
SimpleSAML_Logger::info($sql); SimpleSAML_Logger::info($sql);
if ($conn->query($sql) === FALSE) { if ($conn->query($sql) === FALSE) {
SimpleSAML_Logger::error("The login log wasn't inserted into the database."); SimpleSAML_Logger::error("The login log wasn't inserted into the database.");
...@@ -37,7 +37,7 @@ class DatabaseCommand ...@@ -37,7 +37,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$table_name = $databaseConnector->getProxyTableName(); $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT year, month, day, SUM(count) AS count FROM ".$table_name." GROUP BY year,month,day"; $sql = "SELECT year, month, day, SUM(count) AS count FROM ".$table_name." GROUP BY year,month,day";
$result = $conn->query($sql); $result = $conn->query($sql);
while($row = $result->fetch_assoc()) { while($row = $result->fetch_assoc()) {
...@@ -52,7 +52,7 @@ class DatabaseCommand ...@@ -52,7 +52,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$table_name = $databaseConnector->getProxyTableName(); $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT year, month, sourceIdp, SUM(count) AS count FROM ".$table_name. " GROUP BY year, month, sourceIdp HAVING sourceIdp != ''"; $sql = "SELECT year, month, sourceIdp, SUM(count) AS count FROM ".$table_name. " GROUP BY year, month, sourceIdp HAVING sourceIdp != ''";
$result = $conn->query($sql); $result = $conn->query($sql);
while($row = $result->fetch_assoc()) { while($row = $result->fetch_assoc()) {
...@@ -66,7 +66,7 @@ class DatabaseCommand ...@@ -66,7 +66,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$table_name = $databaseConnector->getServicesTableName(); $table_name = $databaseConnector->getServiceProvidersTableName();
$sql = "SELECT year, month, service, SUM(count) AS count FROM ".$table_name." GROUP BY year, month, service HAVING service != ''"; $sql = "SELECT year, month, service, SUM(count) AS count FROM ".$table_name." GROUP BY year, month, service HAVING service != ''";
$result = $conn->query($sql); $result = $conn->query($sql);
while($row = $result->fetch_assoc()) { while($row = $result->fetch_assoc()) {
...@@ -79,7 +79,7 @@ class DatabaseCommand ...@@ -79,7 +79,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$table_name = $databaseConnector->getProxyTableName(); $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT SUM(count) AS count FROM " . $table_name; $sql = "SELECT SUM(count) AS count FROM " . $table_name;
$result = $conn->query($sql); $result = $conn->query($sql);
while ($row = $result->fetch_assoc()) { while ($row = $result->fetch_assoc()) {
...@@ -100,7 +100,7 @@ class DatabaseCommand ...@@ -100,7 +100,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$table_name = $databaseConnector->getProxyTableName(); $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT SUM(count) AS count FROM " . $table_name." WHERE year = ".$dateTime->format('Y')." AND month=".$dateTime->format('m')." AND day = ".$dateTime->format('d'); $sql = "SELECT SUM(count) AS count FROM " . $table_name." WHERE year = ".$dateTime->format('Y')." AND month=".$dateTime->format('m')." AND day = ".$dateTime->format('d');
$result = $conn->query($sql); $result = $conn->query($sql);
while ($row = $result->fetch_assoc()) { while ($row = $result->fetch_assoc()) {
...@@ -120,7 +120,7 @@ class DatabaseCommand ...@@ -120,7 +120,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$table_name = $databaseConnector->getServicesTableName(); $table_name = $databaseConnector->getServiceProvidersTableName();
$sql = "SELECT service, SUM(count) AS count FROM ".$table_name." GROUP BY service HAVING service != ''"; $sql = "SELECT service, SUM(count) AS count FROM ".$table_name." GROUP BY service HAVING service != ''";
$result = $conn->query($sql); $result = $conn->query($sql);
while($row = $result->fetch_assoc()) { while($row = $result->fetch_assoc()) {
...@@ -134,7 +134,7 @@ class DatabaseCommand ...@@ -134,7 +134,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$table_name = $databaseConnector->getProxyTableName(); $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT sourceIdp, SUM(count) AS count FROM ".$table_name." GROUP BY sourceIdp HAVING sourceIdp != ''"; $sql = "SELECT sourceIdp, SUM(count) AS count FROM ".$table_name." GROUP BY sourceIdp HAVING sourceIdp != ''";
$result = $conn->query($sql); $result = $conn->query($sql);
while($row = $result->fetch_assoc()) { while($row = $result->fetch_assoc()) {
...@@ -148,7 +148,7 @@ class DatabaseCommand ...@@ -148,7 +148,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$table_name = $databaseConnector->getProxyTableName(); $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT COUNT(*) AS count FROM (SELECT DISTINCT sourceIdp FROM ".$table_name." ) AS idps WHERE sourceIdp != ''"; $sql = "SELECT COUNT(*) AS count FROM (SELECT DISTINCT sourceIdp FROM ".$table_name." ) AS idps WHERE sourceIdp != ''";
$result = $conn->query($sql); $result = $conn->query($sql);
while($row = $result->fetch_assoc()) { while($row = $result->fetch_assoc()) {
...@@ -167,7 +167,7 @@ class DatabaseCommand ...@@ -167,7 +167,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector(); $databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection(); $conn = $databaseConnector->getConnection();
assert($conn != NULL); assert($conn != NULL);
$table_name = $databaseConnector->getServicesTableName(); $table_name = $databaseConnector->getServiceProvidersTableName();
$sql = "SELECT COUNT(*) AS count FROM (SELECT DISTINCT service FROM ".$table_name." ) AS services WHERE service != ''"; $sql = "SELECT COUNT(*) AS count FROM (SELECT DISTINCT service FROM ".$table_name." ) AS services WHERE service != ''";
$result = $conn->query($sql); $result = $conn->query($sql);
while($row = $result->fetch_assoc()) { while($row = $result->fetch_assoc()) {
......
lib/Auth/Process/DatabaseConnector.php
+ 10
− 10
View file @ c9e39332
...@@ -9,16 +9,16 @@ class databaseConnector ...@@ -9,16 +9,16 @@ class databaseConnector
private $username; private $username;
private $password; private $password;
private $databaseName; private $databaseName;
private $proxyTableName; private $identityProvidersTableName;
private $servicesTableName; private $serviceProvidersTableName;
const CONFIG_FILE_NAME = 'module_statisticsproxy.php'; const CONFIG_FILE_NAME = 'module_statisticsproxy.php';
const SERVER = 'serverName'; const SERVER = 'serverName';
const USER = 'userName'; const USER = 'userName';
const PASSWORD = 'password'; const PASSWORD = 'password';
const DATABASE = 'databaseName'; const DATABASE = 'databaseName';
const PROXY_TABLE_NAME = 'proxyTableName'; const IDP_TABLE_NAME = 'identityProvidersTableName';
const SERVICES_TABLE_NAME = 'servicesProxyName' ; const SP_TABLE_NAME = 'serviceProvidersTableName' ;
...@@ -29,8 +29,8 @@ class databaseConnector ...@@ -29,8 +29,8 @@ class databaseConnector
$this->username = $conf->getString(self::USER); $this->username = $conf->getString(self::USER);
$this->password = $conf->getString(self::PASSWORD); $this->password = $conf->getString(self::PASSWORD);
$this->databaseName = $conf->getString(self::DATABASE); $this->databaseName = $conf->getString(self::DATABASE);
$this->proxyTableName = $conf->getString(self::PROXY_TABLE_NAME); $this->identityProvidersTableName = $conf->getString(self::IDP_TABLE_NAME);
$this->servicesTableName = $conf->getString(self::SERVICES_TABLE_NAME); $this->serviceProvidersTableName = $conf->getString(self::SP_TABLE_NAME);
} }
public function getConnection() public function getConnection()
...@@ -40,15 +40,15 @@ class databaseConnector ...@@ -40,15 +40,15 @@ class databaseConnector
return $conn; return $conn;
} }
public function getProxyTableName() public function getIdentityProvidersTableName()
{ {
return $this->proxyTableName; return $this->identityProvidersTableName;
} }
public function getServicesTableName() public function getServiceProvidersTableName()
{ {
return $this->servicesTableName; return $this->serviceProvidersTableName;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment