projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Converted some ereg_replace() into str_replace().
[squirrelmail.git]
/
src
/
search.php
diff --git
a/src/search.php
b/src/search.php
index 3bdcbdbe5dfb3a789977c230fe406f5ffd965715..7eb98a183faa78e51be51356758c4bff51f4fb4d 100644
(file)
--- a/
src/search.php
+++ b/
src/search.php
@@
-57,7
+57,7
@@
$boxes = sqimap_mailbox_list($imapConnection);
for ($i = 0; $i < count($boxes); $i++) {
$boxes = sqimap_mailbox_list($imapConnection);
for ($i = 0; $i < count($boxes); $i++) {
-
if ($boxes[$i]["flags"][0] != "noselect" && $boxes[$i]["flags"][1] != "noselect" && $boxes[$i]["flags"][2] != "noselect"
) {
+
if (!in_array("noselect", $boxes[$i]["flags"])
) {
$box = $boxes[$i]["unformatted"];
$box2 = replace_spaces($boxes[$i]["formatted"]);
if ($mailbox == $box)
$box = $boxes[$i]["unformatted"];
$box2 = replace_spaces($boxes[$i]["formatted"]);
if ($mailbox == $box)
@@
-80,22
+80,22
@@
echo " <TD ALIGN=\"RIGHT\" WIDTH=33%>\n";
echo " <SELECT NAME=\"where\">";
echo " <TD ALIGN=\"RIGHT\" WIDTH=33%>\n";
echo " <SELECT NAME=\"where\">";
- if ($where == "BODY") echo " <OPTION VALUE=\"BODY\" SELECTED>"._("Body")."\n";
+ if (
isset($where) &&
$where == "BODY") echo " <OPTION VALUE=\"BODY\" SELECTED>"._("Body")."\n";
else echo " <OPTION VALUE=\"BODY\">"._("Body")."\n";
else echo " <OPTION VALUE=\"BODY\">"._("Body")."\n";
- if ($where == "TEXT") echo " <OPTION VALUE=\"TEXT\" SELECTED>"._("Everywhere")."\n";
+ if (
isset($where) &&
$where == "TEXT") echo " <OPTION VALUE=\"TEXT\" SELECTED>"._("Everywhere")."\n";
else echo " <OPTION VALUE=\"TEXT\">"._("Everywhere")."\n";
else echo " <OPTION VALUE=\"TEXT\">"._("Everywhere")."\n";
- if ($where == "SUBJECT") echo " <OPTION VALUE=\"SUBJECT\" SELECTED>"._("Subject")."\n";
+ if (
isset($where) &&
$where == "SUBJECT") echo " <OPTION VALUE=\"SUBJECT\" SELECTED>"._("Subject")."\n";
else echo " <OPTION VALUE=\"SUBJECT\">"._("Subject")."\n";
else echo " <OPTION VALUE=\"SUBJECT\">"._("Subject")."\n";
- if ($where == "FROM") echo " <OPTION VALUE=\"FROM\" SELECTED>"._("From")."\n";
+ if (
isset($where) &&
$where == "FROM") echo " <OPTION VALUE=\"FROM\" SELECTED>"._("From")."\n";
else echo " <OPTION VALUE=\"FROM\">"._("From")."\n";
else echo " <OPTION VALUE=\"FROM\">"._("From")."\n";
- if ($where == "CC") echo " <OPTION VALUE=\"Cc\" SELECTED>"._("Cc")."\n";
+ if (
isset($where) &&
$where == "CC") echo " <OPTION VALUE=\"Cc\" SELECTED>"._("Cc")."\n";
else echo " <OPTION VALUE=\"CC\">"._("Cc")."\n";
else echo " <OPTION VALUE=\"CC\">"._("Cc")."\n";
- if ($where == "TO") echo " <OPTION VALUE=\"TO\" SELECTED>"._("To")."\n";
+ if (
isset($where) &&
$where == "TO") echo " <OPTION VALUE=\"TO\" SELECTED>"._("To")."\n";
else echo " <OPTION VALUE=\"TO\">"._("To")."\n";
echo " </SELECT>\n";
else echo " <OPTION VALUE=\"TO\">"._("To")."\n";
echo " </SELECT>\n";