webinterface.git

@@ -58,6 +58,9 @@ function contact_to_apicontact($c)

     $ac['emailAddress'] = $c['email'];

     $ac['phoneNumber'] = $c['phone'];

     $ac['faxNumber'] = $c['fax'];

+    if ($c['state'] == 'deleted') {

+        $ac['hidden'] = true;

+    }

     return $ac;

 }

@@ -64,7 +64,7 @@ function get_contact($id)

 function get_contacts() {

     $cid = (int) $_SESSION['customerinfo']['customerno'];

-    $result = db_query("SELECT id, state, lastchange, nic_id, nic_handle, company, name, address, zip, city, country, phone, mobile, fax, email, pgp_id, pgp_key FROM kundendaten.contacts WHERE customer=? ORDER BY id", array($cid));

+    $result = db_query("SELECT id, state, lastchange, nic_id, nic_handle, company, name, address, zip, city, country, phone, mobile, fax, email, pgp_id, pgp_key FROM kundendaten.contacts WHERE (state<>'deleted' OR state IS NULL) AND customer=? ORDER BY id", array($cid));

     $ret = array();

     while ($contact = $result->fetch()) {

         $ret[$contact['id']] = $contact;

@@ -74,6 +74,15 @@ function get_contacts() {

 }

+function is_domainholder($contactid) {

+    $contactid = (int) $contactid;

+    $result = db_query("SELECT id FROM kundendaten.domains WHERE owner=? OR admin_c=?", array($contactid, $contactid));

+    if ($result->rowCount() > 0) {

+        return true;

+    }

+    return false;

+}

+

 function possible_domainholders() {

     $allcontacts = get_contacts();

     $ret = array();

@@ -193,3 +202,13 @@ function update_pending($contactid) {

+function delete_contact($id) {

+    $c = get_contact($id);

+    if ($c['nic_id']) {

+        // Lösche bei der Registry

+        $c['state'] = 'deleted';

+        upload_contact($c);

+    }

+    db_query("UPDATE kundendaten.contacts SET state='deleted' WHERE id=?", array($c['id']));

+}

+

@@ -30,11 +30,12 @@ $contacts = get_contacts();

 $kundenkontakte = get_kundenkontakte();

 output('<p>Sie haben aktuell diese Adressen gespeichert:</p>

-<table>

-<tr><th>#</th><th>Name</th><th>Adresse</th><th>E-Mail</th><th>Verwendung</th><th>Aktionen</th></tr>

-');

+<div class="contact-list">');

 foreach ($contacts as $id => $contact) {

-    $adresse = nl2br($contact['address']."\n".$contact['country'].'-'.$contact['zip'].' '.$contact['city']);

+    $adresse = nl2br("\n".$contact['address']."\n".$contact['country'].'-'.$contact['zip'].' '.$contact['city']);

+    if (! $contact['city']) {

+        $adresse = '';

+    }

     $usage = array();

     if ($id == $kundenkontakte['kunde']) {

         $usage[] = 'Stamm-Adresse';

@@ -58,16 +59,18 @@ foreach ($contacts as $id => $contact) {

     if ($new_email) {

         $email = "<strike>$email</strike><br/>".$new_email.footnote('Die E-Mail-Adresse wurde noch nicht bestätigt');

     }

-    $actions = array(

-        internal_link('edit', icon_edit('Adresse bearbeiten'), 'id='.$contact['id']),

-        internal_link('edit', other_icon('page_copy.png', 'Kopie erstellen'), 'id=new&copy='.$contact['id']),

-        

-    );

+    $actions = array();

+    $actions[] = internal_link('edit', icon_edit('Adresse bearbeiten')." Bearbeiten", 'id='.$contact['id']);

+    if ($id != $kundenkontakte['kunde'] && ! is_domainholder($id)) {

+        // Die Stamm-Adresse kann man nicht löschen und verwendete Domain-Kontakte auch nicht

+        $actions[] = internal_link('save', icon_delete('Adresse löschen')." Löschen", 'action=delete&id='.$contact['id']);

+    }

+    $actions[] = internal_link('edit', other_icon('page_copy.png', 'Kopie erstellen')." Kopie erstellen", 'id=new&copy='.$contact['id']);

-    output("<tr><td>{$contact['id']}</td><td><strong>".internal_link('edit', $name, 'id='.$contact['id'])."</strong></td><td>$adresse</td><td>$email</td><td>$usage</td><td>".implode(' ', $actions)."</td></tr>");

+    $email = implode("<br>\n", array_filter(array($email, $contact['phone'], $contact['fax'], $contact['mobile'])));

+    output("<div class=\"contact\" id=\"contact-{$contact['id']}\"><p class=\"contact-id\">#{$contact['id']}</p><p class=\"contact-address\"><strong>$name</strong>$adresse</p><p class=\"contact-contact\">$email</p><p class=\"contact-usage\">Verwendung als $usage</p><p class=\"contact-actions\">".implode(' ', $actions)."</p></div>");

 }

-output('</table>');

-output("<br />");

+output("</div><br />");

 addnew('edit', 'Neuen Kontakt erstellen', 'id=new');

@@ -24,6 +24,41 @@ require_once('session/start.php');

 require_role(array(ROLE_CUSTOMER));

 $section = 'contacts_list';

+if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete') {

+    $contact = get_contact($_REQUEST['id']);

+    

+    $adresse = nl2br("\n".$contact['address']."\n".$contact['country'].'-'.$contact['zip'].' '.$contact['city']);

+    if (! $contact['city']) {

+        $adresse = '';

+    }

+    $name = $contact['name'];

+    if ($contact['company']) {

+        $name = $contact['company']."<br />".$contact['name'];

+    }

+    $email = implode("<br>\n", array_filter(array($contact['email'], $contact['phone'], $contact['fax'], $contact['mobile'])));

+ 

+    $contact_string = "<div class=\"contact\" id=\"contact-{$contact['id']}\"><p class=\"contact-id\">#{$contact['id']}</p><p class=\"contact-address\"><strong>$name</strong>$adresse</p><p class=\"contact-contact\">$email</p></div>";

+    

+

+    $sure = user_is_sure();

+    if ($sure === NULL)

+    {

+       are_you_sure("action=delete&id={$contact['id']}", "Möchten Sie diese Adresse wirklich löschen? {$contact_string}");

+    }

+    elseif ($sure === true)

+    {

+       delete_contact($contact['id']);

+       if (! $debugmode)

+           header("Location: list");

+    }

+    elseif ($sure === false)

+    {

+        if (! $debugmode)

+            header("Location: list");

+    }

+

+

+} else {

     check_form_token('contacts_edit');

     $new = False;

@@ -121,3 +156,4 @@ if ($c['nic_id']) {

     if (! $debugmode)

         header("Location: list");

+}

@@ -0,0 +1,47 @@

+/*

+ * -------------------------------------------------------------------------------

+ * This file belongs to the Webinterface of schokokeks.org Hosting

+ * 

+ * Written 2008-2018 by schokokeks.org Hosting, namely

+ *    Bernd Wurst <bernd@schokokeks.org>

+ *    Hanno Böck <hanno@schokokeks.org>

+ *

+ * To the extent possible under law, the author(s) have dedicated all copyright 

+ * and related and neighboring rights to this software to the public domain 

+ * worldwide. This software is distributed without any warranty.

+ *

+ * You should have received a copy of the CC0 Public Domain Dedication along 

+ * with this software. If not, see 

+ * http://creativecommons.org/publicdomain/zero/1.0/

+ *

+ * Nevertheless, in case you use a significant part of this code, we ask (but 

+ * not require, see the license) that you keep the authors' names in place and 

+ * return your changes to the public. We would be especially happy if you tell 

+ * us what you're going to do with this code.

+ * -------------------------------------------------------------------------------

+ */

+

+

+div.contact-list {

+    display: flex;

+    flex-direction: row;

+    flex-wrap: wrap;

+}

+

+div.contact {

+    border: 1px solid black;

+    width: 18em;

+    margin: 1em;

+    padding: 0.1em 1em;    

+}

+

+p.contact-id {

+    text-align: right;

+    float: right;

+    color: #aaa;

+    margin: 0;

+    padding: 0;

+}

+

+p.contact-actions {

+}