HotfFix Invalid max_check_attempts, check_interval, retry_interval, or notification_interval value for services

& other misc fixes

Author: Vitexus

debian/changelog

@@ -1,4 +1,4 @@
-icinga-editor (0.200-12) UNRELEASED; urgency=medium
+icinga-editor (0.200-15) UNRELEASED; urgency=medium
 
   [ dvorak ]
   * Initial release. (Closes: #XXXXXX)
@@ -24,5 +24,8 @@ icinga-editor (0.200-12) UNRELEASED; urgency=medium
   * Fix User(s content) delete
   * Namespace use fix for engine classes
   * Namespace use fix for engine classes II
+  * Deleting users fix
+  * Deleting users fix
+  * Deleting users fix
 
- -- vitex <vitex@developer.kancl.brevnov.czf>  Tue, 19 Jul 2016 15:32:49 +0200
+ -- vitex <vitex@developer.kancl.brevnov.czf>  Tue, 19 Jul 2016 17:46:48 +0200

debian/control

@@ -7,7 +7,7 @@ Priority: optional
 Homepage: http://vitexsoftware.cz/monitoring.php
 
 Package: icinga-editor
-Depends: ${misc:Depends},libjs-twitter-bootstrap, ease-framework, dbconfig-common , php-mail, php5-curl, icinga, mtr-tiny, php-image-graphviz, libjs-d3js, php5-cli, php5-intl, composer, libjs-twitter-bootstrap-switch
+Depends: ${misc:Depends},libjs-twitter-bootstrap, ease-framework, dbconfig-common , php-mail, php5-curl, icinga, mtr-tiny, php-image-graphviz, libjs-d3js, php5-cli, php5-intl, composer, libjs-twitter-bootstrap-switch, nsca
 Recommends: mysql-server,icinga-web, icinga-web-config-icinga, graphicsmagick-imagemagick-compat, pnp4icinga
 Architecture: all
 Section: web

debian/revison

@@ -1 +1 @@
-12
+15

src/apply.php

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

src/classes/NSCPConfigBatGenerator.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Icinga\Editor;
 
 /**
@@ -381,7 +382,7 @@ static function stripServiceName($serviceName)
     {
         return str_replace(' ', '_',
             preg_replace('/[^(\s:_\.a-zA-Z0-9)]*/', '',
-                EaseSand::rip($serviceName)));
+                \Ease\Sand::rip($serviceName)));
     }
 
     /**
@@ -395,8 +396,8 @@ public function cfgEnding()
         switch ($this->platform) {
             case 'windows':
                 $this->nscBatArray[] = "\n".'echo ^<h1^>'._('Konfigurace hosta').' '.$this->host->getName().'^</h1^> >> %ICIEDIT_HTML%';
-                $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%';
-                $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%';
+                $this->nscBatArray[] = "\n".'echo ^<br^>^<a data-role="editor" href="'.Engine\Configurator::getBaseURL().'host.php?host_id='.$this->host->getId().'"^>'._('Konfigurace hosta').'^</a^> >> %ICIEDIT_HTML%';
+                $this->nscBatArray[] = "\n".'echo ^<br^>^<a data-role="bat" href="'.Engine\Configurator::getBaseURL().'nscpcfggen.php?host_id='.$this->host->getId().'"^>'._('Znovu stahnout').' '.$this->host->getName().'_nscp.bat'.'^</a^> >> %ICIEDIT_HTML%';
                 $this->nscBatArray[] = "\n".'echo ^<br^>^<a data-role="confirm" href="'.$this->getCfgConfirmUrl().'"^>'._('Potvrzení konfigurace').'^</a^> >> %ICIEDIT_HTML%';
                 $this->nscBatArray[] = "\n".'echo ^</body^> >> %ICIEDIT_HTML%';
                 $this->nscBatArray[] = "\n".'echo ^</html^> >> %ICIEDIT_HTML%
@@ -462,7 +463,7 @@ public function getCfg($send = TRUE)
 
     function getCfgConfirmUrl()
     {
-        return Vitexus/icinga_configurator::getBaseURL().'cfgconfirm.php?hash='.$this->host->getConfigHash().'&host_id='.$this->host->getId();
+        return Engine\Configurator::getBaseURL().'cfgconfirm.php?hash='.$this->host->getConfigHash().'&host_id='.$this->host->getId();
     }
 
     /**
@@ -482,13 +483,13 @@ public function deployScripts()
             foreach ($this->scriptsToDeploy as $script_name => $script_id) {
                 switch ($this->platform) {
                     case 'windows':
-                        $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%
+                        $this->nscBatArray[] = "\n".'echo ^<a data-role="script" href="'.Engine\Configurator::getBaseURL().'scriptget.php?script_id='.$script_id.'"^>'.$script_name.'^</a^>^<br^> >> %ICIEDIT_HTML%
 ';
                         break;
                     case 'linux':
                         $this->nscBatArray[] = "\n".'
 # '.$script_name.'
-curl "'.Vitexus/icinga_configurator::getBaseURL().'scriptget.php?script_id='.$script_id.'"
+curl "'.Engine\Configurator::getBaseURL().'scriptget.php?script_id='.$script_id.'"
 ';
                         break;
                     default:

src/classes/User.php

@@ -373,7 +373,7 @@ public function delete($id = null)
             $email = new \Ease\Mailer($this->getDataValue('email'),
                 _('Oznámení o zrušení účtu'));
             $email->setMailHeaders(['From' => EMAIL_FROM]);
-            $email->addItem(new \Ease\Html\Div("Právě jste byl/a smazán/a z Aplikace VSMonitoring s těmito přihlašovacími údaji:\n"));
+            $email->addItem(new \Ease\Html\Div(_("Právě jste byl/a smazán/a z Aplikace VSMonitoring s těmito přihlašovacími údaji:")."\n"));
             $email->addItem(new \Ease\Html\Div(' Login: '.$this->GetUserLogin()."\n"));
 
             $email->send();

src/classes/engine/Service.php

@@ -460,16 +460,16 @@ public function controlAllData($allData)
                 }
 
                 if ($allData[$adKey]['max_check_attempts'] == 0) {
-                    unset($allData[$adKey]['max_check_attempts']);
+                    $allData[$adKey]['max_check_attempts'] = null;
                 }
                 if ($allData[$adKey]['check_interval'] == 0) {
-                    unset($allData[$adKey]['check_interval']);
+                    $allData[$adKey]['check_interval'] = null;
                 }
                 if ($allData[$adKey]['retry_interval'] == 0) {
-                    $allData[$adKey]['retry_interval'] == 60;
+                    $allData[$adKey]['retry_interval'] = null;
                 }
                 if ($allData[$adKey]['notification_interval'] == 0) {
-                    unset($allData[$adKey]['notification_interval']);
+                    $allData[$adKey]['notification_interval'] = null;
                 }
             }
         }