Updated to current EaseFramewoek

Codeception tests added
Configuration switched to json

Author: Vitexus

codeception.yml

@@ -0,0 +1,10 @@
+paths:
+    tests: tests
+    output: tests/_output
+    data: tests/_data
+    support: tests/_support
+    envs: tests/_envs
+actor_suffix: Tester
+extensions:
+    enabled:
+        - Codeception\Extension\RunFailed

config.json

@@ -0,0 +1,14 @@
+{
+    "EASE_APPNAME": "IcingaEditor",
+    "DB_TYPE": "mysql",
+    "DB_HOST": "localhost",
+    "DB_PORT": 3306,
+    "DB_DATABASE": "icinga_editor",
+    "DB_USERNAME": "icinga_editor",
+    "DB_PASSWORD": "LojAstod9",
+    "SEND_MAILS_FROM": "noreply@vitexsoftware.cz",
+    "CFG_GENERATED": "/etc/icinga/generated/",
+    "EMAIL_FROM": "monitor@v.s.cz",
+    "SEND_INFO_TO": "info@vitexsoftware.cz",
+    "EASE_LOGGER": "syslog"
+}

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-common,monitoring-plugins-basic, mtr-tiny, php-image-graphviz, libjs-d3js, php5-cli, php5-intl, composer, libjs-twitter-bootstrap-switch, nsca, traceroute
+Depends: ${misc:Depends},libjs-twitter-bootstrap, ease-framework (>= 1.3), dbconfig-common , php-mail, php5-curl, icinga-common,monitoring-plugins-basic, mtr-tiny, php-image-graphviz, libjs-d3js, php5-cli, php5-intl, composer, libjs-twitter-bootstrap-switch, nsca, traceroute
 Recommends: mysql-server, graphicsmagick-imagemagick-compat, pnp4icinga,icinga-cgi,icinga-cgi-bin
 Pre-Depends: php-phinx,icinga-web,icinga-web-config-icinga
 Architecture: all

debian/install

@@ -17,6 +17,7 @@ debian/conf/composer.json           usr/share/icinga-editor/
 debian/conf/icinga-editor.conf      etc/apache2/conf-available
 debian/conf/icinga-editor.service   etc/avahi/services
 debian/conf/icinga-editor           etc/sudoers.d
+config.json                         etc/icinga-editor
 debian/plugins/*                    usr/lib/nagios/plugins
 src/iecfgimporter                   usr/bin
 bin/toicmdfile.sh                   usr/bin

debian/postinst

@@ -3,29 +3,18 @@
 
 set -e
 
-IECFG="/usr/share/icinga-editor/includes/Configure.php"
-
-
-if [ ! -f $IECFG ]; then
-    echo '<?php' > $IECFG
-fi
-
 #Replace Key Value in PhinX Config File
 replaceYML() {
     cfg="/var/lib/icinga-editor/phinx.yml"
     sed -i "/${1}:/c\        ${1}: ${2}" $cfg
 }
 
-replacePHP() {
-    if [ `cat ${IECFG} | grep "define('${1}'," | wc -l` = "0" ]; then
-        echo "define('${1}', '${2}');" >> ${IECFG}
-    else
-        sed -i "/${1}/c\define('${1}', '${2}');" ${IECFG}
-    fi
+replaceJSON() {
+    cfg="/etc/icinga-editor/config.json"
+    sed -i "/${1}/c\        \"${1}\": \"${2}\"," $cfg
 }
 
 
-
 . /usr/share/debconf/confmodule
 
 db_input critical icinga-editor/SEND_MAILS_FROM || true
@@ -59,9 +48,9 @@ IW_SERVER_PASSWORD=`cat $IWCFG | grep dbc_dbpass= | awk -F\' '{print $2}'`
 IW_DATABASE=`cat $IWCFG | grep dbc_dbname= | awk -F\' '{print $2}'`
 
 
-replacePHP "DB_IW_SERVER_USERNAME" $IW_SERVER_USERNAME
-replacePHP "DB_IW_SERVER_PASSWORD" $IW_SERVER_PASSWORD
-replacePHP "DB_IW_DATABASE" $IW_DATABASE
+replaceJSON "DB_IW_SERVER_USERNAME" $IW_SERVER_USERNAME
+replaceJSON "DB_IW_SERVER_PASSWORD" $IW_SERVER_PASSWORD
+replaceJSON "DB_IW_DATABASE" $IW_DATABASE
 
 if [ "$1" = "configure" ]; then
 
@@ -98,19 +87,13 @@ composer --no-dev -o update
 
     . /etc/icinga-editor/config-db.sh
 
-replacePHP "DB_TYPE" "mysql"
-replacePHP "DB_SERVER_HOST" "localhost"
-replacePHP "DB_SERVER_USERNAME" $dbuser
-replacePHP "DB_SERVER_PASSWORD" $dbpass
-replacePHP "DB_DATABASE" $dbname
-replacePHP "DB_PREFIX" ""
-replacePHP "SEND_MAILS_FROM" $SEND_MAILS_FROM
-
-#replacePHP "LOG_DIRECTORY" "/var/log/"
-#replacePHP "CFG_GENERATED" "/etc/icinga/generated/"
-#replacePHP "LOG_NAME" "IcingaEditor"
-#replacePHP "LOG_TYPE" "syslog"
-
+replaceJSON "DB_TYPE" "mysql"
+replaceJSON "DB_HOST" "localhost"
+replaceJSON "DB_USERNAME" $dbuser
+replaceJSON "DB_PASSWORD" $dbpass
+replaceJSON "DB_DATABASE" $dbname
+replaceJSON "DB_PREFIX" ""
+replaceJSON "SEND_MAILS_FROM" $SEND_MAILS_FROM
 
 replaceYML "adapter"    "mysql"
 replaceYML "host"       "localhost"

nbproject/private/private.xml

@@ -17,6 +17,10 @@
             <file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/host.php</file>
             <file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/login.php</file>
         </group>
-        <group/>
+        <group>
+            <file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/host.php</file>
+            <file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/classes/UI/WebPage.php</file>
+            <file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/classes/UI/FXPreloader.php</file>
+        </group>
     </open-files>
 </project-private>

src/classes/UI/PageBottom.php

@@ -3,13 +3,12 @@
 namespace Icinga\Editor\UI;
 
 /**
- * Spodek stránky
+ * Page Bottom
  *
  * @package    VitexSoftware
- * @subpackage WebUI
  * @author     Vitex <vitex@hippy.cz>
  */
-class PageBottom extends \Ease\TWB\Container
+class PageBottom extends \Ease\Html\FooterTag
 {
 
     /**
@@ -24,23 +23,17 @@ public function finalize()
 
         $appInfo = json_decode(file_get_contents($composer));
 
-
-        if (!defined('HIDEFOOTER')) {
-            $this->SetTagID('footer');
-            $this->addItem('<hr>');
-            $star    = '<iframe src="https://ghbtns.com/github-btn.html?user=Vitexus&repo=icinga_configurator&type=star&count=true" frameborder="0" scrolling="0" width="170px" height="20px"></iframe>';
-            $footrow = new \Ease\TWB\Row();
-            $footrow->addColumn(4,
-                '<a href="https://github.com/VitexSoftware/Icinga-Editor">Icinga Editor</a> v.: '.$appInfo->version.'&nbsp;&nbsp; &copy; 2012-2016 <a href="http://vitexsoftware.cz/">Vitex Software</a>');
-            $footrow->addColumn(4,
-                '<a href="http://www.austro-bohemia.cz/"><img style="position: relative;top: -2px; left: -10px; height: 25px" align="right" style="border:0" src="images/austro-bohemia-logo.png" alt="ABSRO" title="Pasivní checky napsány pro společnost Austro Bohemia s.r.o." /></a>');
-            $footrow->addColumn(4,
-                '<a href="http://www.spoje.net"><img style="position: relative; top: -7px; left: -10px;" align="right" style="border:0" src="img/spojenet_small_white.gif" alt="SPOJE.NET" title="Housing zajišťují SPOJE.NET s.r.o." /></a>');
-            $this->addItem($footrow);
+        $container = $this->setTagID('footer');
+        $this->addItem('<hr>');
+        $star      = '<iframe src="https://ghbtns.com/github-btn.html?user=Vitexus&repo=icinga_configurator&type=star&count=true" frameborder="0" scrolling="0" width="170px" height="20px"></iframe>';
+        $footrow   = new \Ease\TWB\Row();
+        $footrow->addColumn(4,
+            '<a href="https://github.com/VitexSoftware/Icinga-Editor">Icinga Editor</a> v.: '.$appInfo->version.'&nbsp;&nbsp; &copy; 2012-2017 <a href="http://vitexsoftware.cz/">Vitex Software</a>');
+        $footrow->addColumn(4,
+            '<a href="http://www.austro-bohemia.cz/"><img style="position: relative;top: -2px; left: -10px; height: 25px" align="right" style="border:0" src="images/austro-bohemia-logo.png" alt="ABSRO" title="Pasivní checky napsány pro společnost Austro Bohemia s.r.o." /></a>');
+        $footrow->addColumn(4,
+            '<a href="http://www.spoje.net"><img style="position: relative; top: -7px; left: -10px;" align="right" style="border:0" src="img/spojenet_small_white.gif" alt="SPOJE.NET" title="Housing zajišťují SPOJE.NET s.r.o." /></a>');
+        $this->addItem(new \Ease\TWB\Container($footrow));
 //        $Foot->addItem('<a href="https://twitter.com/VSMonitoring" class="twitter-follow-button" data-show-count="true" data-lang="cs">Sledovat @VSMonitoring</a>');
-        } else {
-            $this->addItem('<hr>Icinga Editor v.: '.$appInfo->version);
-        }
     }
-
 }

src/classes/UI/WebPage.php

@@ -13,25 +13,25 @@ class WebPage extends \Ease\TWB\WebPage
 {
     /**
      * Hlavní blok stránky
-     * @var \Ease\Html\Div
+     * @var \Ease\Html\DivTag
      */
     public $container = NULL;
 
     /**
      * První sloupec
-     * @var \Ease\Html\Div
+     * @var \Ease\Html\DivTag
      */
     public $columnI = NULL;
 
     /**
      * Druhý sloupec
-     * @var \Ease\Html\Div
+     * @var \Ease\Html\DivTag
      */
     public $columnII = NULL;
 
     /**
      * Třetí sloupec
-     * @var \Ease\Html\Div
+     * @var \Ease\Html\DivTag
      */
     public $columnIII = NULL;
 
@@ -59,7 +59,7 @@ public function __construct($pageTitle = null, &$userObject = null)
         $this->head->addItem('<link rel="apple-touch-icon-precomposed" href="img/vsmonitoring.png">');
         $this->head->addItem('<link rel="shortcut icon"  type="image/png" href="img/vsmonitoring.png">');
         $this->addItem('<br>');
-        $this->container    = $this->addItem(new \Ease\Html\Div(null,
+        $this->container    = $this->addItem(new \Ease\Html\DivTag(null,
             ['class' => 'container']));
     }
 
@@ -68,14 +68,14 @@ public function __construct($pageTitle = null, &$userObject = null)
      */
     function addPageColumns()
     {
-        $row = $this->container->addItem(new \Ease\Html\Div(null,
+        $row = $this->container->addItem(new \Ease\Html\DivTag(null,
             ['class' => 'row']));
 
-        $this->columnI   = $row->addItem(new \Ease\Html\Div(null,
+        $this->columnI   = $row->addItem(new \Ease\Html\DivTag(null,
             ['class' => 'col-md-4']));
-        $this->columnII  = $row->addItem(new \Ease\Html\Div(null,
+        $this->columnII  = $row->addItem(new \Ease\Html\DivTag(null,
             ['class' => 'col-md-4']));
-        $this->columnIII = $row->addItem(new \Ease\Html\Div(null,
+        $this->columnIII = $row->addItem(new \Ease\Html\DivTag(null,
             ['class' => 'col-md-4']));
     }
 
@@ -99,9 +99,10 @@ public function onlyForAdmin($loginPage = 'login.php')
      *
      * @param string $loginPage adresa přihlašovací stránky
      */
-    function onlyForLogged($loginPage = 'login.php')
+    function onlyForLogged($loginPage = 'login.php', $message = null)
     {
-        return parent::onlyForLogged($loginPage.'?backurl='.urlencode($_SERVER['REQUEST_URI']));
+        return parent::onlyForLogged($loginPage.'?backurl='.urlencode($_SERVER['REQUEST_URI']),
+                $message);
     }
 
 }