DBFixer fixes

Author: Vitexus

src/classes/DbFixer.php

@@ -13,6 +13,7 @@ class DbFixer extends \Ease\Html\UlTag {
     public function __construct() {
         parent::__construct();
         $this->fixContactIDs();
+//        $this->fixServiceIDs();
         $this->fixHostNameIDs();
         $this->fixHostHostgroupID();
         $this->cleanUnusedServices();

src/classes/User.php

@@ -250,6 +250,25 @@ public function isAdmin() {
         return $this->getSettingValue('admin') === true;
     }
 
+    /**
+     * Unpack settings
+     * 
+     * @return boolean
+     */
+    public function loginSuccess() {
+        $this->restoreSettings();
+        return parent::loginSuccess();
+    }
+
+    public function restoreSettings() {
+        $this->settings = empty($this->getDataValue($this->settingsColumn)) ? [] : unserialize($this->getDataValue($this->settingsColumn));
+    }
+
+    public function __wakeup() {
+        parent::__wakeup();
+        $this->restoreSettings();
+    }
+
     /**
      * Common instance of User class
      * 

src/classes/engine/Configurator.php

@@ -144,6 +144,7 @@ public function __construct($itemID = null) {
             $_SESSION['parentCache'] = [];
         }
         $this->parentCache = &$_SESSION['parentCache'];
+        $this->getFluentPDO(true, true);
         parent::__construct($itemID, Shared::singleton()->configuration);
         $this->user = Shared::user();
 //       foreach ($this->useKeywords as $KeyWord => $ColumnType) {
@@ -231,7 +232,7 @@ public function loadFromSQL($itemID = null, $dataPrefix = null,
         if ($ownerid) {
             $this->owner = new User((int) $ownerid);
         }
-
+        $this->data = self::unserializeArrays($this->getData());
         return $result;
     }
 
@@ -1478,21 +1479,22 @@ public function saveMembers() {
      * @return array
      */
     public static function unserializeArrays($allData) {
-        foreach ($allData as $keyWord => $keyData) {
-            if (is_array($keyData)) {
-                $allData[$keyWord] = self::unserializeArrays($keyData);
-            } else {
-                if (strlen($keyData) && (substr($keyData, 0, 2) == 'a:')) {
-                    if (self::isSerialized($keyData)) {
-                        $allData[$keyWord] = unserialize(stripslashes($keyData));
-                    } else {
-                        Shared::webPage()->addStatusMessage(_('Deserialization error') . ':' . $keyData,
-                                'error');
+        if (is_array($allData)) {
+            foreach ($allData as $keyWord => $keyData) {
+                if (is_array($keyData)) {
+                    $allData[$keyWord] = self::unserializeArrays($keyData);
+                } else {
+                    if (strlen($keyData) && (substr($keyData, 0, 2) == 'a:')) {
+                        if (self::isSerialized($keyData)) {
+                            $allData[$keyWord] = unserialize(stripslashes($keyData));
+                        } else {
+                            Shared::webPage()->addStatusMessage(_('Deserialization error') . ':' . $keyData,
+                                    'error');
+                        }
                     }
                 }
             }
         }
-
         return $allData;
     }
 

src/host.php

@@ -6,7 +6,7 @@
  * Icinga Host Editor
  *
  * @author     Vitex <vitex@hippy.cz>
- * @copyright  2012-2018 Vitex@hippy.cz (G)
+ * @copyright  2012-2020 Vitex@hippy.cz (G)
  */
 require_once 'includes/IEInit.php';
 

src/settings.php

@@ -39,7 +39,7 @@ function get_gravatar(email, size)
 
 $settingsFrame = new \Ease\TWB\Panel(_('Settings'));
 $settingsFrame->addItem(new \Ease\Html\ATag('https://secure.gravatar.com/',
-                $oUser, ['title' => _('Click to change icon')]));
+                new \Ease\Html\ImgTag($oUser->getIcon()) , ['title' => _('Click to change icon')]));
 
 $settingsFrame->addItem(new \Ease\TWB\FormGroup(_('Login name'),
                 new UI\TextInputSaver('login', $oUser->getUserLogin(), $oUser)));