Took out cvs confusion

[squirrelmail.git] / src / addrbook_popup.php
diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php

index a403d056b555243472b57414f1358da38630b68e..6ba634aa47eac220574d24943cde6564a9791650 100644 (file)
--- a/src/addrbook_popup.php
+++ b/src/addrbook_popup.php
@@ -2,27 +2,33 @@
     /**
      **  addrbook_popup.php
      **
+    **  Copyright (c) 1999-2000 The SquirrelMail development team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
      **  Frameset for the JavaScript version of the address book.
      **
+    **  $Id$
      **/
  
     session_start();
  
-   if(!isset($logged_in)) {
-      echo _("You must login first.");
-      exit;
-   }
-   if(!isset($username) || !isset($key)) {
-      echo _("You need a valid user and password to access this page!");
-      exit;
-   }
-
+   if (!isset($i18n_php))
+      include('../functions/i18n.php');
     if (!isset($config_php))
-      include("../config/config.php");
+      include('../config/config.php');
     if (!isset($page_header_php))
-      include("../functions/page_header.php");
+      include('../functions/page_header.php');
+   if (!isset($auth_php))
+      include('../functions/auth.php');
     if (!isset($addressbook_php))
-      include("../functions/addressbook.php");
+      include('../functions/addressbook.php');
+
+   is_logged_in();
+
+   include('../src/load_prefs.php');
+   
+   set_up_language(getPref($data_dir, $username, 'language'));
+   
  ?>
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
  
@@ -35,8 +41,8 @@
  
  <FRAMESET ROWS="60,*" BORDER=0>
   <FRAME NAME="abookmain" MARGINWIDTH=0 SCROLLING=NO
-        SRC="addrbook_search.php?PHPSESSID=<?php echo $PHPSESSID; ?>&show=form" BORDER=0>
- <FRAME NAME="abookres" MARGINWIDTH=0 SRC="addrbook_search.php?PHPSESSID=<?php echo $PHPSESSID; ?>&show=blank"
+        SRC="addrbook_search.php?show=form" BORDER=0>
+ <FRAME NAME="abookres" MARGINWIDTH=0 SRC="addrbook_search.php?show=blank"
          BORDER=0>
  </FRAMESET>