kumi/fossbilling-epp-isnic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: improve code structure and readability

Browse source 
- Standardized the formatting across ISNICSync.php and eppClient.php for better consistency and readability, making future maintenance and debugging efforts more efficient.
- Adjusted the use of whitespace and alignment in both files to follow best coding practices, enhancing code clarity and developer experience.
- Simplified control structures for improved logic flow and reduced complexity in error handling and network communication processes.
- Ensured that all modified functions and error messages remain functional with clearer, more standardized error handling to minimize runtime errors and facilitate easier error tracking.

This refactor does not introduce any new features or significantly alter existing functionality but sets a solid foundation for more reliable and maintainable codebase.
This commit is contained in:
Kumi 2024-05-19 20:13:58 +02:00
parent 0047b66f53
commit 6e18fa423d
Signed by: kumi
GPG key ID: ECBCC9082395383F
2 changed files with 259 additions and 271 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
ISNICSync.php
View file

@ -2,13 +2,13 @@
require_once "eppClient.php";
use Pinga\Tembo\eppClient;
$config = include "config.php";
$c = $config["db"];
$registrar = "ISNIC";
try
{
try {
// Establish the PDO connection
$dsn = $c["type"] . ":host=" . $c["host"] . ";port=" . $c["port"] . ";dbname=" . $c["name"];
$pdo = new PDO($dsn, $c["user"], $c["password"]);
@ -27,52 +27,42 @@ try
$config = [];
foreach ($rows as $row)
{
foreach ($rows as $row) {
$config = json_decode($row["config"], true);
$registrar_id = $row["id"];
}
if (empty($config))
{
if (empty($config)) {
throw new Exception("Database cannot be accessed right now.");
}
}
catch(PDOException $e)
{
} catch (PDOException $e) {
echo "Database error: " . $e->getMessage();
}
catch(Exception $e)
{
} catch (Exception $e) {
echo "General error: " . $e->getMessage();
}
function connectEpp(string $registry, $config)
{
try
{
try {
$epp = new eppClient();
$info = [
"host" => $config["host"],
"port" => $config["port"], "timeout" => 30, "tls" => "1.3", "bind" => false, "bindip" => "1.2.3.4:0", "verify_peer" => false, "verify_peer_name" => false,
"verify_host" => false, "cafile" => "", "local_cert" => $config["ssl_cert"], "local_pk" => $config["ssl_key"], "passphrase" => "", "allow_self_signed" => true, ];
"verify_host" => false, "cafile" => "", "local_cert" => $config["ssl_cert"], "local_pk" => $config["ssl_key"], "passphrase" => "", "allow_self_signed" => true,
];
$epp->connect($info);
$login = $epp->login(["clID" => $config["username"], "pw" => $config["password"],
"prefix" => "tembo", ]);
if (array_key_exists("error", $login))
{
$login = $epp->login([
"clID" => $config["username"], "pw" => $config["password"],
"prefix" => "tembo",
]);
if (array_key_exists("error", $login)) {
echo "Login Error: " . $login["error"] . PHP_EOL;
exit();
}
else
{
} else {
echo "Login Result: " . $login["code"] . ": " . $login["msg"][0] . PHP_EOL;
}
return $epp;
}
catch(EppException $e)
{
} catch (EppException $e) {
return "Error : " . $e->getMessage();
}
}
@ -150,6 +140,6 @@ try {
echo "Logout Result: " . $logout["code"] . ": " . $logout["msg"][0] . PHP_EOL;
} catch (PDOException $e) {
echo "Database error: " . $e->getMessage();
} catch(EppException $e) {
} catch (EppException $e) {
echo "Error: ", $e->getMessage();
}

74
eppClient.php
View file

@ -1,4 +1,5 @@
<?php
/**
* Tembo EPP client library
*
@ -1359,14 +1360,14 @@ class eppClient
$from = $to = array();
$text = '';
foreach ($add as $k => $v) {
$text.= '<domain:hostObj>' . $v . '</domain:hostObj>' . "\n";
$text .= '<domain:hostObj>' . $v . '</domain:hostObj>' . "\n";
}
$from[] = '/{{ add }}/';
$to[] = (empty($text) ? '' : "<domain:add><domain:ns>\n{$text}</domain:ns></domain:add>\n");
$text = '';
foreach ($rem as $k => $v) {
$text.= '<domain:hostObj>' . $v . '</domain:hostObj>' . "\n";
$text .= '<domain:hostObj>' . $v . '</domain:hostObj>' . "\n";
}
$from[] = '/{{ rem }}/';
@ -1434,12 +1435,12 @@ class eppClient
$from[] = '/{{ rem }}/';
$to[] = "";
$from[] = '/{{ chg }}/';
$to[] = "<domain:chg><domain:registrant>".htmlspecialchars($params['new_contactid'])."</domain:registrant></domain:chg>\n";
$to[] = "<domain:chg><domain:registrant>" . htmlspecialchars($params['new_contactid']) . "</domain:registrant></domain:chg>\n";
} else {
$from[] = '/{{ add }}/';
$to[] = "<domain:add><domain:contact type=\"".htmlspecialchars($params['contacttype'])."\">".htmlspecialchars($params['new_contactid'])."</domain:contact></domain:add>\n";
$to[] = "<domain:add><domain:contact type=\"" . htmlspecialchars($params['contacttype']) . "\">" . htmlspecialchars($params['new_contactid']) . "</domain:contact></domain:add>\n";
$from[] = '/{{ rem }}/';
$to[] = "<domain:rem><domain:contact type=\"".htmlspecialchars($params['contacttype'])."\">".htmlspecialchars($params['old_contactid'])."</domain:contact></domain:rem>\n";
$to[] = "<domain:rem><domain:contact type=\"" . htmlspecialchars($params['contacttype']) . "\">" . htmlspecialchars($params['old_contactid']) . "</domain:contact></domain:rem>\n";
$from[] = '/{{ chg }}/';
$to[] = "";
}
@ -1502,14 +1503,14 @@ class eppClient
$to[] = htmlspecialchars($params['domainname']);
if ($params['command'] === 'add') {
$from[] = '/{{ add }}/';
$to[] = "<domain:add><domain:status s=\"".htmlspecialchars($params['status'])."\"/></domain:add>\n";
$to[] = "<domain:add><domain:status s=\"" . htmlspecialchars($params['status']) . "\"/></domain:add>\n";
$from[] = '/{{ rem }}/';
$to[] = "";
} else if ($params['command'] === 'rem') {
$from[] = '/{{ add }}/';
$to[] = "";
$from[] = '/{{ rem }}/';
$to[] = "<domain:rem><domain:status s=\"".htmlspecialchars($params['status'])."\"/></domain:rem>\n";
$to[] = "<domain:rem><domain:status s=\"" . htmlspecialchars($params['status']) . "\"/></domain:rem>\n";
}
$from[] = '/{{ clTRID }}/';
$clTRID = str_replace('.', '', round(microtime(1), 3));
@ -1632,10 +1633,10 @@ class eppClient
$from[] = '/{{ add }}/';
$to[] = "<secDNS:add>
<secDNS:dsData>
<secDNS:keyTag>".htmlspecialchars($params['keyTag_1'])."</secDNS:keyTag>
<secDNS:alg>".htmlspecialchars($params['alg_1'])."</secDNS:alg>
<secDNS:digestType>".htmlspecialchars($params['digestType_1'])."</secDNS:digestType>
<secDNS:digest>".htmlspecialchars($params['digest_1'])."</secDNS:digest>
<secDNS:keyTag>" . htmlspecialchars($params['keyTag_1']) . "</secDNS:keyTag>
<secDNS:alg>" . htmlspecialchars($params['alg_1']) . "</secDNS:alg>
<secDNS:digestType>" . htmlspecialchars($params['digestType_1']) . "</secDNS:digestType>
<secDNS:digest>" . htmlspecialchars($params['digest_1']) . "</secDNS:digest>
</secDNS:dsData>
</secDNS:add>";
$from[] = '/{{ rem }}/';
@ -1648,10 +1649,10 @@ class eppClient
$from[] = '/{{ rem }}/';
$to[] = "<secDNS:rem>
<secDNS:dsData>
<secDNS:keyTag>".htmlspecialchars($params['keyTag_1'])."</secDNS:keyTag>
<secDNS:alg>".htmlspecialchars($params['alg_1'])."</secDNS:alg>
<secDNS:digestType>".htmlspecialchars($params['digestType_1'])."</secDNS:digestType>
<secDNS:digest>".htmlspecialchars($params['digest_1'])."</secDNS:digest>
<secDNS:keyTag>" . htmlspecialchars($params['keyTag_1']) . "</secDNS:keyTag>
<secDNS:alg>" . htmlspecialchars($params['alg_1']) . "</secDNS:alg>
<secDNS:digestType>" . htmlspecialchars($params['digestType_1']) . "</secDNS:digestType>
<secDNS:digest>" . htmlspecialchars($params['digest_1']) . "</secDNS:digest>
</secDNS:dsData>
</secDNS:rem>";
$from[] = '/{{ addrem }}/';
@ -1664,18 +1665,18 @@ class eppClient
$from[] = '/{{ addrem }}/';
$to[] = "<secDNS:rem>
<secDNS:dsData>
<secDNS:keyTag>".htmlspecialchars($params['keyTag_1'])."</secDNS:keyTag>
<secDNS:alg>".htmlspecialchars($params['alg_1'])."</secDNS:alg>
<secDNS:digestType>".htmlspecialchars($params['digestType_1'])."</secDNS:digestType>
<secDNS:digest>".htmlspecialchars($params['digest_1'])."</secDNS:digest>
<secDNS:keyTag>" . htmlspecialchars($params['keyTag_1']) . "</secDNS:keyTag>
<secDNS:alg>" . htmlspecialchars($params['alg_1']) . "</secDNS:alg>
<secDNS:digestType>" . htmlspecialchars($params['digestType_1']) . "</secDNS:digestType>
<secDNS:digest>" . htmlspecialchars($params['digest_1']) . "</secDNS:digest>
</secDNS:dsData>
</secDNS:rem>
<secDNS:add>
<secDNS:dsData>
<secDNS:keyTag>".htmlspecialchars($params['keyTag_2'])."</secDNS:keyTag>
<secDNS:alg>".htmlspecialchars($params['alg_2'])."</secDNS:alg>
<secDNS:digestType>".htmlspecialchars($params['digestType_2'])."</secDNS:digestType>
<secDNS:digest>".htmlspecialchars($params['digest_2'])."</secDNS:digest>
<secDNS:keyTag>" . htmlspecialchars($params['keyTag_2']) . "</secDNS:keyTag>
<secDNS:alg>" . htmlspecialchars($params['alg_2']) . "</secDNS:alg>
<secDNS:digestType>" . htmlspecialchars($params['digestType_2']) . "</secDNS:digestType>
<secDNS:digest>" . htmlspecialchars($params['digest_2']) . "</secDNS:digest>
</secDNS:dsData>
</secDNS:add>";
}
@ -1820,7 +1821,6 @@ class eppClient
'acDate' => $acDate,
'exDate' => $exDate
);
} else if ($xmltype === 'apr') {
$xml = preg_replace($from, $to, '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0"
@ -1854,7 +1854,6 @@ class eppClient
'reID' => $reID,
'reDate' => $reDate
);
} else if ($xmltype === 'oth') {
$xml = preg_replace($from, $to, '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0"
@ -1879,7 +1878,6 @@ class eppClient
'code' => $code,
'msg' => $msg
);
}
} catch (\Exception $e) {
$return = array(
@ -2025,24 +2023,24 @@ class eppClient
if ($params['dnssec_records'] == 1) {
$from[] = '/{{ dnssec_data }}/';
$to[] = "<secDNS:dsData>
<secDNS:keyTag>".htmlspecialchars($params['keyTag_1'])."</secDNS:keyTag>
<secDNS:alg>".htmlspecialchars($params['alg_1'])."</secDNS:alg>
<secDNS:digestType>".htmlspecialchars($params['digestType_1'])."</secDNS:digestType>
<secDNS:digest>".htmlspecialchars($params['digest_1'])."</secDNS:digest>
<secDNS:keyTag>" . htmlspecialchars($params['keyTag_1']) . "</secDNS:keyTag>
<secDNS:alg>" . htmlspecialchars($params['alg_1']) . "</secDNS:alg>
<secDNS:digestType>" . htmlspecialchars($params['digestType_1']) . "</secDNS:digestType>
<secDNS:digest>" . htmlspecialchars($params['digest_1']) . "</secDNS:digest>
</secDNS:dsData>";
} else if ($params['dnssec_records'] == 2) {
$from[] = '/{{ dnssec_data }}/';
$to[] = "<secDNS:dsData>
<secDNS:keyTag>".htmlspecialchars($params['keyTag_1'])."</secDNS:keyTag>
<secDNS:alg>".htmlspecialchars($params['alg_1'])."</secDNS:alg>
<secDNS:digestType>".htmlspecialchars($params['digestType_1'])."</secDNS:digestType>
<secDNS:digest>".htmlspecialchars($params['digest_1'])."</secDNS:digest>
<secDNS:keyTag>" . htmlspecialchars($params['keyTag_1']) . "</secDNS:keyTag>
<secDNS:alg>" . htmlspecialchars($params['alg_1']) . "</secDNS:alg>
<secDNS:digestType>" . htmlspecialchars($params['digestType_1']) . "</secDNS:digestType>
<secDNS:digest>" . htmlspecialchars($params['digest_1']) . "</secDNS:digest>
</secDNS:dsData>
<secDNS:dsData>
<secDNS:keyTag>".htmlspecialchars($params['keyTag_2'])."</secDNS:keyTag>
<secDNS:alg>".htmlspecialchars($params['alg_2'])."</secDNS:alg>
<secDNS:digestType>".htmlspecialchars($params['digestType_2'])."</secDNS:digestType>
<secDNS:digest>".htmlspecialchars($params['digest_2'])."</secDNS:digest>
<secDNS:keyTag>" . htmlspecialchars($params['keyTag_2']) . "</secDNS:keyTag>
<secDNS:alg>" . htmlspecialchars($params['alg_2']) . "</secDNS:alg>
<secDNS:digestType>" . htmlspecialchars($params['digestType_2']) . "</secDNS:digestType>
<secDNS:digest>" . htmlspecialchars($params['digest_2']) . "</secDNS:digest>
</secDNS:dsData>";
}
$from[] = '/{{ clTRID }}/';