Menu
▾
▴
CVS: squirrelmail/src addrbook_search.php,1.24,1.25 compose.php,1.161,1.162 folders_create.php,1.46,1.47 login.php,1.52,1.53 redirect.php,1.23,1.24
|
From: Philippe M. <phi...@us...> - 2001-10-25 10:08:04
|
Update of /cvsroot/squirrelmail/squirrelmail/src
In directory usw-pr-cvs1:/tmp/cvs-serv22441/src
Modified Files:
addrbook_search.php compose.php folders_create.php login.php
redirect.php
Log Message:
Focus plugin integrated into the core
Index: addrbook_search.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/addrbook_search.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- addrbook_search.php 2001/09/26 10:07:21 1.24
+++ addrbook_search.php 2001/10/25 10:02:39 1.25
@@ -93,7 +93,7 @@
insert_javascript();
$line = 0;
- print '<TABLE BORDER="0" WIDTH="98%" ALIGN=center>';
+ echo '<TABLE BORDER="0" WIDTH="98%" ALIGN=center>';
printf("<TR BGCOLOR=\"$color[9]\"><TH ALIGN=left> ".
"<TH ALIGN=left> %s<TH ALIGN=left> %s".
"<TH ALIGN=left> %s",
@@ -102,7 +102,7 @@
if($includesource)
printf("<TH ALIGN=left WIDTH=\"10%%\"> %s", _("Source"));
- print "</TR>\n";
+ echo "</TR>\n";
while(list($undef, $row) = each($res)) {
printf("<tr%s nowrap><td valign=top nowrap align=center width=\"5%%\">".
@@ -120,10 +120,10 @@
if($includesource)
printf("<td nowrap valign=top> %s", $row["source"]);
- print "</TR>\n";
+ echo "</TR>\n";
$line++;
}
- print '</TABLE>';
+ echo '</TABLE>';
}
/* ================= End of functions ================= */
@@ -160,10 +160,9 @@
// Create search form
if($show == 'form') {
- printf("<FORM NAME=sform TARGET=abookres ACTION=\"%s\" METHOD=\"POST\">\n",
- $PHP_SELF);
- print('<TABLE BORDER="0" WIDTH="100%" HEIGHT="100%">');
- print("<TR><TD NOWRAP VALIGN=middle>\n");
+ echo "<FORM NAME=sform TARGET=abookres ACTION=\"$PHP_SELF\" METHOD=\"POST\">\n";
+ echo '<TABLE BORDER="0" WIDTH="100%" HEIGHT="100%">';
+ echo "<TR><TD NOWRAP VALIGN=middle>\n";
printf(" <STRONG>%s</STRONG>\n", _("Search for"));
printf(" <INPUT TYPE=text NAME=query VALUE=\"%s\" SIZE=26>\n",
htmlspecialchars($query));
@@ -199,8 +198,6 @@
if($show == 'blank')
$backend = $abook->localbackend;
- //printf("<H3 ALIGN=center>%s</H3>\n", $abook->backends[$backend]->sname);
-
$res = $abook->list_addr($backend);
if(is_array($res)) {
@@ -241,6 +238,7 @@
display_result($res);
}
-?>
-</BODY></HTML>
\ No newline at end of file
+ echo "</BODY></HTML>\n";
+
+?>
\ No newline at end of file
Index: compose.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/compose.php,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -w -r1.161 -r1.162
--- compose.php 2001/10/09 11:41:17 1.161
+++ compose.php 2001/10/25 10:02:39 1.162
@@ -52,7 +52,7 @@
if ($ent_num)
$message = getEntity($message, $ent_num);
- if ($message->header->type0 == "text" || $message->header->type1 == "message") {
+ if ($message->header->type0 == 'text' || $message->header->type1 == 'message') {
if ($ent_num)
$body = decodeBody(mime_fetch_body($imapConnection, $id, $ent_num), $message->header->encoding);
else
@@ -215,10 +215,7 @@
echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\"";
do_hook("compose_form");
echo ">\n";
- if ($reply_id) {
- echo "<input type=hidden name=reply_id value=$reply_id>\n";
- }
- printf("<INPUT TYPE=hidden NAME=mailbox VALUE=\"%s\">\n", htmlspecialchars($mailbox));
+
echo "<TABLE WIDTH=\"100%\" ALIGN=center CELLSPACING=0 BORDER=0>\n";
if ($location_of_buttons == 'top') showComposeButtonRow();
@@ -349,6 +346,10 @@
// End of attachment code
echo "</TABLE>\n";
+ if ($reply_id) {
+ echo "<input type=hidden name=reply_id value=$reply_id>\n";
+ }
+ printf("<INPUT TYPE=hidden NAME=mailbox VALUE=\"%s\">\n", htmlspecialchars($mailbox));
echo "</FORM>";
do_hook("compose_bottom");
}
Index: folders_create.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/folders_create.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -w -r1.46 -r1.47
--- folders_create.php 2001/09/26 10:07:21 1.46
+++ folders_create.php 2001/10/25 10:02:39 1.47
@@ -20,7 +20,7 @@
if (strpos($folder_name, "\"") || strpos($folder_name, "\\") ||
strpos($folder_name, "'") || strpos($folder_name, "$dm")) {
- print "<html><body bgcolor=$color[4]>";
+ echo "<html><body bgcolor=$color[4]>";
plain_error_message(_("Illegal folder name. Please select a different name.")."<BR><A HREF=\"../src/folders.php\">"._("Click here to go back")."</A>.", $color);
sqimap_logout($imapConnection);
exit;
Index: login.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/login.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -w -r1.52 -r1.53
--- login.php 2001/10/19 07:43:19 1.52
+++ login.php 2001/10/25 10:02:39 1.53
@@ -87,7 +87,7 @@
echo '<TITLE>';
echo $org_name . ' - ' . _("Login");
echo "</TITLE></HEAD>\n";
- echo "<BODY TEXT=000000 BGCOLOR=#FFFFFF LINK=0000CC VLINK=0000CC ALINK=0000CC>\n";
+ echo "<BODY TEXT=#000000 BGCOLOR=#FFFFFF LINK=#0000CC VLINK=#0000CC ALINK=#0000CC onLoad='document.forms[0].elements[0].focus();'>\n";
echo "<FORM ACTION=\"redirect.php\" METHOD=\"POST\" NAME=f>\n";
$username_form_name = 'login_username';
Index: redirect.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/redirect.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- redirect.php 2001/10/22 12:44:56 1.23
+++ redirect.php 2001/10/25 10:02:39 1.24
@@ -37,7 +37,7 @@
set_up_language($squirrelmail_language, true);
if(!isset($login_username)) {
- echo "<html><body bgcolor=\"ffffff\">\n";
+ echo "<html><body bgcolor=\"#ffffff\">\n";
echo "<br><br>";
echo "<center>";
echo "<b>"._("You must be logged in to access this page.")."</b><br>";
@@ -69,7 +69,7 @@
$imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
if (!$imapConnection) {
- echo "<html><body bgcolor=\"ffffff\">\n";
+ echo "<html><body bgcolor=\"#ffffff\">\n";
echo "<br><br>";
echo "<center>";
echo "<b>"._("There was an error contacting the mail server.")."</b><br>";
|