From f65a9d33ff4ba36aa9996f9e9d73e0b43d10c491 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Tue, 4 Dec 2018 21:05:03 -0700
Subject: [PATCH] Fix adding families, fix deleting families with interests
 (close #10)

---
 action.php              |  3 ++-
 lib/Family.lib.php      | 22 +++++++++++-----------
 pages/editfamily.php    |  6 +++---
 pages/families.php      |  4 +++-
 static/js/editfamily.js |  4 ----
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/action.php b/action.php
index 1e35883..345224b 100644
--- a/action.php
+++ b/action.php
@@ -180,7 +180,7 @@ switch ($VARS['action']) {
             }
         });
 
-        returnToSender("family_saved");
+        returnToSender("family_saved", "&id=" . $family->getID());
         break;
     case "deletefamily":
         if (!(new User($_SESSION['uid']))->hasPermission("HACHEPORTAL_EDIT")) {
@@ -189,6 +189,7 @@ switch ($VARS['action']) {
 
         if (!empty($VARS['familyid']) && $database->count("families", ['familyid' => $VARS['familyid']]) === 1) {
             $database->delete("people", ["familyid" => $VARS['familyid']]);
+            $database->delete("interests", ["familyid" => $VARS['familyid']]);
             $database->delete("payments", ["familyid" => $VARS['familyid']]);
             $database->delete("families", ["familyid" => $VARS['familyid']]);
             returnToSender("family_deleted");
diff --git a/lib/Family.lib.php b/lib/Family.lib.php
index 1b62448..384de00 100644
--- a/lib/Family.lib.php
+++ b/lib/Family.lib.php
@@ -9,17 +9,17 @@
 class Family {
 
     private $id;
-    private $name;
-    private $father;
-    private $mother;
-    private $phone;
-    private $email;
-    private $address;
-    private $city;
-    private $state;
-    private $zip;
-    private $photo;
-    private $newsletter;
+    private $name = "";
+    private $father = "";
+    private $mother = "";
+    private $phone = "";
+    private $email = "";
+    private $address = "";
+    private $city = "";
+    private $state = "";
+    private $zip = "";
+    private $photo = false;
+    private $newsletter = 1;
     private $children = [];
 
     public function __construct() {
diff --git a/pages/editfamily.php b/pages/editfamily.php
index 42c0f01..9037fe7 100644
--- a/pages/editfamily.php
+++ b/pages/editfamily.php
@@ -40,9 +40,9 @@ if (empty($VARS['id']) || !$database->has('families', ['familyid' => $VARS['id']
                 }
                 ?>
             </div>
-            <div class="ml-auto btn btn-outline-info btn-sm" id="cancelbtn">
+            <a href="./app.php?page=families" class="ml-auto btn btn-outline-info btn-sm">
                 <i class="fas fa-times"></i> <?php $Strings->get("Cancel"); ?>
-            </div>
+            </a>
         </h3>
 
         <div class="card-body">
@@ -300,8 +300,8 @@ if (empty($VARS['id']) || !$database->has('families', ['familyid' => $VARS['id']
             <?php
         }
         ?>
+        <input type="hidden" name="source" value="editfamily" />
         <input type="hidden" name="action" value="editfamily" />
-        <input type="hidden" name="source" value="families" />
 
         <div class="card-footer d-flex">
             <button type="submit" class="btn btn-success mr-1">
diff --git a/pages/families.php b/pages/families.php
index 3e63e93..5367ce0 100644
--- a/pages/families.php
+++ b/pages/families.php
@@ -18,7 +18,9 @@ $families = $database->select("families", ['familyid (id)', 'familyname', 'phone
 ?>
 
 <div class="btn-group">
-    <a href="app.php?page=editfamily" class="btn btn-success"><i class="fas fa-plus"></i> <?php $Strings->get("Add Family"); ?></a>
+    <?php if ($writeaccess) { ?>
+        <a href="app.php?page=editfamily" class="btn btn-success"><i class="fas fa-plus"></i> <?php $Strings->get("Add Family"); ?></a>
+    <?php } ?>
 </div>
 <table id="famtable" class="table table-bordered table-hover table-sm">
     <thead>
diff --git a/static/js/editfamily.js b/static/js/editfamily.js
index f66dfc1..96630b2 100644
--- a/static/js/editfamily.js
+++ b/static/js/editfamily.js
@@ -12,8 +12,4 @@ $("#add_child_row").click(function () {
     $.get("lib/template_child_entry.php", {}, function (resp) {
         $("#child_list").append(resp);
     });
-});
-
-$("#cancelbtn").click(function () {
-    history.back();
 });
\ No newline at end of file