From 170e2796938fa48019a2eb57fa8190876159b2d5 Mon Sep 17 00:00:00 2001
From: Jacek Pyziak <jacek.pyziak@project-pro.pl>
Date: Fri, 8 Nov 2024 00:16:03 +0100
Subject: [PATCH] =?UTF-8?q?Poprawa=20walidacji=20danych=20w=20metodach=20p?=
 =?UTF-8?q?=C5=82atno=C5=9Bci=20oraz=20aktualizacja=20obs=C5=82ugi=20b?=
 =?UTF-8?q?=C5=82=C4=99d=C3=B3w=20w=20AJAX=20i=20poprawa=20formatowania=20?=
 =?UTF-8?q?kodu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop-payment-method/view-list.php         |  3 +-
 libraries/grid/ajax.php                       |  2 ++
 libraries/grid/gdb.min.php                    |  2 +-
 libraries/grid/grid.php                       |  5 +--
 libraries/grid/js/grid.js                     |  2 +-
 libraries/grid/templates/edit.php             | 32 +++++++++----------
 6 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/admin/templates/shop-payment-method/view-list.php b/admin/templates/shop-payment-method/view-list.php
index 08d9c01..23961f5 100644
--- a/admin/templates/shop-payment-method/view-list.php
+++ b/admin/templates/shop-payment-method/view-list.php
@@ -2,7 +2,8 @@
 global $gdb;
 foreach ( $this -> apilo_payment_types_list as $payment_type )
 {
-  $payment_types[ $payment_type['id'] ] = $payment_type['name'];
+  if ( isset( $payment_type['name'] ) && isset( $payment_type['id'] ) )
+    $payment_types[ $payment_type['id'] ] = $payment_type['name'];
 }
 // sellasist payment methods
 $sellasist_payment_types_list = [];
diff --git a/libraries/grid/ajax.php b/libraries/grid/ajax.php
index 56e203e..0d3214e 100644
--- a/libraries/grid/ajax.php
+++ b/libraries/grid/ajax.php
@@ -1,9 +1,11 @@
 <?php
+error_reporting( 0 );
 require_once dirname( __FILE__ ) . '/config.php';
 
 /* grid - zapisanie elementu */
 if ( $_POST['a'] == 'gsave' )
 {
+  $msg = '';
   $grid = $_SESSION[ 'g' . $_POST[ 'gtable' ] ];
   if ( is_a( $grid, 'grid' ) )
   {
diff --git a/libraries/grid/gdb.min.php b/libraries/grid/gdb.min.php
index f8a6c0e..43036f8 100644
--- a/libraries/grid/gdb.min.php
+++ b/libraries/grid/gdb.min.php
@@ -722,7 +722,7 @@ class gdb
 				}
 			}
 
-			$this->exec('INSERT INTO "' . $table . '" (' . implode(', ', $columns) . ') VALUES (' . implode($values, ', ') . ')');
+			$this->exec('INSERT INTO "' . $table . '" (' . implode(', ', $columns) . ') VALUES (' . implode(', ',$values) . ')');
 
 			$lastId[] = $this->pdo->lastInsertId();
 		}
diff --git a/libraries/grid/grid.php b/libraries/grid/grid.php
index f77c6e5..0b477ad 100644
--- a/libraries/grid/grid.php
+++ b/libraries/grid/grid.php
@@ -145,7 +145,7 @@ class grid
                     'server'        => $this -> gdb_opt['server'],
                     'username'      => $this -> gdb_opt['username'],
                     'password'      => $this -> gdb_opt['password'],
-                    'port'          => $this -> gdb_opt['port'],
+                    'port' => isset( $this -> gdb_opt['port'] ) ? $this -> gdb_opt['port'] : 3306,
                     'charset'       => 'utf8'
                   ] );
   }
@@ -437,6 +437,7 @@ class grid
 
   public function getDataSummary()
   {
+    $summary = [];
     $where = self::getWhereCondition();
 
     if ( is_array( $this -> summary ) ) foreach ( $this -> summary as $key )
@@ -511,7 +512,7 @@ class grid
 
   public function saveElement( $values )
   {
-    if ( !$values[ $this -> id ] )
+    if ( !isset( $values[ $this -> id ] ) or !$values[ $this -> id ] )
     {
       unset( $values[ $this -> id ] );
       return $this -> connectToDb() -> insert( $this -> table, $values );
diff --git a/libraries/grid/js/grid.js b/libraries/grid/js/grid.js
index 75f3a7c..bd3c5bb 100644
--- a/libraries/grid/js/grid.js
+++ b/libraries/grid/js/grid.js
@@ -631,7 +631,7 @@ jQuery( 'body' ).on( 'click', '#g-save, #g-edit-save', function()
         data:
         {
           gtable: gtable,
-          values: JSON.stringify( values ),
+          values: JSON.stringify( formattedValues ),
           a: 'gsave'
         },
         beforeSend: function()
diff --git a/libraries/grid/templates/edit.php b/libraries/grid/templates/edit.php
index 2f7289c..3985f72 100644
--- a/libraries/grid/templates/edit.php
+++ b/libraries/grid/templates/edit.php
@@ -17,19 +17,19 @@
                   <label for="<?= $ce['db'];?>" class="col-lg-3 control-label"><?= $ce['name'];?>:</label>
                   <? if ( $ce['type'] == 'text' ):?>
                     <div class="col-lg-9">
-                      <input type="text" class="form-control <? if ( $ce['require'] ):?>require<? endif;?>" name="<?= $ce['db'];?>" id="<?= $ce['db'];?>" 
-                        <? 
-                          if ( is_array( $ce['params'] ) ): foreach( $ce['params'] as $key => $val ): 
-                            echo $key . '="' . $val . '"'; 
+                      <input type="text" class="form-control <? if ( isset( $ce['require'] ) and $ce['require'] ):?>require<? endif;?>" name="<?= $ce['db'];?>" id="<?= $ce['db'];?>"
+                        <?
+                          if ( isset( $ce['params'] ) and is_array( $ce['params'] ) ): foreach( $ce['params'] as $key => $val ):
+                            echo $key . '="' . $val . '"';
                           endforeach; endif;
                         ?> value="<?= htmlspecialchars( $this -> element[ $ce['db'] ] );?>" <? if ( $ce['readonly-edit'] and $this -> element[ $this -> values['id'] ] ):?>readonly="readonly"<? endif;?> />
                     </div>
                   <? elseif ( $ce['type'] == 'select' ):?>
                     <div class="col-lg-9">
                       <select name="<?= $ce['db'];?>" id="<?= $ce['db'];?>" class="form-control <? if ( $ce['require'] ):?>require<? endif;?>"
-                        <? 
-                          if ( is_array( $ce['params'] ) ): foreach( $ce['params'] as $key => $val ): 
-                            echo $key . '="' . $val . '"'; 
+                        <?
+                          if ( is_array( $ce['params'] ) ): foreach( $ce['params'] as $key => $val ):
+                            echo $key . '="' . $val . '"';
                           endforeach; endif;
                         ?>>
                         <option value="null">---- <?= $ce['name'];?> ----</option>
@@ -38,20 +38,20 @@
                               $results = $_SESSION[ 'g' . $g_table ] -> connectToDb() -> query( $ce['replace']['sql'] ) -> fetchAll();
                               if ( is_array( $results ) ) foreach ( $results as $row )
                               {
-                                echo '<option value="' . $row[0] . '"'; 
+                                echo '<option value="' . $row[0] . '"';
                                  if ( $this -> element[ $ce['db'] ] !== null and $row[0] == $this -> element[ $ce['db'] ] )
                                    echo ' selected="selected" ';
                                 echo '>' . $row[1] . '</option>';
                               }
                             ?>
                         <? else:?>
-                          <? 
+                          <?
                             if ( is_array( $ce['replace']['array'] ) ): foreach ( $ce['replace']['array'] as $key => $val ):
                           ?>
-                            <option value="<?= $key;?>" 
-                              <? if ( 
+                            <option value="<?= $key;?>"
+                              <? if (
                                       ( $this -> element[ $ce['db'] ] !== null and $key == $this -> element[ $ce['db'] ] )
-                                        or 
+                                        or
                                       ( $this -> element[ $ce['db'] ] === null and isset( $ce['default_value']  ) and  $ce['default_value'] == $key )
                                     ):?>
                                 selected="selected"
@@ -59,7 +59,7 @@
                             >
                               <?= $val;?>
                             </option>
-                          <? 
+                          <?
                             endforeach; endif;
                           ?>
                         <? endif;?>
@@ -77,9 +77,9 @@
                   <? elseif ( $ce['type'] == 'textarea' ):?>
                     <div class="col col-lg-9">
                       <textarea name="<?= $ce['db'];?>" id="<?= $ce['db'];?>" class="form-control"
-                      <? 
-                        if ( is_array( $ce['params'] ) ): foreach( $ce['params'] as $key => $val ): 
-                          echo $key . '="' . $val . '"'; 
+                      <?
+                        if ( isset( $ce['params'] ) and is_array( $ce['params'] ) ): foreach( $ce['params'] as $key => $val ):
+                          echo $key . '="' . $val . '"';
                         endforeach; endif;
                       ?>><?= $this -> element[ $ce['db'] ];?></textarea>
                     </div>