Merge branch 'develop' of github.com:w-disaster/fineartprints into develop

Author: rbattistini

api-add-credit-card.php

@@ -13,7 +13,7 @@
         if (count($dbh->isPaymentInfoRemoved($_SESSION["email"], $_GET["number"])) != 0) {
             $dbh->updatePaymentInfo($_SESSION["email"], $_GET["number"], "in use");
         } else {
-            $dbh->addPaymentInfo( $_SESSION["email"], $_GET["number"]);
+            $dbh->addPaymentInfo(htmlspecialchars($_SESSION["email"]), htmlspecialchars($_GET["number"]));
         }
         $result = $_GET["number"];
     }

checkout.php

@@ -3,7 +3,7 @@
 require_once 'utils/functions.php';
 
 
-if(isUserLoggedIn("customer") && count($_SESSION["final_products"]) > 0){
+if(isUserLoggedIn("customer") && isset($_SESSION["final_products"])){
 
     if(isset($_SESSION["final_products"])){
         $finalProducts = $_SESSION["final_products"];
@@ -56,7 +56,8 @@
 
     require 'template/base.php';
 } else{
-    require 'home.php';
+
+    require 'index.php';
 }
 
 ?>

css/categories_style.css

@@ -12,7 +12,8 @@ h3{
 }
 
 p{
-    text-align: center;
+    font-size: 20px !important;
+    font-weight: bold !important;
 }
 
 .border-2 {
@@ -33,6 +34,7 @@ p{
     transform: translate(-50%, -50%);
     -ms-transform: translate(-50%, -50%);
     text-align: center;
+    
 }
 
 

login.php

@@ -13,6 +13,7 @@
 
 if (isUserLoggedIn(UserType::Customer)) {
     header("Location: customer-area.php");
+
 } else if (isUserLoggedIn(UserType::Seller)) {
     header("Location: seller-profile.php");
 } else {

template/categories-template.php

@@ -10,28 +10,16 @@
 
             <?php if($i == 0): ?> <div class="row border  bg-white mx-0 mb-4 px-5 py-3"> <?php endif; ?>
 
-            <div class="col-6 d-block d-sm-none d-flex align-items-center py-5">
+            <div class="col-6 col-md-3  d-flex align-items-center py-5">
                 <a href="shop.php?category=<?php echo $category["Name"]; ?>">
                     <img class="img-fluid category-image" src="<?php echo UPLOAD_DIR.$category["Image"]; ?>" 
                         alt="<?php echo $category["Name"].", orientation: ".$category["Orientation"]; ?>" />
                 </a>
                 <a href="shop.php?category=<?php echo $category["Name"]; ?>" 
-                    class="middle text-white bg-dark p-2"><h5 class="m-0"><?php echo $category["Name"]; ?></h5>
+                    class="middle text-white bg-dark p-2"><p class="m-0"><?php echo $category["Name"]; ?></p>
                 </a>
             </div>
 
-            <div class="col-sm-3 d-none d-sm-block py-5">
-                <div class="h-100 d-flex align-items-center">
-                    <a href="shop.php?category=<?php echo $category["Name"]; ?>">
-                        <img class="img-fluid category-image" src="<?php echo UPLOAD_DIR.$category["Image"]; ?>" 
-                            alt="<?php echo $category["Name"].", orientation: ".$category["Orientation"]; ?>" />
-                    </a>
-                    <a href="shop.php?category=<?php echo $category["Name"]; ?>" 
-                        class="middle text-white bg-dark p-2"><h4 class="m-0"><?php echo $category["Name"]; ?></h4>
-                    </a>
-                </div>
-            </div>
-
             <?php if($i == 3): $i = -1; ?> </div> <?php endif; ?>
             <?php $i++ ?>
 

utils/shop-filters.php

@@ -8,8 +8,6 @@ class ShopFilters{
     private $filtered_categories;
     private $order;
 
-    public function __construct(){}
-
     public function setFilteredAuthors($authors){
         $this->filtered_authors = $authors;
     }