link() function is working correctly with passing no URL. Moved addressbook preferences into its own section, cleaned up a little code, preferences functions are now updated to the new preferences table

addressbook/inc/preferences.inc.php

@@ -0,0 +1,32 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - Address Book                                              *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+{
+  $img = "/" . $appname . "/images/" . $appname .".gif";
+  if (file_exists($phpgw_info["server"]["server_root"].$img)) {
+    $img = $phpgw_info["server"]["webserver_url"].$img;
+  } else {
+    $img = "/" . $appname . "/images/navbar.gif";
+    if (file_exists($phpgw_info["server"]["server_root"].$img)) {
+      $img=$phpgw_info["server"]["webserver_url"].$img;
+    } else {
+    $img = "";
+    }
+  }
+  section_start("Address Book",$img);
+
+  $pg = $phpgw->link($phpgw_info["server"]["webserver_url"]."/addressbook/preferences.php");
+  echo "<A href=".$pg.">Select columns to display</A>";
+
+  section_end(); 
+}
+?>

addressbook/preferences.php

@@ -0,0 +1,79 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - Address Book                                              *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
+  $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "addressbook");
+  include("../header.inc.php");
+
+  if ($submit) {
+     $totalerrors = 0;
+     if (! count($ab_selected)) {
+        $errors[$totalerrors++] = lang("You must select at least 1 column to display");
+     }
+     
+     if (! $totalerrors) {
+        $phpgw->common->preferences_delete("byapp",$phpgw_info["user"]["userid"],"addressbook");
+        while ($pref = each($ab_selected)) {
+          $phpgw->common->preferences_add($phpgw_info["user"]["userid"],$pref[0],"addressbook",$pref[1]);
+        }
+        Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/preferences/index.php"));
+     }
+  }
+
+  $phpgw->common->phpgw_header();
+  $phpgw->common->navbar();
+
+  if ($totalerrors) {  
+     echo "<p><center>" . $phpgw->common->error_list($errors) . "</center>";
+  }
+
+  echo "<p><b>" . lang("select addressbook columns to display") . ":" . "</b><hr><p>";
+?>
+  <form method="POST" action="<?php echo $phpgw->link(); ?>">
+   <table border="0" align="center">
+    <?php
+      // I need to create a common function to handle displaying multiable columns
+    
+      echo '<tr bgcolor="' . $phpgw_info["theme"]["th_bg"] . '"><td colspan="3">&nbsp;</td></tr>';
+      $abc = get_abc();		# AddressBook Columns
+      $i = 0; $j = 0;
+      $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+      echo '<tr bgcolor="' . $tr_color . '">';
+      while (list($col, $descr) = each($abc)) {
+         $i++; $j++;
+         echo '<td><input type="checkbox" name="ab_selected[' . $col . ']" value="True"'
+            . ($phpgw_info["user"]["preferences"][$col]?" checked":"") . '>' . $descr
+            . '</option></td>';
+
+         if ($i ==3) {
+            echo "</tr>";
+            $i = 0;
+         }
+         if ($i == 0) {
+            $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+            echo '<tr bgcolor="' . $tr_color . '">';
+         }
+         if ($j == count($abc)) {
+            echo "</tr>";
+         }
+      }      
+    ?>
+    <tr>
+     <td colspan="3" align="center">
+      <input type="submit" name="submit" value="<?php echo lang("submit"); ?>">
+     </td>
+    </tr>
+   </table>
+  </form>
+<?php
+  include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
+?>

preferences/settings.php

@@ -230,18 +230,6 @@
                   </select>
               </td>
              </tr>
-<?php
-         }
-         if ($phpgw_info["user"]["apps"]["addressbook"]) {
-             echo "<tr><td>Addressbook columns :</td><tr>";
-             $abc = get_abc();		# AddressBook Columns
-             while (list($col, $descr) = each($abc)) {
-                 display_option($descr,"addressbook","addressbook_view_".$col,1);
-             }
-         }
-
-         if ($phpgw_info["user"]["apps"]["headlines"]) {
-?>
 <?php
          }
 ?>