Index: ../../src/addressbook.php
===================================================================
--- ../../src/addressbook.php	(revision 12451)
+++ ../../src/addressbook.php	(working copy)
@@ -360,11 +360,14 @@
     $prevbackend = -1;
     $headerprinted = false;
 
-    echo html_tag( 'p', '<a href="#AddAddress">' . _("Add address") . '</a>', 'center' ) . "\n";
+    //echo html_tag( 'p', '<a href="#AddAddress">' . _("Add address") . '</a>', 'center' ) . "\n";
 
+    /*added by select_range patch*/
+    do_hook('addressbook_before_list');    
+
     /* List addresses */
     if (count($alist) > 0) {
-        echo addForm($form_url, 'post');
+        echo '<form name="FormAddrsAbook" id="FormAddrsAbook" method="post">';
         if ($abook->add_extra_field) {
             $abook_fields = 6;
         } else {
@@ -375,6 +378,7 @@
             /* New table header for each backend */
             if($prevbackend != $row['backend']) {
                 if($prevbackend < 0) {
+                    /*
                     echo html_tag( 'table',
                             html_tag( 'tr',
                                 html_tag( 'td',
@@ -386,6 +390,7 @@
                                 html_tag( 'td', '&nbsp;<br />', 'center', '', 'colspan="5"' )
                                 ),
                             'center' );
+                     */
                 }
 
                 echo html_tag( 'table',
@@ -405,9 +410,11 @@
                             html_tag( 'th', _("E-mail").
                                       show_abook_sort_button($abook_sort_order, _("sort by email"), 4, 5),
                                       'left', '', 'width="1%"' ) .
+                                      /*
                             html_tag( 'th', _("Info").
                                       show_abook_sort_button($abook_sort_order, _("sort by info"), 6, 7),
                                       'left', '', 'width="1%"' ) .
+                                       */
                             ($abook->add_extra_field ? html_tag( 'th', '&nbsp;','left', '', 'width="1%"'): ''),
                             '', $color[9] ) . "\n";
 
@@ -443,7 +450,7 @@
                     html_tag( 'td', '&nbsp;' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
                     html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . '&nbsp;';
             } else {
-                echo html_tag( 'tr', '', '', $tr_bgcolor);
+                echo html_tag( 'tr', '', '', $tr_bgcolor, addressbook_ui_enhancements_row_tag($row));
                 if ($abook->backends[$row['backend']]->writeable) {
                     echo html_tag( 'td',
                             '<small>' .
@@ -455,15 +462,20 @@
                             '&nbsp;' ,
                             'center', '', 'valign="top" width="1%"' );
                 }
-                echo html_tag( 'td', '&nbsp;' . htmlspecialchars($row['nickname']) . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
-                    html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap' ) .
+                echo html_tag( 'td', htmlspecialchars($row['nickname']) . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap="NOWRAP"'.addressbook_ui_enhancements_name_col($row, 'nickname')  ) .
+                    html_tag( 'td', htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'valign="top" width="1%" nowrap="NOWRAP"'. addressbook_ui_enhancements_name_col($row, 'name') ) .
                     html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . '&nbsp;';
             }
             $email = $abook->full_address($row);
-            echo makeComposeLink('src/compose.php?send_to='.rawurlencode($email),
-                    htmlspecialchars($row['email'])).
-                '&nbsp;</td>'."\n".
+            if(!empty($email)) {
+                echo makeComposeLink('src/compose.php?send_to='.rawurlencode($email),
+                    htmlspecialchars($row['email']));
+            }
+            echo '&nbsp;</td>'."\n";
+            /*
+            echo '&nbsp;</td>'."\n".
                 html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'valign="top" width="1%"' );
+             */
 
             // add extra column if third party backend needs it
             if ($abook->add_extra_field) {
@@ -473,6 +485,7 @@
             }
 
             echo "</tr>\n";
+            do_hook('addressbook_after_row', $row);
             $line++;
         }
 
@@ -482,7 +495,8 @@
                     html_tag( 'td',
                         addSubmit(_("Edit selected"), 'editaddr') .
                         addSubmit(_("Delete selected"), 'deladdr'),
-                        'center', '', "colspan=\"$abook_fields\"" )
+                        //'center', '', "colspan=\"$abook_fields\"" )
+                        'center', '', "colspan=\"4\"" )
                     );
         }
         echo '</table></form>';