Fixed calling Classes when generate config

Author: Vitexus

src/apply.php

@@ -126,7 +126,7 @@
 
             if (strstr($line, 'has no services associated with it!')) {
                 preg_match("/\'(.*)\'/", $line, $keywords);
-                $host = & $generator->IEClasses['host'];
+                $host = & $generator->Classes['host'];
                 $host->setmyKeyColumn($host->nameColumn);
                 $host->loadFromSQL($keywords[1]);
                 $host->resetObjectIdentity();

src/classes/engine/Importer.php

@@ -22,7 +22,7 @@ class Importer extends Configurator
      * Pole parsovacích tříd
      * @var array
      */
-    public $IEClasses = [];
+    public $Classes = [];
 
     /**
      * Třída pro hromadné operace s konfigurací
@@ -32,14 +32,14 @@ class Importer extends Configurator
     public function __construct($params = null)
     {
         parent::__construct();
-        $this->registerClass('\Icinga\Editor\Engine\IETimeperiod');
-        $this->registerClass('\Icinga\Editor\Engine\IECommand');
-        $this->registerClass('\Icinga\Editor\Engine\IEService');
-        $this->registerClass('\Icinga\Editor\Engine\IEServicegroup');
-        $this->registerClass('\Icinga\Editor\Engine\IEContact');
-        $this->registerClass('\Icinga\Editor\Engine\IEContactgroup');
-        $this->registerClass('\Icinga\Editor\Engine\IEHost');
-        $this->registerClass('\Icinga\Editor\Engine\IEHostgroup');
+        $this->registerClass('\Icinga\Editor\Engine\Timeperiod');
+        $this->registerClass('\Icinga\Editor\Engine\Command');
+        $this->registerClass('\Icinga\Editor\Engine\Service');
+        $this->registerClass('\Icinga\Editor\Engine\Servicegroup');
+        $this->registerClass('\Icinga\Editor\Engine\Contact');
+        $this->registerClass('\Icinga\Editor\Engine\Contactgroup');
+        $this->registerClass('\Icinga\Editor\Engine\Host');
+        $this->registerClass('\Icinga\Editor\Engine\Hostgroup');
         if (is_array($params)) {
             $this->setData($params);
         }
@@ -53,15 +53,15 @@ public function __construct($params = null)
     public function registerClass($className)
     {
         $newClass                            = new $className;
-        $this->IEClasses[$newClass->keyword] = new $className;
+        $this->Classes[$newClass->keyword] = new $className;
     }
 
     /**
      * Znovu vytvoří struktury tabulek obejktů
      */
     public function dbInit()
     {
-        foreach ($this->IEClasses as $IEClass) {
+        foreach ($this->Classes as $IEClass) {
             $IEClass->dbInit();
         }
     }
@@ -117,7 +117,7 @@ public function importCfg($cfg)
             $this->setDataValue('register', 1);
         }
 
-        foreach ($this->IEClasses as $IEClass) {
+        foreach ($this->Classes as $IEClass) {
             $doneCount += $IEClass->importArray($cfg, $this->getData());
         }
         if ($doneCount) {
@@ -137,7 +137,7 @@ public function importCfg($cfg)
      */
     public function writeConfigs($fileName)
     {
-        foreach ($this->IEClasses as $ieClass) {
+        foreach ($this->Classes as $ieClass) {
             if ($ieClass->writeConfig($fileName)) {
                 $this->addStatusMessage($ieClass->keyword.': '._('konfigurace byla vygenerována'),
                     'success');

src/importer.php

@@ -15,7 +15,7 @@
 if ($oPage->isPosted() && $class) {
     $data = $_POST;
     $importer = new Engine\Importer();
-    $recorder = $importer->IEClasses[$class];
+    $recorder = $importer->Classes[$class];
     unset($data[$recorder->myKeyColumn]);
     unset($data[$recorder->userColumn]);
     $recorder->importDataRow($data);
@@ -24,7 +24,7 @@
     $recorder->restoreObjectIdentity();
     if ($iresult) {
         $recorder->loadFromSql($recorder->getName());
-        echo $importer->IEClasses[$class]->keyword . ': ' . $iresult . ' (#' . $recorder->getId() . ')';
+        echo $importer->Classes[$class]->keyword . ': ' . $iresult . ' (#' . $recorder->getId() . ')';
     } else {
         echo 'false';
     }

src/regenall.php

@@ -132,7 +132,7 @@
 
             if (strstr($line, 'has no services associated with it!')) {
                 preg_match("/\'(.*)\'/", $line, $keywords);
-                $host = & $generator->IEClasses['host'];
+                $host = & $generator->Classes['host'];
                 $host->setmyKeyColumn($host->nameColumn);
                 $host->loadFromSQL($keywords[1]);
                 $host->resetObjectIdentity();