projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for trailing space in personal address names
[squirrelmail.git]
/
src
/
webmail.php
diff --git
a/src/webmail.php
b/src/webmail.php
index 89fa16a362c8d7bb5e1afd42dd979167ac68af86..1f1362da1bed1515a528215e0b4083d3bfb3034b 100644
(file)
--- a/
src/webmail.php
+++ b/
src/webmail.php
@@
-21,8
+21,10
@@
require_once('../functions/plugin.php');
require_once('../functions/i18n.php');
require_once('../functions/auth.php');
require_once('../functions/i18n.php');
require_once('../functions/auth.php');
-ereg( '(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs);
-$base_uri = $regs[1];
+if (!function_exists('sqm_baseuri')){
+ require_once('../functions/display_messages.php');
+}
+$base_uri = sqm_baseuri();
session_start();
is_logged_in();
session_start();
is_logged_in();
@@
-42,13
+44,23
@@
if ($my_language != $squirrelmail_language) {
set_up_language(getPref($data_dir, $username, 'language'));
echo "<html><head>\n" .
set_up_language(getPref($data_dir, $username, 'language'));
echo "<html><head>\n" .
- "<
TITLE>$org_title</TITLE
>";
+ "<
title>$org_title</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 (isset($languages[$squirrelmail_language]['DIR']) &&
+ strtolower($languages[$squirrelmail_language]['DIR']) == 'rtl') {
+ $temp_location_of_bar = 'right';
+} else {
+ $temp_location_of_bar = 'left';
+}
+
if ($location_of_bar == '') {
if ($location_of_bar == '') {
- $location_of_bar =
'left'
;
+ $location_of_bar =
$temp_location_of_bar
;
}
}
+$temp_location_of_bar = '';
+
if ($left_size == "") {
if (isset($default_left_size)) {
$left_size = $default_left_size;
if ($left_size == "") {
if (isset($default_left_size)) {
$left_size = $default_left_size;
@@
-59,10
+71,10
@@
if ($left_size == "") {
}
if ($location_of_bar == 'right') {
}
if ($location_of_bar == 'right') {
- echo "<
FRAMESET COLS=\"*, $left_size\" BORDER=0
>";
+ echo "<
frameset cols=\"*, $left_size\" border=\"0\" id=\"fs1\"
>";
}
else {
}
else {
- echo "<
FRAMESET COLS=\"$left_size, *\" BORDER=0
>";
+ echo "<
frameset cols=\"$left_size, *\" border=\"0\" id=\"fs1\"
>";
}
/*
}
/*
@@
-79,8
+91,7
@@
else {
*/
if (!isset($right_frame)) {
$right_frame = '';
*/
if (!isset($right_frame)) {
$right_frame = '';
-}
-
+}
if ($right_frame == 'right_main.php') {
$urlMailbox = urlencode($mailbox);
$right_frame_url =
if ($right_frame == 'right_main.php') {
$urlMailbox = urlencode($mailbox);
$right_frame_url =
@@
-89,10
+100,10
@@
if ($right_frame == 'right_main.php') {
$right_frame_url = 'options.php';
} elseif ($right_frame == 'folders.php') {
$right_frame_url = 'folders.php';
$right_frame_url = 'options.php';
} elseif ($right_frame == 'folders.php') {
$right_frame_url = 'folders.php';
-} elseif ($right_frame == 'compose.php') {
- $right_frame_url = "compose.php?send_to=$rcptaddress";
-} else {
+} else if ($right_frame == '') {
$right_frame_url = 'right_main.php';
$right_frame_url = 'right_main.php';
+} else {
+ $right_frame_url = urldecode($right_frame);
}
if ($location_of_bar == 'right') {
}
if ($location_of_bar == 'right') {
@@
-103,7
+114,7
@@
else {
echo '<FRAME SRC="left_main.php" NORESIZE NAME="left">'.
"<FRAME SRC=\"$right_frame_url\" NORESIZE NAME=\"right\">";
}
echo '<FRAME SRC="left_main.php" NORESIZE NAME="left">'.
"<FRAME SRC=\"$right_frame_url\" NORESIZE NAME=\"right\">";
}
-
+do_hook('webmail_bottom');
?>
</FRAMESET>
</HEAD></HTML>
?>
</FRAMESET>
</HEAD></HTML>