Skip to content

Commit cfffebd

Browse files
tsmrtsmr
committed
Rename Class / Files
1 parent b44c606 commit cfffebd

File tree

13 files changed

+111
-112
lines changed

13 files changed

+111
-112
lines changed

‎ajax/addressing.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
use GlpiPlugin\Addressing\Filter;
3232
use GlpiPlugin\Addressing\Ping_Equipment;
33-
use GlpiPlugin\Addressing\Reserveip;
33+
use GlpiPlugin\Addressing\ReserveIp;
3434

3535
Session::checkLoginUser();
3636
Session::checkRight('plugin_addressing', UPDATE);
@@ -67,8 +67,8 @@
6767
Html::popHeader(__s('IP reservation', 'addressing'), $_SERVER['PHP_SELF']);
6868

6969
if (filter_var($_GET["ip"], FILTER_VALIDATE_IP)) {
70-
$Reserveip = new Reserveip();
71-
$Reserveip->showReservationForm($_GET["ip"], $_GET['id_addressing'], $_GET['rand']);
70+
$ReserveIp = new ReserveIp();
71+
$ReserveIp->showReservationForm($_GET["ip"], $_GET['id_addressing'], $_GET['rand']);
7272
}
7373

7474
Html::popFooter();

‎ajax/ipcomment.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// ----------------------------------------------------------------------
3333

3434

35-
use GlpiPlugin\Addressing\Ipcomment;
35+
use GlpiPlugin\Addressing\IpComment;
3636

3737
Session::checkRight('plugin_addressing', UPDATE);
3838
header("Content-Type: application/json; charset=UTF-8");
@@ -51,7 +51,7 @@
5151
$ipname = $_POST['ipname'];
5252
$content = $_POST['contentC'];
5353

54-
$ipcomment = new Ipcomment();
54+
$ipcomment = new IpComment();
5555
if ($ipcomment->getFromDBByCrit(['plugin_addressing_addressings_id' => $addressing_id, 'ipname' => $ipname])) {
5656
$ipcomment->update(['id' => $ipcomment->getID(), 'comments' => $content]);
5757
} else {

‎ajax/ping.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
use Glpi\Exception\Http\NotFoundHttpException;
3636
use GlpiPlugin\Addressing\Config;
3737
use GlpiPlugin\Addressing\Ping_Equipment;
38-
use GlpiPlugin\Addressing\Pinginfo;
38+
use GlpiPlugin\Addressing\PingInfo;
3939
use GlpiPlugin\Addressing\Report;
4040

4141
Session::checkRight('plugin_addressing', UPDATE);
@@ -58,7 +58,7 @@
5858
$ping_equip = new Ping_Equipment();
5959
list($message, $error) = $ping_equip->ping($system, $ip);
6060

61-
$plugin_addressing_pinginfo = new Pinginfo();
61+
$plugin_addressing_pinginfo = new PingInfo();
6262

6363
$ping_value = $ping_equip->ping($system, $ip, "true");
6464

‎ajax/updatepinginfo.php‎

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

3434

3535
use GlpiPlugin\Addressing\Addressing;
36-
use GlpiPlugin\Addressing\Pinginfo;
36+
use GlpiPlugin\Addressing\PingInfo;
3737

3838
Session::checkRight('plugin_addressing', UPDATE);
3939
header("Content-Type: application/json; charset=UTF-8");
@@ -48,7 +48,7 @@
4848
$old_execution = ini_set("max_execution_time", "0");
4949
$addressing = new Addressing();
5050
$addressing->getFromDB($addressing_id);
51-
$pingInfo = new Pinginfo();
51+
$pingInfo = new PingInfo();
5252
$pingInfo->updateAnAddressing($addressing);
5353
ini_set("max_execution_time", $old_execution);
5454

‎front/reserveip.form.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@
2929

3030

3131
use GlpiPlugin\Addressing\Addressing;
32-
use GlpiPlugin\Addressing\Reserveip;
32+
use GlpiPlugin\Addressing\ReserveIp;
3333

3434
Session::checkLoginUser();
3535

36-
$reserveip = new Reserveip();
36+
$reserveip = new ReserveIp();
3737

3838
if (isset($_POST['add'])) {
3939
$reserveip->check(-1, CREATE, $_POST);
4040
$reserveip->reserveip($_POST);
41-
Html::popHeader(Reserveip::getTypeName());
41+
Html::popHeader(ReserveIp::getTypeName());
4242
echo "<div class='alert alert-important alert-info d-flex'>";
4343
echo __("The address has been reserved", "addressing");
4444
echo "</div>";
4545
Html::popFooter();
4646
} else {
47-
Html::header(Reserveip::getTypeName(), '', "tools", Addressing::class);
47+
Html::header(ReserveIp::getTypeName(), '', "tools", Addressing::class);
4848
if (filter_var($_REQUEST["ip"], FILTER_VALIDATE_IP)) {
4949
$reserveip->showReservationForm($_REQUEST["ip"], $_REQUEST["id_addressing"], $_REQUEST['rand']);
5050
}

‎hook.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
use GlpiPlugin\Addressing\Addressing;
3131
use GlpiPlugin\Addressing\Filter;
32-
use GlpiPlugin\Addressing\Pinginfo;
32+
use GlpiPlugin\Addressing\PingInfo;
3333
use GlpiPlugin\Addressing\Profile;
3434
use GlpiPlugin\Addressing\Report;
3535

@@ -127,7 +127,7 @@ function plugin_addressing_install()
127127
//Drop old profile table : not used anymore
128128
$migration = new Migration("2.5.0");
129129
$migration->dropTable('glpi_plugin_addressing_profiles');
130-
CronTask::Register(Pinginfo::class, 'UpdatePing', DAY_TIMESTAMP);
130+
CronTask::Register(PingInfo::class, 'UpdatePing', DAY_TIMESTAMP);
131131

132132
if (!$DB->request([
133133
'FROM' => 'glpi_displaypreferences',
@@ -349,6 +349,6 @@ function plugin_addressing_postinit()
349349

350350
foreach (Addressing::getTypes() as $type) {
351351
$PLUGIN_HOOKS['item_purge']['addressing'][$type]
352-
= [Pinginfo::class, 'cleanForItem'];
352+
= [PingInfo::class, 'cleanForItem'];
353353
}
354354
}

‎setup.php‎

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

3131
use Glpi\Plugin\Hooks;
3232
use GlpiPlugin\Addressing\Addressing;
33-
use GlpiPlugin\Addressing\Pinginfo;
33+
use GlpiPlugin\Addressing\PingInfo;
3434
use GlpiPlugin\Addressing\Profile;
3535

3636
define('PLUGIN_ADDRESSING_VERSION', '3.1.0');
@@ -68,7 +68,7 @@ function plugin_init_addressing()
6868
$PLUGIN_HOOKS['config_page']['addressing'] = 'front/config.php';
6969
}
7070

71-
$PLUGIN_HOOKS['post_item_form']['addressing'] = [Pinginfo::class,
71+
$PLUGIN_HOOKS['post_item_form']['addressing'] = [PingInfo::class,
7272
'getPingResponseForItem'];
7373

7474
// Add specific files to add to the header : javascript or css

‎src/Addressing.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static function getIcon()
7979
**/
8080
public function cleanDBonPurge()
8181
{
82-
$temp1 = new Pinginfo();
82+
$temp1 = new PingInfo();
8383
$temp1->deleteByCriteria(array('plugin_addressing_addressings_id' => $this->fields['id']));
8484
$temp2 = new Filter();
8585
$temp2->deleteByCriteria(array('plugin_addressing_addressings_id' => $this->fields['id']));

‎src/Ipcomment.php‎ renamed to ‎src/IpComment.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
}
3737

3838
/**
39-
* Class Ipcomment
39+
* Class IpComment
4040
*/
41-
class Ipcomment extends CommonDBTM
41+
class IpComment extends CommonDBTM
4242
{
4343
public static $rightname = "plugin_addressing";
4444

‎src/Pinginfo.php‎ renamed to ‎src/PingInfo.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
}
4242

4343
/**
44-
* Class Pinginfo
44+
* Class PingInfo
4545
*/
46-
class Pinginfo extends CommonDBTM
46+
class PingInfo extends CommonDBTM
4747
{
4848
public static $rightname = "plugin_addressing";
4949

@@ -115,7 +115,7 @@ public function updateAnAddressing(Addressing $addressing)
115115
$result = $addressing->compute(0, ['ipdeb' => $ipdeb,
116116
'ipfin' => $ipfin,
117117
'entities' => $addressing->fields['entities_id']]);
118-
$plugin_addressing_pinginfo = new Pinginfo();
118+
$plugin_addressing_pinginfo = new PingInfo();
119119
$save = $plugin_addressing_pinginfo->find(['plugin_addressing_addressings_id' => $addressing->getID()]);
120120
$plugin_addressing_pinginfo->deleteByCriteria(['plugin_addressing_addressings_id' => $addressing->getID()]);
121121

@@ -135,7 +135,7 @@ private function updatePingInfos($result, Addressing $Addressing)
135135

136136
$ping_response = 0;
137137

138-
$plugin_addressing_pinginfo = new Pinginfo();
138+
$plugin_addressing_pinginfo = new PingInfo();
139139

140140
foreach ($result as $num => $lines) {
141141
$ip = Report::string2ip(substr($num, 2));
@@ -170,7 +170,7 @@ public static function getPingResponseForItem($params)
170170
&& in_array($item->getType(), Addressing::getTypes()) && $item->getID() > 0) {
171171
$items_id = $item->getID();
172172
$itemtype = $item->getType();
173-
$plugin_addressing_pinginfo = new Pinginfo();
173+
$plugin_addressing_pinginfo = new PingInfo();
174174

175175
$ping_action = 0;
176176
$ping_value = 0;

0 commit comments

Comments
 (0)