IP Fix

hhunderter · Mar 20, 2024 · 5f327a0 · 5f327a0
1 parent da2962a
commit 5f327a0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/config/config.php b/config/config.php
@@ -14,7 +14,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'radiohoerercharts',
-        'version' => '1.8.2',
+        'version' => '1.8.3',
         'icon_small' => 'fa-solid fa-list-ol',
         'author' => 'Reilard, Dennis alias hhunderter',
         'link' => 'https://github.com/hhunderter/radiohoerercharts',
@@ -358,6 +358,12 @@ public function getUpdate(string $installedVersion): string
                 */
                 // no break
             case "1.8.2":
+                // update zu 1.8.3
+                /*
+                 * IP Adresse wurde nicht gespeichert
+                */
+                // no break
+            case "1.8.3":
                 // update zu 1.?.?
                 /*
                 */

diff --git a/controllers/Index.php b/controllers/Index.php
@@ -101,6 +101,8 @@ public function indexAction()
                     if ($validation->isValid() && $validation_indb->isValid()) {
                         $validation->getErrorBag()->addError('hoerercharts-d', 'Manipulation');
                     }
+
+                    $this->addMessage($validation->getErrorBag()->getErrorMessages(), 'danger', true);
                     $this->redirect()
                         ->withInput()
                         ->withErrors($validation->getErrorBag())

diff --git a/mappers/HoererChartsUserVotes.php b/mappers/HoererChartsUserVotes.php
@@ -116,6 +116,7 @@ public function save(EntriesModel $model): int
                 ->values($fields)
                 ->execute();
         }
+
         return $result;
     }
 
@@ -257,7 +258,7 @@ public function getEntryByUserSessionIp(?\Modules\User\Models\User $User = null)
         if (!$voteId && $User_Id === 0) {
             $voteId = (int) $this->db()->select('id')
                 ->from($this->tablename)
-                ->Where(['ip_address' => $ip])
+                ->Where(['ip_address' => $ip, 'user_id' => 0])
                 ->execute()
                 ->fetchCell();
         }
@@ -319,6 +320,7 @@ public function isVoted(?\Modules\User\Models\User $User = null): bool
                 $entryModel->setUserId($User_Id);
             }
             $entryModel->setSessionId(session_id());
+            $entryModel->setIp($this->getIp());
             $this->save($entryModel);
             return $returnvalue;
         } else {

diff --git a/models/HoererChartsList.php b/models/HoererChartsList.php
@@ -161,8 +161,8 @@ public function getArray(bool $withId = true): array
         return array_merge(
             ($withId ? ['id' => $this->getId()] : []),
             [
-                'hid'       => $this->getHId(),
-                'list'     => $this->getList(),
+                'hid'   => $this->getHId(),
+                'list'  => $this->getList(),
             ]
         );
     }

diff --git a/models/HoererChartsUserVotes.php b/models/HoererChartsUserVotes.php
@@ -186,10 +186,10 @@ public function getArray(bool $withId = true): array
         return array_merge(
             ($withId ? ['id' => $this->getId()] : []),
             [
-                'user_id'       => $this->getUserId(),
-                'session_id'     => $this->getSessionId(),
+                'user_id'           => $this->getUserId(),
+                'session_id'        => $this->getSessionId(),
                 'last_activity'     => $this->getLastActivity(),
-                'ip_address'     => $this->getIp(),
+                'ip_address'        => $this->getIp(),
             ]
         );
     }