webinterface.git

@@ -53,6 +53,14 @@ if (isset($_REQUEST['domainholder']) && $_REQUEST['domainholder'] == 1) {

 }

 $odd = false;

 $html = '<table>';

+$buttons = '<span class="buttonset" id="buttonset-salutation">

+         <input type="radio" name="salutation" id="salutation-firma" value="Firma" '.($c['salutation'] === null ? 'checked="checked"' : '').'/>

+         <label for="salutation-firma">Neutral</label>

+         <input type="radio" name="salutation" id="salutation-herr" value="Herr" '.($c['salutation'] === 'Herr' ? 'checked="checked"' : '').'/>

+         <label for="salutation-herr">Herr</label>

+         <input type="radio" name="salutation" id="salutation-frau" value="Frau" '.($c['salutation'] === 'Frau' ? 'checked="checked"' : '').'/>

+         <label for="salutation-frau">Frau</label>';

+$html .= '    <tr class="'.($odd == true ? 'odd' : 'even').'"><td>Bevorzugte Anrede:</td><td>'.$buttons.'</td></tr>';

 $html .= '    <tr class="'.($odd == true ? 'odd' : 'even').'"><td>Firmenname:</td><td><input type="text" name="firma" id="firma" value="'.$c['company'].'" '.$readonly.' /></td></tr>';

 $odd = !$odd;

 $html .= '<tr class="'.($odd == true ? 'odd' : 'even').'"><td>'.($c['company'] ? 'Ansprechpartner' : 'Name').':</td><td><input type="text" name="name" id="name" value="'.$c['name'].'" '.$readonly.' /></td></tr>';

@@ -22,13 +22,6 @@ require_once('class/domain.php');

 require_once('contactapi.php');

-/*

-Todo:

-    - Ausgabe-Funktion abstrahieren

-    - Telefonnummern bei Ausgabe durch filter_input_general schieben

-    - Domaininhaber festlegen

-*/

-

 function new_contact()

 {

@@ -37,6 +30,7 @@ function new_contact()

         "lastchange" => time(),

         "nic_handle" => null,

         "nic_id" => null,

+        "salutation" => null,

         "company" => null,

         "name" => null,

         "address" => null,

@@ -53,12 +47,16 @@ function new_contact()

 }

-function get_contact($id)

+function get_contact($id, $customer = null)

 {

+    $c = $_SESSION['customerinfo']['customerno'];

+    if ($customer != null && have_role(ROLE_SYSADMIN)) {

+        $c = $customer;

+    }

     $args = array(

-        "cid" => (int) $_SESSION['customerinfo']['customerno'],

+        "cid" => (int) $c,

         "id" => (int) $id);

-    $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 id=:id AND customer=:cid", $args);

+    $result = db_query("SELECT id, state, lastchange, nic_id, nic_handle, salutation, company, name, address, zip, city, country, phone, mobile, fax, email, pgp_id, pgp_key FROM kundendaten.contacts WHERE id=:id AND customer=:cid", $args);

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

         system_failure("Kontakt nicht gefunden oder gehört nicht diesem Kunden");

     }

@@ -69,7 +67,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 (state<>'deleted' OR state IS NULL) AND customer=? ORDER BY COALESCE(company, name)", array($cid));

+    $result = db_query("SELECT id, state, lastchange, nic_id, nic_handle, salutation, 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 COALESCE(company, name)", array($cid));

     $ret = array();

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

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

@@ -168,6 +166,7 @@ function sync_legacy_contactdata()

         $nachname = explode(' ', $kunde['name'], 2)[1];

     }

     $args = array("firma" => $kunde['company'],

+            "anrede" => $kunde['salutation'],

             "vorname" => $vorname,

             "nachname" => $nachname,

             "adresse" => $kunde['address'],

@@ -181,7 +180,7 @@ function sync_legacy_contactdata()

             "pgp_id" => $kunde['pgp_id'],

             "pgp_key" => $kunde['pgp_key'],

             "cid" => $cid);

-    db_query("UPDATE kundendaten.kunden SET firma=:firma, vorname=:vorname, nachname=:nachname, adresse=:adresse,

+    db_query("UPDATE kundendaten.kunden SET anrede=:anrede, firma=:firma, vorname=:vorname, nachname=:nachname, adresse=:adresse,

             plz=:plz, ort=:ort, land=:land, telefon=:telefon, mobile=:mobile, telefax=:telefax, email=:email, 

             pgp_id=:pgp_id, pgp_key=:pgp_key WHERE id=:cid", $args);

     if ($kundenkontakte['extern']) {

@@ -242,11 +241,11 @@ function save_contact($c)

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

     if ($c['id']) {

         // Kontakt bestaht schon, Update

-        db_query("UPDATE kundendaten.contacts SET nic_id=:nic_id, nic_handle=:nic_handle, company=:company, name=:name, address=:address, zip=:zip, city=:city, country=:country, phone=:phone, mobile=:mobile, fax=:fax, pgp_id=:pgp_id, pgp_key=:pgp_key WHERE id=:id AND customer=:customer", $c);

+        db_query("UPDATE kundendaten.contacts SET nic_id=:nic_id, nic_handle=:nic_handle, salutation=:salutation, company=:company, name=:name, address=:address, zip=:zip, city=:city, country=:country, phone=:phone, mobile=:mobile, fax=:fax, pgp_id=:pgp_id, pgp_key=:pgp_key WHERE id=:id AND customer=:customer", $c);

     } else {

         unset($c['id']);

         // Neu anlegen

-        db_query("INSERT INTO kundendaten.contacts (nic_id, nic_handle, customer, company, name, address, zip, city, country, phone, mobile, fax, pgp_id, pgp_key) VALUES (:nic_id, :nic_handle, :customer, :company, :name, :address, :zip, :city, :country, :phone, :mobile, :fax, :pgp_id, :pgp_key)", $c);

+        db_query("INSERT INTO kundendaten.contacts (nic_id, nic_handle, customer, salutation, company, name, address, zip, city, country, phone, mobile, fax, pgp_id, pgp_key) VALUES (:nic_id, :nic_handle, :customer, :salutation, :company, :name, :address, :zip, :city, :country, :phone, :mobile, :fax, :pgp_id, :pgp_key)", $c);

         $c['id'] = db_insert_id();

     }

     // FIXME: Das sollte eigentlich nicht bei jedem einzelnen Speicherovrgang passieren

@@ -86,6 +86,12 @@ if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete') {

         }

     }

+    $c['salutation'] = null;

+    if ($_REQUEST['salutation'] == 'Herr') {

+        $c['salutation'] = 'Herr';

+    } elseif ($_REQUEST['salutation'] == 'Frau') {

+        $c['salutation'] = 'Frau';

+    }

     $c['company'] = verify_input_general(maybe_null($_REQUEST['firma']));

     $c['name'] = verify_input_general(maybe_null($_REQUEST['name']));

     $c['address'] = verify_input_general(maybe_null($_REQUEST['adresse']));