@@ -12,4 +12,4 @@ RewriteEngine On

 RewriteBase /

 RewriteRule ^go/(.*)$  dispatch.php?go=$1&%{QUERY_STRING}

 RewriteRule ^init(.*)$  go/index/initialize_useraccount?token=$1&%{QUERY_STRING} [R]

-RewriteRule ^verify(.*)$  go/handles/verify?token=$1&%{QUERY_STRING} [R]

+RewriteRule ^verify(.*)$  go/contacts/verify?token=$1&%{QUERY_STRING} [R]

similarity index 72%

rename from modules/handles/include/handles.php

rename to modules/contacts/include/contacts.php

@@ -30,32 +30,32 @@ function api_fetch_contact($nic_id)

 */

-function get_handles() {

+function get_contacts() {

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

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

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

     $ret = array();

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

-        $ret[$handle['id']] = $handle;

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

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

     }

     DEBUG($ret);

     return $ret;

 }

-function get_kundenhandles() {

+function get_kundenkontakte() {

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

-    $result = db_query("SELECT handle_kunde, handle_extern, handle_rechnung FROM kundendaten.kunden WHERE id=?", array($cid));

+    $result = db_query("SELECT contact_kunde, contact_extern, contact_rechnung FROM kundendaten.kunden WHERE id=?", array($cid));

     $res = $result->fetch();

-    $ret = array("kunde" => $res['handle_kunde'],

-                 "extern" => $res['handle_extern'],

-                 "rechnung" => $res['handle_rechnung']);

+    $ret = array("kunde" => $res['contact_kunde'],

+                 "extern" => $res['contact_extern'],

+                 "rechnung" => $res['contact_rechnung']);

     return $ret;

 }

-function update_pending($handleid) {

-    $handleid = (int) $handleid;

-    $result = db_query("SELECT email FROM kundendaten.mailaddress_token WHERE handle=?", array($handleid));

+function update_pending($contactid) {

+    $contactid = (int) $contactid;

+    $result = db_query("SELECT email FROM kundendaten.mailaddress_token WHERE contact=?", array($contactid));

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

         return NULL;

     }

similarity index 83%

rename from modules/handles/include/verify.php

rename to modules/contacts/include/verify.php

@@ -19,7 +19,7 @@ function verify_mail_token($token)

 {

   db_query("DELETE FROM kundendaten.mailaddress_token WHERE expire<NOW()");

   $args = array(":token" => $token);

-  $result = db_query("SELECT handle, email FROM kundendaten.mailaddress_token WHERE token=:token AND expire>NOW()", $args);

+  $result = db_query("SELECT contact, email FROM kundendaten.mailaddress_token WHERE token=:token AND expire>NOW()", $args);

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

   {

     $line = $result->fetch();

@@ -33,16 +33,16 @@ function verify_mail_token($token)

 function update_mailaddress($daten)

 {

-    $handle = $daten['handle'];

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

     $email = $daten['email'];

     if (! check_emailaddr($email)) {

         system_failure('Es ist eine ungültige Adresse hinterlegt. So wird das nichts. Bitte die Änderung von vorne machen.');

     } 

-    $args = array(':handle' => $handle,

+    $args = array(':contact' => $contact,

                   ':email' => $email);

-    db_query("UPDATE kundendaten.handles SET email=:email WHERE id=:handle", $args);

+    db_query("UPDATE kundendaten.contacts SET email=:email WHERE id=:contact", $args);

 }

similarity index 72%

rename from modules/handles/list.php

rename to modules/contacts/list.php

@@ -14,7 +14,7 @@ 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.

 */

-require_once('handles.php');

+require_once('contacts.php');

 require_once('inc/debug.php');

 require_once('session/start.php');

@@ -25,35 +25,35 @@ require_role(array(ROLE_CUSTOMER));

 title("Adressen verwalten");

-$handles = get_handles();

-$kundenhandles = get_kundenhandles();

+$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>

 ');

-foreach ($handles as $id => $handle) {

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

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

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

     $usage = array();

-    if ($id == $kundenhandles['kunde']) {

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

         $usage[] = 'Stamm-Adresse';

     }

-    if ($id == $kundenhandles['extern']) {

+    if ($id == $kundenkontakte['extern']) {

         $usage[] = 'Ersatz-Adresse';

     }

-    if ($id == $kundenhandles['rechnung']) {

+    if ($id == $kundenkontakte['rechnung']) {

         $usage[] = 'Rechnungs-Adresse';

     }

-    if ($handle['nic_handle']) {

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

         $usage[] = 'Domain-Kontakt';

     }

     $usage = join(', ', $usage);

-    $email = $handle['email'];

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

     $new_email = update_pending($id);

     if ($new_email) {

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

     }

-    output("<tr><td>{$handle['id']}</td><td><strong>{$handle['name']}</strong></td><td>$adresse</td><td>$email</td><td>$usage</td><td>...</td></tr>");

+    output("<tr><td>{$contact['id']}</td><td><strong>{$contact['name']}</strong></td><td>$adresse</td><td>$email</td><td>$usage</td><td>...</td></tr>");

 }

 output('</table>');

 output("<br />");

similarity index 87%

rename from modules/handles/menu.php

rename to modules/contacts/menu.php

@@ -19,7 +19,7 @@ $role = $_SESSION['role'];

 if (($role & ROLE_CUSTOMER))

 {

-  $menu["handles_list"] = array("label" => "Adressen verwalten", "file" => "list", "weight" => 1, "submenu" => "index_index");

+  $menu["contacts_list"] = array("label" => "Adressen verwalten", "file" => "list", "weight" => 1, "submenu" => "index_index");

 }

 ?>

similarity index 97%

rename from modules/handles/verify.php

rename to modules/contacts/verify.php

@@ -18,7 +18,7 @@ require_once('verify.php');

 require_once('inc/security.php');

 title("E-Mail-Adresse bestätigen");

-$section = 'handles_list';

+$section = 'contacts_list';

 if (isset($_REQUEST['token']))

 {