defaults in load_prefs are not needed when config-default is populated

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

index a403d056b555243472b57414f1358da38630b68e..8b6e1adbe11965e5b58b6d712b097d87eb4d8171 100644 (file)
--- a/src/addrbook_popup.php
+++ b/src/addrbook_popup.php
@@ -2,42 +2,32 @@
     /**
      **  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($config_php))
-      include("../config/config.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($addressbook_php))
-      include("../functions/addressbook.php");
+   require_once('../src/validate.php');
+   require_once('../functions/addressbook.php');
+   
  ?>
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
  
  <HTML>
  <HEAD>
  <TITLE><?php 
-   printf("%s: %s", $org_title, _("Address Book")); 
+   echo "$org_title: " . _("Address Book"); 
  ?></TITLE>
  </HEAD>
  
  <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>
  
-</HTML>
+</HTML>
+\ No newline at end of file