Skip to content

Commit 427521b

Browse files
committed
Merge branch 'develop' of github.com:w-disaster/fineartprints into develop
2 parents de857b9 + b22ca09 commit 427521b

File tree

6 files changed

+10
-20
lines changed

6 files changed

+10
-20
lines changed

api-add-credit-card.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
if (count($dbh->isPaymentInfoRemoved($_SESSION["email"], $_GET["number"])) != 0) {
1414
$dbh->updatePaymentInfo($_SESSION["email"], $_GET["number"], "in use");
1515
} else {
16-
$dbh->addPaymentInfo( $_SESSION["email"], $_GET["number"]);
16+
$dbh->addPaymentInfo(htmlspecialchars($_SESSION["email"]), htmlspecialchars($_GET["number"]));
1717
}
1818
$result = $_GET["number"];
1919
}

checkout.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require_once 'utils/functions.php';
44

55

6-
if(isUserLoggedIn("customer") && count($_SESSION["final_products"]) > 0){
6+
if(isUserLoggedIn("customer") && isset($_SESSION["final_products"])){
77

88
if(isset($_SESSION["final_products"])){
99
$finalProducts = $_SESSION["final_products"];
@@ -56,7 +56,8 @@
5656

5757
require 'template/base.php';
5858
} else{
59-
require 'home.php';
59+
60+
require 'index.php';
6061
}
6162

6263
?>

css/categories_style.css

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ h3{
1212
}
1313

1414
p{
15-
text-align: center;
15+
font-size: 20px !important;
16+
font-weight: bold !important;
1617
}
1718

1819
.border-2 {
@@ -33,6 +34,7 @@ p{
3334
transform: translate(-50%, -50%);
3435
-ms-transform: translate(-50%, -50%);
3536
text-align: center;
37+
3638
}
3739

3840

login.php

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
if (isUserLoggedIn(UserType::Customer)) {
1515
header("Location: customer-area.php");
16+
1617
} else if (isUserLoggedIn(UserType::Seller)) {
1718
header("Location: seller-profile.php");
1819
} else {

template/categories-template.php

+2-14
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,16 @@
1010

1111
<?php if($i == 0): ?> <div class="row border bg-white mx-0 mb-4 px-5 py-3"> <?php endif; ?>
1212

13-
<div class="col-6 d-block d-sm-none d-flex align-items-center py-5">
13+
<div class="col-6 col-md-3 d-flex align-items-center py-5">
1414
<a href="shop.php?category=<?php echo $category["Name"]; ?>">
1515
<img class="img-fluid category-image" src="<?php echo UPLOAD_DIR.$category["Image"]; ?>"
1616
alt="<?php echo $category["Name"].", orientation: ".$category["Orientation"]; ?>" />
1717
</a>
1818
<a href="shop.php?category=<?php echo $category["Name"]; ?>"
19-
class="middle text-white bg-dark p-2"><h5 class="m-0"><?php echo $category["Name"]; ?></h5>
19+
class="middle text-white bg-dark p-2"><p class="m-0"><?php echo $category["Name"]; ?></p>
2020
</a>
2121
</div>
2222

23-
<div class="col-sm-3 d-none d-sm-block py-5">
24-
<div class="h-100 d-flex align-items-center">
25-
<a href="shop.php?category=<?php echo $category["Name"]; ?>">
26-
<img class="img-fluid category-image" src="<?php echo UPLOAD_DIR.$category["Image"]; ?>"
27-
alt="<?php echo $category["Name"].", orientation: ".$category["Orientation"]; ?>" />
28-
</a>
29-
<a href="shop.php?category=<?php echo $category["Name"]; ?>"
30-
class="middle text-white bg-dark p-2"><h4 class="m-0"><?php echo $category["Name"]; ?></h4>
31-
</a>
32-
</div>
33-
</div>
34-
3523
<?php if($i == 3): $i = -1; ?> </div> <?php endif; ?>
3624
<?php $i++ ?>
3725

utils/shop-filters.php

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ class ShopFilters{
88
private $filtered_categories;
99
private $order;
1010

11-
public function __construct(){}
12-
1311
public function setFilteredAuthors($authors){
1412
$this->filtered_authors = $authors;
1513
}

0 commit comments

Comments
 (0)