Getting ready for 1.2.0 release.

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index ebb9de228cb01d74a7e5da8dcb66a5205e596e18..3f9c11199a59b2ae9166f5b170ebfecfa8f2a146 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- **  webmail.php -- Displays the main frameset
- **
- **  Copyright (c) 1999-2001 The SquirrelMail development team
- **  Licensed under the GNU GPL. For full terms see the file COPYING.
- **
- **  This file generates the main frameset. The files that are
- **  shown can be given as parameters. If the user is not logged in
- **  this file will verify username and password.
- **
- **  $Id$
- **/
+ * webmail.php -- Displays the main frameset
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail development team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * This file generates the main frameset. The files that are
+ * shown can be given as parameters. If the user is not logged in
+ * this file will verify username and password.
+ *
+ * $Id$
+ */
 
 require_once('../functions/strings.php');
 require_once('../config/config.php');
@@ -21,21 +21,20 @@ require_once('../functions/plugin.php');
 require_once('../functions/i18n.php');
 require_once('../functions/auth.php');
 
-ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
+ereg( '(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs);
 $base_uri = $regs[1];
 
 session_start();
 is_logged_in();
-checkForPrefs($data_dir, $username);
 
-/*
+/**
  * We'll need this to later have a noframes version
  *
  * Check if the user has a language preference, but no cookie.
  * Send him a cookie with his language preference, if there is
  * such discrepancy.
  */
-$my_language = getPref($data_dir, $username, "language");
+$my_language = getPref($data_dir, $username, 'language');
 if ($my_language != $squirrelmail_language) {
     setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri);
 }
@@ -47,8 +46,8 @@ echo '<TITLE>';
 echo $org_title;
 echo '</TITLE>';
    
-$left_size = getPref($data_dir, $username, "left_size");
-$location_of_bar = getPref($data_dir, $username, "location_of_bar");
+$left_size = getPref($data_dir, $username, 'left_size');
+$location_of_bar = getPref($data_dir, $username, 'location_of_bar');
 if ($location_of_bar == '') {
     $location_of_bar = 'left';
 }
@@ -99,7 +98,7 @@ elseif ($right_frame == 'compose.php') {
     $right_frame_url = "compose.php?send_to=$rcptaddress";
 }
 else {
-    $right_frame_url = "right_main.php";
+    $right_frame_url = 'right_main.php';
 }
 
 if ($location_of_bar == 'right') {