Fixed config files import during debian package install process

Author: Vitexus

composer.json

@@ -10,6 +10,7 @@
     ],
     "require": {
         "php": ">= 5.5.9",
+        "php-fileinfo": "*",
         "vitexsoftware/ease-framework": "dev-master"
     },
     "autoload": {

debian/install

@@ -18,7 +18,7 @@ debian/conf/icinga-editor.conf	etc/apache2/conf-available
 debian/conf/icinga-editor.service etc/avahi/services
 debian/conf/icinga-editor etc/sudoers.d
 debian/plugins/*        usr/lib/nagios/plugins
-debian/bin/iecfgimporter.php        usr/bin
+src/bin/iecfgimporter.php        usr/bin
 
 locale/cs_CZ/LC_MESSAGES/*.mo       usr/share/locale/cs_CZ/LC_MESSAGES
 locale/en_US/LC_MESSAGES/*.mo       usr/share/locale/cs_CZ/LC_MESSAGES

debian/links

@@ -0,0 +1,2 @@
+
+/usr/share/icinga/htdocs/images/logos /usr/share/icinga-editor/logos

debian/postinst

@@ -69,7 +69,7 @@ if [ ! -f $IECFG ] ; then
 
 
     #rm -f /etc/icinga-editor/config-db.sh
-    ln -s   /usr/share/icinga/htdocs/images/logos /usr/share/icinga-editor/logos
+    #(Moved To links file) ln -s   /usr/share/icinga/htdocs/images/logos /usr/share/icinga-editor/logos
 
 
     if [ "$1" = "configure" ]; then
@@ -104,7 +104,15 @@ if [ ! -f $IECFG ] ; then
                 fi
             fi
 
-            iecfgimporter.php
+            # Import configuration Question ?
+            db_input medium icinga-editor/IMPORT_CONFIG || true
+            db_go
+
+            # Check their answer.
+            db_get icinga-editor/IMPORT_CONFIG
+            if [ "$RET" = "true" ]; then
+                /usr/bin/iecfgimporter
+            fi
     fi
 
 fi

debian/rules

@@ -7,5 +7,6 @@ override_dh_install:
 	dh_install
 	sed -i -e 's/..\//.\//g' debian/icinga-editor/usr/share/icinga-editor/about.php
 	sed -i -e 's/..\/locale/\/usr\/share\/locale/g' debian/icinga-editor/usr/share/icinga-editor/includes/IEInit.php
-	sed -i -e 's/..\/vendor/\/var\/lib\/icinga-editor/g' debian/icinga-editor/usr/share/icinga-editor/includes/IEInit.php
 	sed -i -e 's/..\/i18n/\/usr\/share\/locale/g' debian/icinga-editor/usr/share/icinga-editor/includes/IEInit.php
+        mv debian/icinga-editor/usr/bin/iecfgimporter.php debian/icinga-editor/usr/bin/iecfgimporter
+

debian/templates

@@ -8,3 +8,9 @@ Type: string
 Description: IP address of ICINGA server
  Or simply press enter to use auto genrated value
 
+Template: icinga-editor/IMPORT_CONFIG
+Type: boolean
+Default: true
+Description: Import icinga config files ?
+ Choose yes to import all config files in /etc/icinga directory into database.
+ Imported files remain renamed to *.disabled

debian/templates.cs

@@ -0,0 +1,19 @@
+Template: icinga-editor/SEND_MAILS_FROM
+Type: string
+Description: mail address of icinga admin
+ Or simply press enter to use auto genrated name
+Description-cs: mailová adresa administrátora icingy
+
+Template: icinga-editor/ICINGA_SERVER_IP
+Type: string
+Description: IP address of ICINGA server
+ Or simply press enter to use auto genrated value
+Description-cs: IP adresa serveru ICINGA
+
+Template: icinga-editor/IMPORT_CONFIG
+Type: boolean
+Default: true
+Description: Import icinga config files ?
+ Choose yes to import all config files in /etc/icinga directory into
+ database. Imported files remain renamed to *.disabled
+Description-cs: Importovat konfigurační soubory icingy ?

debian/bin/iecfgimporter.php src/bin/iecfgimporter.phpdebian/bin/iecfgimporter.php renamed to src/bin/iecfgimporter.php

@@ -1,7 +1,6 @@
-#!/usr/bin/env php
+#!/usr/bin/env php -q
 <?php
-
-namespace Icinga\Editor;
+//namespace Icinga\Editor;
 
 /**
  * Import konfigurace ze souboru
@@ -11,21 +10,20 @@
  * @author     Vitex <vitex@hippy.cz>
  * @copyright  2015 Vitex@hippy.cz (G)
  */
-chdir('/usr/share/icinga-editor');
-
-require_once 'includes/IEInit.php';
+//require_once '/usr/share/icinga-editor/includes/IEInit.php';
+require_once '../includes/IEInit.php';
 
 $params = array('public' => true, 'generate' => true);
 
-$importer = new Engine\Importer($params);
+$importer = new Icinga\Editor\Engine\Importer($params);
 $importer->importCfgFile('/etc/icinga/icinga.cfg');
 
 foreach ($importer->files as $cfgFile) {
     if ($cfgFile == '/etc/icinga/icinga.cfg') {
         continue;
     }
-    if (unlink($cfgFile)) {
-        echo $cfgFile . " X\n";
+    if (rename($cfgFile, $cfgFile.'.disabled')) {
+        echo $cfgFile." imported\n";
     }
 }
 

src/classes/UI/IconSelector.php

@@ -113,24 +113,28 @@ public function __construct($host)
      */
     public static function imageTypeOK($tmpfilename)
     {
-        $finfo = new finfo(FILEINFO_MIME);
-        $info  = $finfo->file($tmpfilename);
-        if (!$info) {
-            return false;
-        }
-        if (strstr($info, 'gif')) {
-            return true;
-        }
-        if (strstr($info, 'png')) {
-            return true;
-        }
-        if (strstr($info, 'jpeg')) {
-            return true;
-        }
-        if (strstr($info, 'ico')) {
-            return true;
+        if (class_exists('\finfo')) {
+            $finfo = new \finfo(constant('FILEINFO_MIME'));
+            $info  = $finfo->file($tmpfilename);
+            if (!$info) {
+                return false;
+            }
+            if (strstr($info, 'gif')) {
+                return true;
+            }
+            if (strstr($info, 'png')) {
+                return true;
+            }
+            if (strstr($info, 'jpeg')) {
+                return true;
+            }
+            if (strstr($info, 'ico')) {
+                return true;
+            }
+        } else {
+            \Ease\Shared::webPage()->addStatusMessage('php-fileinfo ?!?!?',
+                'error');
         }
-
         return false;
     }
 

src/classes/UI/WebPage.php

@@ -7,7 +7,7 @@
  *
  * @package   VitexSoftware
  * @author    Vitex <vitex@hippy.cz>
- * @copyright 2009-2011 Vitex@hippy.cz (G)
+ * @copyright 2009-2016 Vitex@hippy.cz (G)
  */
 class WebPage extends \Ease\TWB\WebPage
 {
@@ -103,4 +103,5 @@ function onlyForLogged($loginPage = 'login.php')
     {
         return parent::onlyForLogged($loginPage.'?backurl='.urlencode($_SERVER['REQUEST_URI']));
     }
-}
+
+}