Skip to content

Commit 761898e

Browse files
VitexusVitexus
committed
Adaptation on namespaces
1 parent 9b97ca5 commit 761898e

13 files changed

Lines changed: 78 additions & 74 deletions

‎src/apply.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
fclose($testing);
166166

167167
if (!intval($errorCount) && !is_null($WarningCount)) {
168-
if (IEcfg::reloadIcinga()) {
168+
if (Vitexus/icinga_configurator::reloadIcinga()) {
169169
$oPage->container->addItem(_('Všechny vaše konfigurační soubory byly přegenerovány'));
170170
$oPage->container->addItem(new \Ease\TWB\LinkButton('main.php',
171171
_('Hotovo').' '.\Ease\TWB\Part::GlyphIcon('ok-sign'), 'success'));

‎src/classes/NSCPConfigBatGenerator.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,8 @@ public function cfgEnding()
395395
switch ($this->platform) {
396396
case 'windows':
397397
$this->nscBatArray[] = "\n".'echo ^<h1^>'._('Konfigurace hosta').' '.$this->host->getName().'^</h1^> >> %ICIEDIT_HTML%';
398-
$this->nscBatArray[] = "\n".'echo ^<br^>^<a data-role="editor" href="'.IEcfg::getBaseURL().'host.php?host_id='.$this->host->getId().'"^>'._('Konfigurace hosta').'^</a^> >> %ICIEDIT_HTML%';
399-
$this->nscBatArray[] = "\n".'echo ^<br^>^<a data-role="bat" href="'.IEcfg::getBaseURL().'nscpcfggen.php?host_id='.$this->host->getId().'"^>'._('Znovu stahnout').' '.$this->host->getName().'_nscp.bat'.'^</a^> >> %ICIEDIT_HTML%';
398+
$this->nscBatArray[] = "\n".'echo ^<br^>^<a data-role="editor" href="'.Vitexus/icinga_configurator::getBaseURL().'host.php?host_id='.$this->host->getId().'"^>'._('Konfigurace hosta').'^</a^> >> %ICIEDIT_HTML%';
399+
$this->nscBatArray[] = "\n".'echo ^<br^>^<a data-role="bat" href="'.Vitexus/icinga_configurator::getBaseURL().'nscpcfggen.php?host_id='.$this->host->getId().'"^>'._('Znovu stahnout').' '.$this->host->getName().'_nscp.bat'.'^</a^> >> %ICIEDIT_HTML%';
400400
$this->nscBatArray[] = "\n".'echo ^<br^>^<a data-role="confirm" href="'.$this->getCfgConfirmUrl().'"^>'._('Potvrzení konfigurace').'^</a^> >> %ICIEDIT_HTML%';
401401
$this->nscBatArray[] = "\n".'echo ^</body^> >> %ICIEDIT_HTML%';
402402
$this->nscBatArray[] = "\n".'echo ^</html^> >> %ICIEDIT_HTML%
@@ -462,7 +462,7 @@ public function getCfg($send = TRUE)
462462

463463
function getCfgConfirmUrl()
464464
{
465-
return IEcfg::getBaseURL().'cfgconfirm.php?hash='.$this->host->getConfigHash().'&host_id='.$this->host->getId();
465+
return Vitexus/icinga_configurator::getBaseURL().'cfgconfirm.php?hash='.$this->host->getConfigHash().'&host_id='.$this->host->getId();
466466
}
467467

468468
/**
@@ -482,13 +482,13 @@ public function deployScripts()
482482
foreach ($this->scriptsToDeploy as $script_name => $script_id) {
483483
switch ($this->platform) {
484484
case 'windows':
485-
$this->nscBatArray[] = "\n".'echo ^<a data-role="script" href="'.IEcfg::getBaseURL().'scriptget.php?script_id='.$script_id.'"^>'.$script_name.'^</a^>^<br^> >> %ICIEDIT_HTML%
485+
$this->nscBatArray[] = "\n".'echo ^<a data-role="script" href="'.Vitexus/icinga_configurator::getBaseURL().'scriptget.php?script_id='.$script_id.'"^>'.$script_name.'^</a^>^<br^> >> %ICIEDIT_HTML%
486486
';
487487
break;
488488
case 'linux':
489489
$this->nscBatArray[] = "\n".'
490490
# '.$script_name.'
491-
curl "'.IEcfg::getBaseURL().'scriptget.php?script_id='.$script_id.'"
491+
curl "'.Vitexus/icinga_configurator::getBaseURL().'scriptget.php?script_id='.$script_id.'"
492492
';
493493
break;
494494
default:

‎src/classes/Searcher.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ public function __construct($table = null, $column = null)
4141
$this->column = $column;
4242
parent::__construct();
4343

44-
$this->registerClass('Icinga\Editor\Engine\IEHost');
45-
$this->registerClass('Icinga\Editor\Engine\IEHostgroup');
46-
$this->registerClass('Icinga\Editor\Engine\IECommand');
47-
$this->registerClass('Icinga\Editor\Engine\IEService');
48-
$this->registerClass('Icinga\Editor\Engine\IEServicegroup');
49-
$this->registerClass('Icinga\Editor\Engine\IEContact');
50-
$this->registerClass('Icinga\Editor\Engine\IEContactgroup');
51-
$this->registerClass('Icinga\Editor\Engine\IETimeperiod');
44+
$this->registerClass('Icinga\Editor\Engine\Host');
45+
$this->registerClass('Icinga\Editor\Engine\Hostgroup');
46+
$this->registerClass('Icinga\Editor\Engine\Command');
47+
$this->registerClass('Icinga\Editor\Engine\Service');
48+
$this->registerClass('Icinga\Editor\Engine\Servicegroup');
49+
$this->registerClass('Icinga\Editor\Engine\Contact');
50+
$this->registerClass('Icinga\Editor\Engine\Contactgroup');
51+
$this->registerClass('Icinga\Editor\Engine\Timeperiod');
5252
}
5353

5454
public function registerClass($className)

‎src/classes/UI/GroupMembersEditor.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ public function __construct($fieldName, $fieldCaption, $dataSource, $members)
7878
$addText = _('Přiřadit');
7979
$delText = _('Odebrat');
8080

81+
$saverCode = htmlentities(str_replace('\\', '-',
82+
get_class($dataSource)));
83+
8184
if (count($membersAviableArray)) {
8285
foreach ($membersAviableArray as $memberID => $memberName) {
8386
$reftable = $dataSource->keywordsInfo[$fieldName]['refdata']['table'];
@@ -90,10 +93,10 @@ public function __construct($fieldName, $fieldCaption, $dataSource, $members)
9093
new \Ease\Html\ATag(null,
9194
\Ease\TWB\Part::GlyphIcon('plus-sign').' '.$addText,
9295
[
93-
'onClick' => "addGroupMember('".get_class($dataSource)."','".$dataSource->getId()."','".$fieldName."','".$memberName[$nameColumn]."','".$memberID."')"
96+
'onClick' => "addGroupMember('".$saverCode."','".$dataSource->getId()."','".$fieldName."','".$memberName[$nameColumn]."','".$memberID."')"
9497
, 'class' => 'handle', 'data-addtext' => $addText, 'data-deltext' => $delText])
9598
],
96-
['id' => get_class($dataSource).'_'.$fieldName.'_'.$memberID,
99+
['id' => $saverCode.'_'.$fieldName.'_'.$memberID,
97100
'style' => 'margin: 1px;']));
98101
}
99102
}
@@ -111,10 +114,10 @@ public function __construct($fieldName, $fieldCaption, $dataSource, $members)
111114
new \Ease\Html\ATag(null,
112115
\Ease\TWB\Part::GlyphIcon('remove').' '._('Odebrat'),
113116
[
114-
'onClick' => "delGroupMember('".get_class($dataSource)."','".$dataSource->getId()."','".$fieldName."','".$memberName."','".$memberID."')"
117+
'onClick' => "delGroupMember('".$saverCode."','".$dataSource->getId()."','".$fieldName."','".$memberName."','".$memberID."')"
115118
, 'class' => 'handle', 'data-addtext' => $addText, 'data-deltext' => $delText])
116119
],
117-
['id' => get_class($dataSource).'_'.$fieldName.'_'.$memberID,
120+
['id' => $saverCode.'_'.$fieldName.'_'.$memberID,
118121
'style' => 'margin: 1px;'])
119122
);
120123
}

‎src/classes/UI/UsedServiceSelector.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,11 @@ public function __construct($host)
8080

8181
if (count($allServices)) {
8282
foreach ($allServices as $serviceID => $serviceInfo) {
83+
8384
if (isset($parentServUsed[$serviceInfo['parent_id']])) {
8485
continue;
8586
}
87+
8688
$unchMenu = [];
8789

8890
if (intval($serviceInfo['parent_id'])) {

‎src/classes/engine/Host.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,9 @@ public function insertToSQL($data = null)
746746
$hostgroup = new Hostgroup(\Ease\Shared::user()->getUserLogin());
747747
$this->addMember('hostgroups', $hostgroup->getId(),
748748
$hostgroup->getName());
749+
750+
$this->setDataValue('hostgroups',
751+
serialize($this->getDataValue('hostgroups')));
749752
return parent::insertToSQL();
750753
}
751754
}

‎src/datasaver.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,10 @@
1515
die(_('nejprve se prosím přihlaš'));
1616
}
1717

18-
$saverClass = $oPage->GetRequestValue('SaverClass');
18+
$saverClass = str_replace('-', '\\', $oPage->GetRequestValue('SaverClass'));
1919
if ($saverClass == 'undefined') {
2020
exit;
2121
}
22-
if (!$saverClass) {
23-
$saverClass = 'LBSaver';
24-
}
25-
26-
if (file_exists('classes/'.$saverClass.'.php')) {
27-
require_once 'classes/'.$saverClass.'.php';
28-
} else {
29-
$oUser->addStatusMessage(_('Načítání souboru: classes/'.$saverClass.'.php'),
30-
'warning');
31-
}
3222

3323
$field = $oPage->getRequestValue('Field');
3424
$value = $oPage->getRequestValue('Value');

‎src/host.php‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,20 @@
2020

2121
switch ($oPage->getRequestValue('action')) {
2222
case 'applystemplate':
23-
$stemplate = new Stemplate($oPage->getRequestValue('stemplate_id',
24-
'int'));
23+
$stemplate = new Stemplate($oPage->getRequestValue('stemplate_id', 'int'));
2524
$services = $stemplate->getDataValue('services');
2625
if (count($services)) {
27-
$service = new Engine\Service;
26+
$service = new Engine\Service();
2827
foreach ($services as $service_id => $service_name) {
29-
$service->loadFromSQL($service_id);
30-
$service->addMember('host_name', $host->getId(),
31-
$host->getName());
32-
$service->saveToSQL();
33-
$service->dataReset();
28+
if ($service->loadFromSQL($service_id)) {
29+
$service->addMember('host_name', $host->getId(),
30+
$host->getName());
31+
$service->saveToSQL();
32+
$service->dataReset();
33+
} else {
34+
$service->addStatusMessage(_(sprintf(_('Služba uvedená v předloze (#%s: %s) nebyla v databázi nalezena'),
35+
$service_id, $service_name)));
36+
}
3437
}
3538
}
3639
$contacts = $stemplate->getDataValue('contacts');

‎src/js/groupmembers.js‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11

2-
function addGroupMember( oClass, oRecordId, oField, memberName, memberId ){
3-
$.post( "datasaver.php?operation=add", { SaverClass: oClass , Field: oField, Key: oRecordId, Value: memberName, ValueID: memberId }
4-
, function(data, status) {
2+
function addGroupMember(oClass, oRecordId, oField, memberName, memberId) {
3+
4+
$.post("datasaver.php?operation=add", {SaverClass: oClass, Field: oField, Key: oRecordId, Value: memberName, ValueID: memberId}
5+
, function (data, status) {
56
$("#" + oClass + "_" + oField + "_" + memberId + " button").removeClass('btn-inverse').addClass('btn-success');
67
var addlink = $("#" + oClass + "_" + oField + "_" + memberId + " .handle");
7-
$(addlink).attr("onClick", $(addlink).attr("onClick").toString().replace('addGroupMember','delGroupMember') );
8-
$(addlink).html('<span class="glyphicon glyphicon-remove"></span> ' + $(addlink).attr('data-deltext') );
9-
10-
}).fail(function(err, status) {
8+
$(addlink).attr("onClick", $(addlink).attr("onClick").toString().replace('addGroupMember', 'delGroupMember'));
9+
$(addlink).html('<span class="glyphicon glyphicon-remove"></span> ' + $(addlink).attr('data-deltext'));
10+
11+
}).fail(function (err, status) {
1112
$("#" + oClass + "_" + oField + "_" + memberId + " button").removeClass('btn-inverse').addClass('btn-danger');
12-
});
13+
});
1314
}
1415

15-
function delGroupMember( oClass, oRecordId, oField, memberName, memberId ){
16-
$.post( "datasaver.php?operation=del", { SaverClass: oClass , Field: oField, Key: oRecordId, Value: memberName, ValueID: memberId }
17-
, function(data, status) {
16+
function delGroupMember(oClass, oRecordId, oField, memberName, memberId) {
17+
$.post("datasaver.php?operation=del", {SaverClass: oClass, Field: oField, Key: oRecordId, Value: memberName, ValueID: memberId}
18+
, function (data, status) {
1819
$("#" + oClass + "_" + oField + "_" + memberId + " button").removeClass('btn-success').addClass('btn-inverse');
1920
var delLink = $("#" + oClass + "_" + oField + "_" + memberId + " .handle");
20-
$(delLink).attr("onClick", $(delLink).attr("onClick").toString().replace('delGroupMember','addGroupMember') );
21-
$(delLink).html('<span class="glyphicon glyphicon-plus-sign"></span> ' + $(delLink).attr('data-addtext') );
22-
23-
}).fail(function(err, status) {
21+
$(delLink).attr("onClick", $(delLink).attr("onClick").toString().replace('delGroupMember', 'addGroupMember'));
22+
$(delLink).html('<span class="glyphicon glyphicon-plus-sign"></span> ' + $(delLink).attr('data-addtext'));
23+
24+
}).fail(function (err, status) {
2425
$("#" + oClass + "_" + oField + "_" + memberId + " button").removeClass('btn-inverse').addClass('btn-danger');
25-
} );
26+
});
2627
}
2728

2829

‎src/reload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
$oPage->addItem(new UI\PageTop(_('Icinga Editor')));
1717

18-
IEcfg::reloadIcinga();
18+
Engine\Configurator::reloadIcinga();
1919

2020
$oPage->addItem(new UI\PageBottom());
2121

0 commit comments

Comments
 (0)