From ade3d1ab28d3d2609e6b472326273105dfc00bea Mon Sep 17 00:00:00 2001
From: jengo <jengo@alumni.egroupware.org>
Date: Tue, 5 Sep 2000 03:14:08 +0000
Subject: [PATCH] Remove the session->loginid references

---
 addressbook/add.php    | 2 +-
 addressbook/delete.php | 8 ++++----
 addressbook/edit.php   | 6 +++---
 addressbook/index.php  | 6 +++---
 addressbook/view.php   | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addressbook/add.php b/addressbook/add.php
index 36c301e675..bebb3b5309 100755
--- a/addressbook/add.php
+++ b/addressbook/add.php
@@ -35,7 +35,7 @@
 
      $sql = "insert into addressbook (owner,access,firstname,lastname,email,"
        	  . "hphone,wphone,fax,pager,mphone,ophone,street,city,state,zip,bday,"
-          . "notes,company) values ('" . $phpgw->session->loginid . "','$access','"
+          . "notes,company) values ('" . $phpgw_info["user"]["userid"] . "','$access','"
           . addslashes($firstname). "','"
           . addslashes($lastname) . "','"
           . addslashes($email) 	. "','" 
diff --git a/addressbook/delete.php b/addressbook/delete.php
index e29e17567c..9a0214487b 100755
--- a/addressbook/delete.php
+++ b/addressbook/delete.php
@@ -27,7 +27,7 @@
      $phpgw->db->query("select owner from addressbook where con='$con'");
      $phpgw->db->next_record();
 
-     if ($phpgw->db->f("owner") != $phpgw->session->loginid)
+     if ($phpgw->db->f("owner") != $phpgw_info["user"]["userid"])
         Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/addressbook/"));
 
      ?>
@@ -45,10 +45,10 @@
      //exit;
   } else {
 
-     $phpgw->db->query("delete from addressbook where owner='" . $phpgw->session->loginid
-		    . "' and con='$con'");
+     $phpgw->db->query("delete from addressbook where owner='" . $phpgw_info["user"]["userid"]
+		           . "' and con='$con'");
      Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"]. "/addressbook/",
 	    "cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
   }
-
+?>
 
diff --git a/addressbook/edit.php b/addressbook/edit.php
index 0a8c4de7e3..693734ff19 100755
--- a/addressbook/edit.php
+++ b/addressbook/edit.php
@@ -21,13 +21,13 @@
   
   if (! $con) {
      Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"]. "/addressbook/",
-	    "cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
+	       "cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
      exit;
   }
 
   if (! $submit) {
      $phpgw->db->query("SELECT * FROM addressbook WHERE owner='"
-		 . $phpgw->session->loginid . "' AND con='$con'");
+		           . $phpgw_info["user"]["userid"] . "' AND con='$con'");
      $phpgw->db->next_record();
 
      $fields = array(
@@ -75,7 +75,7 @@
 	 . "', notes='" 	. addslashes($notes)
 	 . "', company='" 	. addslashes($company)
 	 . "', access='" 	. addslashes($access)
-	 . "'  WHERE owner='" . $phpgw->session->loginid . "' AND con='$con'";
+	 . "'  WHERE owner='" . $phpgw_info["user"]["userid"] . "' AND con='$con'";
 
      $phpgw->db->query($sql);
 
diff --git a/addressbook/index.php b/addressbook/index.php
index 56c23589cb..93225290b2 100755
--- a/addressbook/index.php
+++ b/addressbook/index.php
@@ -36,11 +36,11 @@
      if ($filter != "none") {
         $filtermethod = " access like '%,$filter,%' ";
      } else {
-        $filtermethod = " (owner='" . $phpgw->session->loginid ."' OR access='public' "
-		      . $phpgw->accounts->sql_search("access") . " ) ";
+        $filtermethod = " (owner='" . $phpgw_info["user"]["userid"] ."' OR access='public' "
+		            . $phpgw->accounts->sql_search("access") . " ) ";
      }
   } else {
-     $filtermethod = " owner='" . $phpgw->session->loginid . "' ";
+     $filtermethod = " owner='" . $phpgw_info["user"]["userid"] . "' ";
   }
 
   if ($query) {
diff --git a/addressbook/view.php b/addressbook/view.php
index 9aa07321d6..2b205be4d7 100755
--- a/addressbook/view.php
+++ b/addressbook/view.php
@@ -20,13 +20,13 @@
   include("../header.inc.php");
   if (! $con)
     Header("Location: " . $phpgw_info["server"]["webserver_url"] . 
-	    "/addressbook/?sessionid=" . $phpgw->session->id);
+	      "/addressbook/?sessionid=" . $phpgw_info["user"]["sessionid"]);
 
   if ($filter != "private")
      $filtermethod = " or access='public' " . $phpgw->groups->sql_search();
 
   $phpgw->db->query("SELECT * FROM addressbook WHERE con='$con' AND (owner='"
-	      . $phpgw->session->loginid . "' $filtermethod)");
+	             . $phpgw_info["user"]["userid"] . "' $filtermethod)");
   $phpgw->db->next_record();
 
   $fields = array(