diff --git a/addressbook/oldindex.php b/addressbook/oldindex.php
new file mode 100755
index 0000000000..e432d3d8cb
--- /dev/null
+++ b/addressbook/oldindex.php
@@ -0,0 +1,282 @@
+ *
+ * -------------------------------------------- *
+ * 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("currentapp" => "addressbook", "enable_addressbook_class" => True,
+ "enable_nextmatchs_class" => True);
+ include("../header.inc.php");
+
+ echo "
" . lang("Address book");
+ //echo "
Time track = " . $phpgw_info["apps"]["timetrack"]["enabled"];
+
+ if (! $start)
+ $start = 0;
+
+ $limit =$phpgw->nextmatchs->sql_limit($start);
+
+ if ($order)
+ $ordermethod = "order by $order $sort";
+ else
+ $ordermethod = "order by ab_lastname,ab_firstname,ab_email asc";
+
+ if (! $filter) {
+ $filter = "none";
+ }
+
+ if ($filter != "private") {
+ if ($filter != "none") {
+ $filtermethod = " ab_access like '%,$filter,%' ";
+ } else {
+ $filtermethod = " (ab_owner='" . $phpgw_info["user"]["account_id"] ."' OR ab_access='public' "
+ . $phpgw->accounts->sql_search("ab_access") . " ) ";
+ }
+ } else {
+ $filtermethod = " ab_owner='" . $phpgw_info["user"]["account_id"] . "' ";
+ }
+
+ if ($query) {
+ if ($phpgw_info["apps"]["timetrack"]["enabled"]){
+ $phpgw->db->query("SELECT count(*) "
+ . "from addressbook as a, customers as c where a.ab_company_id = c.company_id "
+ . "AND $filtermethod AND (a.ab_lastname like '"
+ . "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR "
+ . "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state "
+ . "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like "
+ . "'%$query%' OR c.company_name like '%$query%' OR a.ab_url like '%$query%')",__LINE__,__FILE__);
+// . "'%$query%' OR c.company_name like '%$query%')"
+// . " $ordermethod limit $limit");
+ } else {
+ $phpgw->db->query("SELECT count(*) "
+ . "from addressbook "
+ . "WHERE $filtermethod AND (ab_lastname like '"
+ . "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR "
+ . "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state "
+ . "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like "
+ . "'%$query%' OR ab_company like '%$query%' OR ab_url like '%$query$%')",__LINE__,__FILE__);
+// . "'%$query%' OR ab_company like '%$query%')"
+// . " $ordermethod limit $limit");
+ }
+
+ $phpgw->db->next_record();
+
+ if ($phpgw->db->f(0) == 1)
+ echo "
" . lang("your search returned 1 match");
+ else
+ echo "
" . lang("your search returned x matchs",$phpgw->db->f(0));
+ } else {
+ $phpgw->db->query("select count(*) from addressbook where $filtermethod",__LINE__,__FILE__);
+ $phpgw->db->next_record();
+ }
+ if ($phpgw_info["apps"]["timetrack"]["enabled"]) {
+ $company_sortorder = "c.company_name";
+ } else {
+ $company_sortorder = "ab_company";
+ }
+
+ //$phpgw->db->next_record();
+
+ if ($phpgw->db->f(0) > $phpgw_info["user"]["preferences"]["common"]["maxmatchs"])
+ echo "
" . lang("showing x - x of x",($start + 1),
+ ($start + $phpgw_info["user"]["preferences"]["common"]["maxmatchs"]),$phpgw->db->f(0));
+ else
+ echo "
" . lang("showing x",$phpgw->db->f(0));
+?>
+
+nextmatchs->show("index.php",$start,$phpgw->db->f(0),"&order=$order&filter=$filter&sort="
+ . "$sort&query=$query", "75%", $phpgw_info["theme"]["th_bg"]);
+?>
+
+
+ ">
+ ';
+ echo '';
+ echo $phpgw->nextmatchs->show_sort_order($sort,"ab_" . $column[0],$order,"index.php",lang($column[1]));
+ echo '';
+ echo "\n";
+
+ // To be used when displaying the rows
+ $columns_to_display[$column[0]] = True;
+ }
+ }
+ ?>
+
+
+
+
+
+ |
+
+
+ Vcard
+
+ |
+
+
+
+
+ |
+
+
+
+db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname,a.ab_company_id,"
+ . "a.ab_email,a.ab_wphone,c.company_name,a.ab_hphone,a.ab_fax,a.ab_mphone "
+ . "from addressbook as a, customers as c where a.ab_company_id = c.company_id "
+ . "AND $filtermethod AND (a.ab_lastname like '"
+ . "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR "
+ . "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state "
+ . "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like "
+ . "'%$query%' OR c.company_name like '%$query%') $ordermethod limit $limit",__LINE__,__FILE__);
+ } else {
+ $phpgw->db->query("SELECT * from addressbook WHERE $filtermethod AND (ab_lastname like '"
+ . "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR "
+ . "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state "
+ . "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like "
+ . "'%$query%' OR ab_company like '%$query%') $ordermethod limit $limit",__LINE__,__FILE__);
+ }
+ } else {
+ if ($phpgw_info["apps"]["timetrack"]["enabled"]){
+ $phpgw->db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname,"
+ . "a.ab_email,a.ab_wphone,c.company_name "
+ . "from addressbook as a, customers as c where a.ab_company_id = c.company_id "
+ . "AND $filtermethod $ordermethod limit $limit",__LINE__,__FILE__);
+ } else {
+ $phpgw->db->query("SELECT * from addressbook WHERE $filtermethod $ordermethod limit $limit",__LINE__,__FILE__);
+ }
+ } // else $query
+
+ while ($phpgw->db->next_record()) {
+ $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+ echo '';
+
+ $ab_id = $phpgw->db->f("ab_id");
+
+ while ($column = each($columns_to_display)) {
+ if ($column[0] == "company") {
+ if ($phpgw_info["apps"]["timetrack"]["enabled"]) {
+ $field = $phpgw->db->f("company_name");
+ } else {
+ $field = $phpgw->db->f("ab_company");
+ }
+ } else {
+ $field = $phpgw->db->f("ab_" . $column[0]);
+ }
+
+/*
+ while ($column = each($columns_to_display)) {
+ if ($phpgw_info["apps"]["timetrack"]["enabled"]) {
+ if ($column[0] == "company") {
+ $field = $phpgw->db->f("company_name");
+ } else {
+ $field = $phpgw->db->f("ab_company");
+ }
+ } else {
+ $field = $phpgw->db->f("ab_" . $column[0]);
+ } */
+
+ $field = htmlentities($field);
+
+ // Some fields require special formating.
+ if ($column[0] == "url") {
+ if (! ereg("^http://",$field)) {
+ $data = "http://" . $field;
+ }
+ echo ''
+ . '' . $field. ' | ';
+ } else if ($column[0] == "email") {
+ if ($phpgw_info["user"]["apps"]["email"]) {
+ echo ''
+ . '' . $field . ' | ';
+ } else {
+ echo ''
+ . '' . $field. ' | ';
+ }
+ } else {
+ echo ''
+ . $field . ' | ';
+ }
+
+ }
+ reset($columns_to_display); // If we don't reset it, our inside while won't loop
+ ?>
+
+ " size="2">
+ ">
+
+ |
+
+ " size=2>
+ ">Vcard
+
+ |
+
+ " size="2">
+ common->check_owner($phpgw->db->f("ab_owner"),"edit.php",lang("edit"),"ab_id=" . $phpgw->db->f("ab_id")); ?>
+
+ |
+
+
+
+
+
+
+
+common->phpgw_footer();
+?>