$urlMailbox = urlencode($mailbox);
- /* Construct the Search QuERY */
+ /*
+ Construct the Search QuERY
-# account for multiple search terms
+ account for multiple search terms
+ */
- $multi_search = array ();
- $search_what = ereg_replace("[ ]{2,}", ' ', $search_what);
- $multi_search = split (' ', $search_what);
- if (count($multi_search)==1) {
- $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"';
- }
- else {
- $search_string = '';
- $count = count($multi_search);
- for ($x=0;$x<$count;$x++) {
- $search_string = $search_string . ' ' . $search_where . " " . '"' . $multi_search[$x] . '" ';
- }
- }
- $search_string = trim($search_string);
+ $multi_search = array ();
+ $search_what = ereg_replace("[ ]{2,}", ' ', $search_what);
+ $multi_search = split (' ', $search_what);
+ if (count($multi_search)==1) {
+ $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"';
+ }
+ else {
+ $search_string = '';
+ $count = count($multi_search);
+ for ($x=0;$x<$count;$x++) {
+ $search_string = $search_string . ' ' . $search_where . ' "' . $multi_search[$x] . '" ';
+ }
+ }
+ $search_string = trim($search_string);
-# now use $search_string in the imap search
+ /* now use $search_string in the imap search */
if (isset($languages[$squirrelmail_language]['CHARSET']) &&
$languages[$squirrelmail_language]['CHARSET']) {
$readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
}
- unset($messagelist); $msgs=""; $c = 0;
+ unset($messagelist);
+ $msgs = '';
+ $c = 0;
/* Keep going till we find the SEARCH responce */
while ($c < count( $readin )) {
/* If nothing is found * SEARCH should be the first error else echo errors */
if (isset($errors) && strstr($errors,"* SEARCH")) {
- if ($search_all != "all") {
- echo '<br><CENTER>' . _("No Messages Found") . '</CENTER>';
- return;
- }
- else {
- return;
- }
+ if ($search_all != "all") {
+ echo '<br><CENTER>' . _("No Messages Found") . '</CENTER>';
+ return;
+ }
+ else {
+ return;
+ }
}
-// else if ($search_all == 'all') {
-// return;
-// }
- else if (isset($errors)) {
+ else if (isset($errors)) {
echo "<!-- ".$errors." -->";
}
$i = 0;
$j = 0;
while ($j < count($messagelist)) {
- if (isset($messages[$j]["FLAG_DELETED"]) && $messages[$j]["FLAG_DELETED"] == true) {
+ if (isset($messages[$j]['FLAG_DELETED']) && $messages[$j]['FLAG_DELETED']) {
$j++;
continue;
}
if (count($messagelist) > 0) {
$j=0;
- if (!isset ($msg)) {
- $msg = '';
+ if (!isset ($msg)) {
+ $msg = '';
}
if ($search_all != 'all') {
- if ( !isset( $start_msg ) ) {
- $start_msg =0;
- }
- if ( !isset( $sort ) ) {
- $sort = 0;
- }
+ if ( !isset( $start_msg ) ) {
+ $start_msg =0;
+ }
+ if ( !isset( $sort ) ) {
+ $sort = 0;
+ }
mail_message_listing_beginning( $imapConnection,
"move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
$mailbox,
-1,
'<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b></tr><tr>');
}
- echo "<b><big>Folder: $mailbox</big></b>";
+ echo '<b><big>' . _("Folder:") . " $mailbox</big></b>";
while ($j < count($msgs)) {
printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what);
$j++;
- echo '</td></tr>';
+ echo '</td></tr>';
}
echo '</table></td></tr></table></form>';
- $count_all = count($msgs);
+ $count_all = count($msgs);
}
- return $count_all;
+ return $count_all;
}
?>
msgid ""
msgstr ""
"Project-Id-Version: $Id$\n"
-"POT-Creation-Date: 2002-02-09 19:45+0100\n"
-"PO-Revision-Date: 2002-02-09 19:48GMT+1\n"
+"POT-Creation-Date: 2002-02-10 09:57+0100\n"
+"PO-Revision-Date: 2002-02-10 09:58GMT+1\n"
"Last-Translator: Philippe Mingo <philippe@squirrelmail.org>\n"
"Language-Team: Spanish <squirrelmail-i18n@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
#: squirrelmail/src/download.php:139
#: squirrelmail/src/options_highlight.php:325
#: squirrelmail/src/printer_friendly_bottom.php:96
-#: squirrelmail/src/search.php:339
+#: squirrelmail/src/search.php:344
msgid "To"
msgstr "Para"
#: squirrelmail/plugins/filters/options.php:91
#: squirrelmail/src/addrbook_search_html.php:84
-#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:338
+#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:343
msgid "Cc"
msgstr "Cc"
#: squirrelmail/functions/page_header.php:130
#: squirrelmail/src/addrbook_search.php:191
#: squirrelmail/src/addrbook_search_html.php:151
-#: squirrelmail/src/search.php:202
+#: squirrelmail/src/search.php:178 squirrelmail/src/search.php:189
+#: squirrelmail/src/search.php:207 squirrelmail/src/search.php:348
+#: squirrelmail/src/search.php:373 squirrelmail/src/search.php:394
+#: squirrelmail/src/search.php:404
msgid "Search"
msgstr "Buscar"
#: squirrelmail/src/options_highlight.php:334
#: squirrelmail/src/options_order.php:40
#: squirrelmail/src/printer_friendly_bottom.php:101
-#: squirrelmail/src/search.php:336
+#: squirrelmail/src/search.php:341
msgid "Subject"
msgstr "Asunto"
#: squirrelmail/src/options_highlight.php:322
#: squirrelmail/src/options_order.php:38
#: squirrelmail/src/printer_friendly_bottom.php:95
-#: squirrelmail/src/search.php:337
+#: squirrelmail/src/search.php:342
msgid "From"
msgstr "De"
msgstr "Fecha"
#: squirrelmail/plugins/listcommands/mailout.php:50
-#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:712
+#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:710
msgid "From:"
msgstr "De:"
-#: squirrelmail/src/compose.php:492 squirrelmail/src/read_body.php:183
-#: squirrelmail/src/read_body.php:729
+#: squirrelmail/src/compose.php:493 squirrelmail/src/read_body.php:181
+#: squirrelmail/src/read_body.php:727
msgid "To:"
msgstr "Para:"
-#: squirrelmail/src/compose.php:500
+#: squirrelmail/src/compose.php:501
msgid "CC:"
msgstr "CC:"
-#: squirrelmail/src/compose.php:508
+#: squirrelmail/src/compose.php:509
msgid "BCC:"
msgstr "BCC:"
-#: squirrelmail/src/compose.php:515 squirrelmail/src/read_body.php:184
-#: squirrelmail/src/read_body.php:683
+#: squirrelmail/src/compose.php:516 squirrelmail/src/read_body.php:182
+#: squirrelmail/src/read_body.php:681
msgid "Subject:"
msgstr "Asunto:"
-#: squirrelmail/src/compose.php:560 squirrelmail/src/compose.php:623
+#: squirrelmail/src/compose.php:561 squirrelmail/src/compose.php:644
msgid "Send"
msgstr "Enviar"
-#: squirrelmail/src/compose.php:566
+#: squirrelmail/src/compose.php:567
msgid "Attach:"
msgstr "Adjunto:"
-#: squirrelmail/src/compose.php:571 squirrelmail/src/options_order.php:126
+#: squirrelmail/src/compose.php:572 squirrelmail/src/options_order.php:126
msgid "Add"
msgstr "Agregar"
-#: squirrelmail/src/compose.php:587
+#: squirrelmail/src/compose.php:589
msgid "Delete selected attachments"
msgstr "Borrar Adjuntos Seleccionados"
-#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:613
-#: squirrelmail/src/compose.php:617 squirrelmail/src/compose.php:621
-msgid "Addresses"
-msgstr "Direcciones"
-
-#: squirrelmail/src/compose.php:626
-msgid "Save Draft"
-msgstr "Guardar Borrador"
-
-#: squirrelmail/src/compose.php:632 squirrelmail/src/read_body.php:759
+#: squirrelmail/src/compose.php:616 squirrelmail/src/read_body.php:757
msgid "Priority"
msgstr "Prioridad"
#: squirrelmail/plugins/administrator/defines.php:191
#: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:633 squirrelmail/src/read_body.php:570
+#: squirrelmail/src/compose.php:617 squirrelmail/src/read_body.php:568
msgid "High"
msgstr "Alta"
#: squirrelmail/plugins/calendar/functions.php:97
-#: squirrelmail/src/compose.php:634 squirrelmail/src/read_body.php:583
+#: squirrelmail/src/compose.php:618 squirrelmail/src/read_body.php:581
msgid "Normal"
msgstr "Normal"
#: squirrelmail/plugins/administrator/defines.php:188
-#: squirrelmail/src/compose.php:635 squirrelmail/src/read_body.php:576
+#: squirrelmail/src/compose.php:619 squirrelmail/src/read_body.php:574
msgid "Low"
msgstr "Baja"
-#: squirrelmail/src/compose.php:642
-msgid "Confirm reading:"
-msgstr "Confirmar lectura:"
+#: squirrelmail/src/compose.php:625
+msgid "Receipt"
+msgstr "Confirmación"
-#: squirrelmail/src/compose.php:664
+#: squirrelmail/src/compose.php:626
+msgid "On read"
+msgstr "De lectura"
+
+#: squirrelmail/src/compose.php:627
+msgid "On Delivery"
+msgstr "De entrega"
+
+#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:634
+#: squirrelmail/src/compose.php:638 squirrelmail/src/compose.php:642
+msgid "Addresses"
+msgstr "Direcciones"
+
+#: squirrelmail/src/compose.php:647
+msgid "Save Draft"
+msgstr "Guardar Borrador"
+
+#: squirrelmail/src/compose.php:666
msgid "You have not filled in the \"To:\" field."
msgstr "No ha completado el campo \"Para:\""
-#: squirrelmail/src/compose.php:749
+#: squirrelmail/src/compose.php:751
msgid "said"
msgstr "dijo"
-#: squirrelmail/src/compose.php:752
+#: squirrelmail/src/compose.php:754
msgid "quote"
msgstr "cita"
-#: squirrelmail/src/compose.php:752
+#: squirrelmail/src/compose.php:754
msgid "who"
msgstr "quien"
#: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
#: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
-#: squirrelmail/src/read_body.php:306 squirrelmail/src/vcard.php:35
+#: squirrelmail/src/read_body.php:304 squirrelmail/src/vcard.php:35
#: squirrelmail/src/vcard.php:39
msgid "View message"
msgstr "Ver el mensaje"
#: squirrelmail/plugins/mail_fetch/options.php:170
#: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
#: squirrelmail/src/options_identities.php:305
-#: squirrelmail/src/read_body.php:619
+#: squirrelmail/src/read_body.php:617
msgid "Delete"
msgstr "Borrar"
#: squirrelmail/plugins/delete_move_next/setup.php:149
#: squirrelmail/plugins/delete_move_next/setup.php:151
#: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
-#: squirrelmail/src/read_body.php:641 squirrelmail/src/read_body.php:643
+#: squirrelmail/src/read_body.php:639 squirrelmail/src/read_body.php:641
msgid "Previous"
msgstr "Anterior"
#: squirrelmail/plugins/delete_move_next/setup.php:154
#: squirrelmail/plugins/delete_move_next/setup.php:156
#: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
-#: squirrelmail/src/read_body.php:647 squirrelmail/src/read_body.php:649
+#: squirrelmail/src/read_body.php:645 squirrelmail/src/read_body.php:647
msgid "Next"
msgstr "Siguiente"
#: squirrelmail/functions/page_header.php:103
#: squirrelmail/plugins/mail_fetch/options.php:137
#: squirrelmail/plugins/mail_fetch/options.php:214
-#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:305
+#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:310
msgid "INBOX"
msgstr "ENTRADA"
msgid "View Printable Version"
msgstr "Vista Preliminar"
-#: squirrelmail/src/read_body.php:182
+#: squirrelmail/src/read_body.php:180
msgid "Your message"
msgstr "Su mensaje"
-#: squirrelmail/src/read_body.php:185
+#: squirrelmail/src/read_body.php:183
msgid "Sent:"
msgstr "Enviado:"
-#: squirrelmail/src/read_body.php:187
+#: squirrelmail/src/read_body.php:185
#, c-format
msgid "Was displayed on %s"
msgstr "Se mostró el %s"
-#: squirrelmail/src/read_body.php:298
+#: squirrelmail/src/read_body.php:222
+msgid "Read:"
+msgstr "Leído:"
+
+#: squirrelmail/src/read_body.php:296
msgid "Viewing Full Header"
msgstr "Ver Encabezados Completos"
-#: squirrelmail/src/read_body.php:434
+#: squirrelmail/src/read_body.php:432
msgid "more"
msgstr "mas"
-#: squirrelmail/src/read_body.php:435
+#: squirrelmail/src/read_body.php:433
msgid "less"
msgstr "menos"
-#: squirrelmail/src/read_body.php:611
+#: squirrelmail/src/read_body.php:609
msgid "Message List"
msgstr "Lista de Mensajes"
-#: squirrelmail/src/read_body.php:623
+#: squirrelmail/src/read_body.php:621
msgid "Resume Draft"
msgstr "Recuperar Borrador"
-#: squirrelmail/src/read_body.php:660
+#: squirrelmail/src/read_body.php:658
msgid "Forward"
msgstr "Reenviar"
-#: squirrelmail/src/read_body.php:665
+#: squirrelmail/src/read_body.php:663
msgid "Reply"
msgstr "Responder"
-#: squirrelmail/src/read_body.php:670
+#: squirrelmail/src/read_body.php:668
msgid "Reply All"
msgstr "Responder a Todos"
-#: squirrelmail/src/read_body.php:694 squirrelmail/src/read_body.php:697
+#: squirrelmail/src/read_body.php:692 squirrelmail/src/read_body.php:695
msgid "View Full Header"
msgstr "Ver Encabezado Completo"
#: squirrelmail/plugins/calendar/event_edit.php:35
#: squirrelmail/plugins/calendar/event_edit.php:93
#: squirrelmail/plugins/calendar/event_edit.php:106
-#: squirrelmail/src/read_body.php:720
+#: squirrelmail/src/read_body.php:718
msgid "Date:"
msgstr "Fecha:"
-#: squirrelmail/src/read_body.php:774
+#: squirrelmail/src/read_body.php:772
msgid "Mailer"
msgstr "Cliente"
-#: squirrelmail/src/read_body.php:812 squirrelmail/src/read_body.php:822
-#: squirrelmail/src/read_body.php:833 squirrelmail/src/read_body.php:845
-#: squirrelmail/src/read_body.php:870 squirrelmail/src/read_body.php:905
-#: squirrelmail/src/read_body.php:913 squirrelmail/src/read_body.php:927
+#: squirrelmail/src/read_body.php:810 squirrelmail/src/read_body.php:820
+#: squirrelmail/src/read_body.php:831 squirrelmail/src/read_body.php:843
+#: squirrelmail/src/read_body.php:868 squirrelmail/src/read_body.php:903
+#: squirrelmail/src/read_body.php:911 squirrelmail/src/read_body.php:925
msgid "Read receipt"
msgstr "Confirmación de lectura"
-#: squirrelmail/src/read_body.php:815 squirrelmail/src/read_body.php:824
-#: squirrelmail/src/read_body.php:907 squirrelmail/src/read_body.php:915
+#: squirrelmail/src/read_body.php:813 squirrelmail/src/read_body.php:822
+#: squirrelmail/src/read_body.php:905 squirrelmail/src/read_body.php:913
msgid "send"
msgstr "enviada"
-#: squirrelmail/src/read_body.php:816 squirrelmail/src/read_body.php:907
+#: squirrelmail/src/read_body.php:814 squirrelmail/src/read_body.php:905
msgid "Remove MDN flag"
msgstr "Eliminar señal de envio"
-#: squirrelmail/src/read_body.php:835 squirrelmail/src/read_body.php:847
-#: squirrelmail/src/read_body.php:872 squirrelmail/src/read_body.php:929
+#: squirrelmail/src/read_body.php:833 squirrelmail/src/read_body.php:845
+#: squirrelmail/src/read_body.php:870 squirrelmail/src/read_body.php:927
msgid "requested"
msgstr "solicitada"
-#: squirrelmail/src/read_body.php:848 squirrelmail/src/read_body.php:873
-#: squirrelmail/src/read_body.php:930
+#: squirrelmail/src/read_body.php:846 squirrelmail/src/read_body.php:871
+#: squirrelmail/src/read_body.php:928
msgid "Send read receipt now"
msgstr "Emitir confirmación de lectura"
-#: squirrelmail/src/read_body.php:860
+#: squirrelmail/src/read_body.php:858
msgid ""
"The message sender has requested a response to indicate that you have read "
"this message. Would you like to send a receipt?"
msgstr ""
-"El emisor del mensaje ha solicitado una contestación que indique que ha leido este mensaje. "
-"¿Desea mandarla ahora?"
+"El emisor del mensaje ha solicitado una contestación que indique que ha "
+"leido este mensaje. ¿Desea mandarla ahora?"
#: squirrelmail/functions/auth.php:33 squirrelmail/src/redirect.php:60
#: squirrelmail/src/redirect.php:64
msgid "Contact your administrator for help."
msgstr "Contacte con su administrador."
-#: squirrelmail/src/search.php:237
+#: squirrelmail/src/search.php:242
msgid "edit"
msgstr "editar"
-#: squirrelmail/src/search.php:244 squirrelmail/src/search.php:283
+#: squirrelmail/src/search.php:249 squirrelmail/src/search.php:288
msgid "search"
msgstr "buscar"
-#: squirrelmail/src/search.php:247
+#: squirrelmail/src/search.php:252
msgid "delete"
msgstr "borrar"
-#: squirrelmail/src/search.php:275
+#: squirrelmail/src/search.php:280
msgid "save"
msgstr "guardar"
-#: squirrelmail/src/search.php:286
+#: squirrelmail/src/search.php:291
msgid "forget"
msgstr "olvidar"
-#: squirrelmail/src/search.php:295
+#: squirrelmail/src/search.php:300
msgid "Current Search"
msgstr "Búsqueda Actual"
-#: squirrelmail/src/search.php:334
+#: squirrelmail/src/search.php:339
msgid "Body"
msgstr "Cuerpo"
-#: squirrelmail/src/search.php:335
+#: squirrelmail/src/search.php:340
msgid "Everywhere"
msgstr "Todos lados"
-#: squirrelmail/src/search.php:362 squirrelmail/src/search.php:391
+#: squirrelmail/src/search.php:367 squirrelmail/src/search.php:396
msgid "Search Results"
msgstr "Resultado de la búsqueda"
-#: squirrelmail/src/search.php:382
+#: squirrelmail/src/search.php:387
msgid "No Messages found"
msgstr "No se encontraron mensajes"
msgstr "Archivo de preferencias %s no encontrado. Saliendo anormalmente."
#: squirrelmail/functions/display_messages.php:28
-#: squirrelmail/functions/imap_general.php:245
+#: squirrelmail/functions/imap_general.php:249
msgid "Unknown user or password incorrect."
msgstr "Usuario o contraseña incorrecto."
msgstr "ERROR: No se pudo completar el pedido."
#: squirrelmail/functions/imap_general.php:158
+#: squirrelmail/functions/imap_general.php:169
+msgid "Query:"
+msgstr "Consulta:"
+
+#: squirrelmail/functions/imap_general.php:160
#: squirrelmail/plugins/filters/filters.php:91
msgid "Reason Given: "
msgstr "Razón dada: "
-#: squirrelmail/functions/imap_general.php:165
+#: squirrelmail/functions/imap_general.php:167
#: squirrelmail/plugins/filters/filters.php:98
msgid "ERROR : Bad or malformed request."
msgstr "ERROR: pedido erroneo o con formato erroneo."
-#: squirrelmail/functions/imap_general.php:167
+#: squirrelmail/functions/imap_general.php:171
#: squirrelmail/plugins/filters/filters.php:100
msgid "Server responded: "
msgstr "El servidor respondió: "
-#: squirrelmail/functions/imap_general.php:204
+#: squirrelmail/functions/imap_general.php:208
#, c-format
msgid "Error connecting to IMAP server: %s."
msgstr "Error conectando al servidor IMAP: %s."
-#: squirrelmail/functions/imap_general.php:220
+#: squirrelmail/functions/imap_general.php:224
#, c-format
msgid "Bad request: %s"
msgstr "Pedido Erroneo: %s"
-#: squirrelmail/functions/imap_general.php:222
+#: squirrelmail/functions/imap_general.php:226
#, c-format
msgid "Unknown error: %s"
msgstr "Error desconocido: %s"
-#: squirrelmail/functions/imap_general.php:224
+#: squirrelmail/functions/imap_general.php:228
msgid "Read data:"
msgstr "Leer datos:"
msgid "(unknown sender)"
msgstr "(remitente desconocido)"
-#: squirrelmail/functions/imap_search.php:83
+#: squirrelmail/functions/imap_search.php:87
msgid "No Messages Found"
msgstr "No se Encontraron Mensajes"
-#: squirrelmail/functions/imap_search.php:187
-#: squirrelmail/functions/imap_search.php:195
+#: squirrelmail/functions/imap_search.php:188
+#: squirrelmail/functions/imap_search.php:196
msgid "Found"
msgstr "Encontrado"
-#: squirrelmail/functions/imap_search.php:187
-#: squirrelmail/functions/imap_search.php:195
+#: squirrelmail/functions/imap_search.php:188
+#: squirrelmail/functions/imap_search.php:196
msgid "messages"
msgstr "mensajes"
+#: squirrelmail/functions/imap_search.php:198
+msgid "Folder:"
+msgstr "Carpeta:"
+
#: squirrelmail/functions/mailbox_display.php:156
msgid "A"
msgstr "C"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-02-09 19:45+0100\n"
+"POT-Creation-Date: 2002-02-10 09:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#: squirrelmail/src/download.php:139
#: squirrelmail/src/options_highlight.php:325
#: squirrelmail/src/printer_friendly_bottom.php:96
-#: squirrelmail/src/search.php:339
+#: squirrelmail/src/search.php:344
msgid "To"
msgstr ""
#: squirrelmail/plugins/filters/options.php:91
#: squirrelmail/src/addrbook_search_html.php:84
-#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:338
+#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:343
msgid "Cc"
msgstr ""
#: squirrelmail/functions/page_header.php:130
#: squirrelmail/src/addrbook_search.php:191
#: squirrelmail/src/addrbook_search_html.php:151
-#: squirrelmail/src/search.php:202
+#: squirrelmail/src/search.php:178 squirrelmail/src/search.php:189
+#: squirrelmail/src/search.php:207 squirrelmail/src/search.php:348
+#: squirrelmail/src/search.php:373 squirrelmail/src/search.php:394
+#: squirrelmail/src/search.php:404
msgid "Search"
msgstr ""
#: squirrelmail/src/options_highlight.php:334
#: squirrelmail/src/options_order.php:40
#: squirrelmail/src/printer_friendly_bottom.php:101
-#: squirrelmail/src/search.php:336
+#: squirrelmail/src/search.php:341
msgid "Subject"
msgstr ""
#: squirrelmail/src/options_highlight.php:322
#: squirrelmail/src/options_order.php:38
#: squirrelmail/src/printer_friendly_bottom.php:95
-#: squirrelmail/src/search.php:337
+#: squirrelmail/src/search.php:342
msgid "From"
msgstr ""
msgstr ""
#: squirrelmail/plugins/listcommands/mailout.php:50
-#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:712
+#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:710
msgid "From:"
msgstr ""
-#: squirrelmail/src/compose.php:492 squirrelmail/src/read_body.php:183
-#: squirrelmail/src/read_body.php:729
+#: squirrelmail/src/compose.php:493 squirrelmail/src/read_body.php:181
+#: squirrelmail/src/read_body.php:727
msgid "To:"
msgstr ""
-#: squirrelmail/src/compose.php:500
+#: squirrelmail/src/compose.php:501
msgid "CC:"
msgstr ""
-#: squirrelmail/src/compose.php:508
+#: squirrelmail/src/compose.php:509
msgid "BCC:"
msgstr ""
-#: squirrelmail/src/compose.php:515 squirrelmail/src/read_body.php:184
-#: squirrelmail/src/read_body.php:683
+#: squirrelmail/src/compose.php:516 squirrelmail/src/read_body.php:182
+#: squirrelmail/src/read_body.php:681
msgid "Subject:"
msgstr ""
-#: squirrelmail/src/compose.php:560 squirrelmail/src/compose.php:623
+#: squirrelmail/src/compose.php:561 squirrelmail/src/compose.php:644
msgid "Send"
msgstr ""
-#: squirrelmail/src/compose.php:566
+#: squirrelmail/src/compose.php:567
msgid "Attach:"
msgstr ""
-#: squirrelmail/src/compose.php:571 squirrelmail/src/options_order.php:126
+#: squirrelmail/src/compose.php:572 squirrelmail/src/options_order.php:126
msgid "Add"
msgstr ""
-#: squirrelmail/src/compose.php:587
+#: squirrelmail/src/compose.php:589
msgid "Delete selected attachments"
msgstr ""
-#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:613
-#: squirrelmail/src/compose.php:617 squirrelmail/src/compose.php:621
-msgid "Addresses"
-msgstr ""
-
-#: squirrelmail/src/compose.php:626
-msgid "Save Draft"
-msgstr ""
-
-#: squirrelmail/src/compose.php:632 squirrelmail/src/read_body.php:759
+#: squirrelmail/src/compose.php:616 squirrelmail/src/read_body.php:757
msgid "Priority"
msgstr ""
#: squirrelmail/plugins/administrator/defines.php:191
#: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:633 squirrelmail/src/read_body.php:570
+#: squirrelmail/src/compose.php:617 squirrelmail/src/read_body.php:568
msgid "High"
msgstr ""
#: squirrelmail/plugins/calendar/functions.php:97
-#: squirrelmail/src/compose.php:634 squirrelmail/src/read_body.php:583
+#: squirrelmail/src/compose.php:618 squirrelmail/src/read_body.php:581
msgid "Normal"
msgstr ""
#: squirrelmail/plugins/administrator/defines.php:188
-#: squirrelmail/src/compose.php:635 squirrelmail/src/read_body.php:576
+#: squirrelmail/src/compose.php:619 squirrelmail/src/read_body.php:574
msgid "Low"
msgstr ""
-#: squirrelmail/src/compose.php:642
-msgid "Confirm reading:"
+#: squirrelmail/src/compose.php:625
+msgid "Receipt"
+msgstr ""
+
+#: squirrelmail/src/compose.php:626
+msgid "On read"
+msgstr ""
+
+#: squirrelmail/src/compose.php:627
+msgid "On Delivery"
+msgstr ""
+
+#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:634
+#: squirrelmail/src/compose.php:638 squirrelmail/src/compose.php:642
+msgid "Addresses"
+msgstr ""
+
+#: squirrelmail/src/compose.php:647
+msgid "Save Draft"
msgstr ""
-#: squirrelmail/src/compose.php:664
+#: squirrelmail/src/compose.php:666
msgid "You have not filled in the \"To:\" field."
msgstr ""
-#: squirrelmail/src/compose.php:749
+#: squirrelmail/src/compose.php:751
msgid "said"
msgstr ""
-#: squirrelmail/src/compose.php:752
+#: squirrelmail/src/compose.php:754
msgid "quote"
msgstr ""
-#: squirrelmail/src/compose.php:752
+#: squirrelmail/src/compose.php:754
msgid "who"
msgstr ""
#: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
#: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
-#: squirrelmail/src/read_body.php:306 squirrelmail/src/vcard.php:35
+#: squirrelmail/src/read_body.php:304 squirrelmail/src/vcard.php:35
#: squirrelmail/src/vcard.php:39
msgid "View message"
msgstr ""
#: squirrelmail/plugins/mail_fetch/options.php:170
#: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
#: squirrelmail/src/options_identities.php:305
-#: squirrelmail/src/read_body.php:619
+#: squirrelmail/src/read_body.php:617
msgid "Delete"
msgstr ""
#: squirrelmail/plugins/delete_move_next/setup.php:149
#: squirrelmail/plugins/delete_move_next/setup.php:151
#: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
-#: squirrelmail/src/read_body.php:641 squirrelmail/src/read_body.php:643
+#: squirrelmail/src/read_body.php:639 squirrelmail/src/read_body.php:641
msgid "Previous"
msgstr ""
#: squirrelmail/plugins/delete_move_next/setup.php:154
#: squirrelmail/plugins/delete_move_next/setup.php:156
#: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
-#: squirrelmail/src/read_body.php:647 squirrelmail/src/read_body.php:649
+#: squirrelmail/src/read_body.php:645 squirrelmail/src/read_body.php:647
msgid "Next"
msgstr ""
#: squirrelmail/functions/page_header.php:103
#: squirrelmail/plugins/mail_fetch/options.php:137
#: squirrelmail/plugins/mail_fetch/options.php:214
-#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:305
+#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:310
msgid "INBOX"
msgstr ""
msgid "View Printable Version"
msgstr ""
-#: squirrelmail/src/read_body.php:182
+#: squirrelmail/src/read_body.php:180
msgid "Your message"
msgstr ""
-#: squirrelmail/src/read_body.php:185
+#: squirrelmail/src/read_body.php:183
msgid "Sent:"
msgstr ""
-#: squirrelmail/src/read_body.php:187
+#: squirrelmail/src/read_body.php:185
#, c-format
msgid "Was displayed on %s"
msgstr ""
-#: squirrelmail/src/read_body.php:298
+#: squirrelmail/src/read_body.php:222
+msgid "Read:"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:296
msgid "Viewing Full Header"
msgstr ""
-#: squirrelmail/src/read_body.php:434
+#: squirrelmail/src/read_body.php:432
msgid "more"
msgstr ""
-#: squirrelmail/src/read_body.php:435
+#: squirrelmail/src/read_body.php:433
msgid "less"
msgstr ""
-#: squirrelmail/src/read_body.php:611
+#: squirrelmail/src/read_body.php:609
msgid "Message List"
msgstr ""
-#: squirrelmail/src/read_body.php:623
+#: squirrelmail/src/read_body.php:621
msgid "Resume Draft"
msgstr ""
-#: squirrelmail/src/read_body.php:660
+#: squirrelmail/src/read_body.php:658
msgid "Forward"
msgstr ""
-#: squirrelmail/src/read_body.php:665
+#: squirrelmail/src/read_body.php:663
msgid "Reply"
msgstr ""
-#: squirrelmail/src/read_body.php:670
+#: squirrelmail/src/read_body.php:668
msgid "Reply All"
msgstr ""
-#: squirrelmail/src/read_body.php:694 squirrelmail/src/read_body.php:697
+#: squirrelmail/src/read_body.php:692 squirrelmail/src/read_body.php:695
msgid "View Full Header"
msgstr ""
#: squirrelmail/plugins/calendar/event_edit.php:35
#: squirrelmail/plugins/calendar/event_edit.php:93
#: squirrelmail/plugins/calendar/event_edit.php:106
-#: squirrelmail/src/read_body.php:720
+#: squirrelmail/src/read_body.php:718
msgid "Date:"
msgstr ""
-#: squirrelmail/src/read_body.php:774
+#: squirrelmail/src/read_body.php:772
msgid "Mailer"
msgstr ""
-#: squirrelmail/src/read_body.php:812 squirrelmail/src/read_body.php:822
-#: squirrelmail/src/read_body.php:833 squirrelmail/src/read_body.php:845
-#: squirrelmail/src/read_body.php:870 squirrelmail/src/read_body.php:905
-#: squirrelmail/src/read_body.php:913 squirrelmail/src/read_body.php:927
+#: squirrelmail/src/read_body.php:810 squirrelmail/src/read_body.php:820
+#: squirrelmail/src/read_body.php:831 squirrelmail/src/read_body.php:843
+#: squirrelmail/src/read_body.php:868 squirrelmail/src/read_body.php:903
+#: squirrelmail/src/read_body.php:911 squirrelmail/src/read_body.php:925
msgid "Read receipt"
msgstr ""
-#: squirrelmail/src/read_body.php:815 squirrelmail/src/read_body.php:824
-#: squirrelmail/src/read_body.php:907 squirrelmail/src/read_body.php:915
+#: squirrelmail/src/read_body.php:813 squirrelmail/src/read_body.php:822
+#: squirrelmail/src/read_body.php:905 squirrelmail/src/read_body.php:913
msgid "send"
msgstr ""
-#: squirrelmail/src/read_body.php:816 squirrelmail/src/read_body.php:907
+#: squirrelmail/src/read_body.php:814 squirrelmail/src/read_body.php:905
msgid "Remove MDN flag"
msgstr ""
-#: squirrelmail/src/read_body.php:835 squirrelmail/src/read_body.php:847
-#: squirrelmail/src/read_body.php:872 squirrelmail/src/read_body.php:929
+#: squirrelmail/src/read_body.php:833 squirrelmail/src/read_body.php:845
+#: squirrelmail/src/read_body.php:870 squirrelmail/src/read_body.php:927
msgid "requested"
msgstr ""
-#: squirrelmail/src/read_body.php:848 squirrelmail/src/read_body.php:873
-#: squirrelmail/src/read_body.php:930
+#: squirrelmail/src/read_body.php:846 squirrelmail/src/read_body.php:871
+#: squirrelmail/src/read_body.php:928
msgid "Send read receipt now"
msgstr ""
-#: squirrelmail/src/read_body.php:860
+#: squirrelmail/src/read_body.php:858
msgid ""
"The message sender has requested a response to indicate that you have read "
"this message. Would you like to send a receipt?"
msgid "Contact your administrator for help."
msgstr ""
-#: squirrelmail/src/search.php:237
+#: squirrelmail/src/search.php:242
msgid "edit"
msgstr ""
-#: squirrelmail/src/search.php:244 squirrelmail/src/search.php:283
+#: squirrelmail/src/search.php:249 squirrelmail/src/search.php:288
msgid "search"
msgstr ""
-#: squirrelmail/src/search.php:247
+#: squirrelmail/src/search.php:252
msgid "delete"
msgstr ""
-#: squirrelmail/src/search.php:275
+#: squirrelmail/src/search.php:280
msgid "save"
msgstr ""
-#: squirrelmail/src/search.php:286
+#: squirrelmail/src/search.php:291
msgid "forget"
msgstr ""
-#: squirrelmail/src/search.php:295
+#: squirrelmail/src/search.php:300
msgid "Current Search"
msgstr ""
-#: squirrelmail/src/search.php:334
+#: squirrelmail/src/search.php:339
msgid "Body"
msgstr ""
-#: squirrelmail/src/search.php:335
+#: squirrelmail/src/search.php:340
msgid "Everywhere"
msgstr ""
-#: squirrelmail/src/search.php:362 squirrelmail/src/search.php:391
+#: squirrelmail/src/search.php:367 squirrelmail/src/search.php:396
msgid "Search Results"
msgstr ""
-#: squirrelmail/src/search.php:382
+#: squirrelmail/src/search.php:387
msgid "No Messages found"
msgstr ""
msgstr ""
#: squirrelmail/functions/display_messages.php:28
-#: squirrelmail/functions/imap_general.php:245
+#: squirrelmail/functions/imap_general.php:249
msgid "Unknown user or password incorrect."
msgstr ""
msgstr ""
#: squirrelmail/functions/imap_general.php:158
+#: squirrelmail/functions/imap_general.php:169
+msgid "Query:"
+msgstr ""
+
+#: squirrelmail/functions/imap_general.php:160
#: squirrelmail/plugins/filters/filters.php:91
msgid "Reason Given: "
msgstr ""
-#: squirrelmail/functions/imap_general.php:165
+#: squirrelmail/functions/imap_general.php:167
#: squirrelmail/plugins/filters/filters.php:98
msgid "ERROR : Bad or malformed request."
msgstr ""
-#: squirrelmail/functions/imap_general.php:167
+#: squirrelmail/functions/imap_general.php:171
#: squirrelmail/plugins/filters/filters.php:100
msgid "Server responded: "
msgstr ""
-#: squirrelmail/functions/imap_general.php:204
+#: squirrelmail/functions/imap_general.php:208
#, c-format
msgid "Error connecting to IMAP server: %s."
msgstr ""
-#: squirrelmail/functions/imap_general.php:220
+#: squirrelmail/functions/imap_general.php:224
#, c-format
msgid "Bad request: %s"
msgstr ""
-#: squirrelmail/functions/imap_general.php:222
+#: squirrelmail/functions/imap_general.php:226
#, c-format
msgid "Unknown error: %s"
msgstr ""
-#: squirrelmail/functions/imap_general.php:224
+#: squirrelmail/functions/imap_general.php:228
msgid "Read data:"
msgstr ""
msgid "(unknown sender)"
msgstr ""
-#: squirrelmail/functions/imap_search.php:83
+#: squirrelmail/functions/imap_search.php:87
msgid "No Messages Found"
msgstr ""
-#: squirrelmail/functions/imap_search.php:187
-#: squirrelmail/functions/imap_search.php:195
+#: squirrelmail/functions/imap_search.php:188
+#: squirrelmail/functions/imap_search.php:196
msgid "Found"
msgstr ""
-#: squirrelmail/functions/imap_search.php:187
-#: squirrelmail/functions/imap_search.php:195
+#: squirrelmail/functions/imap_search.php:188
+#: squirrelmail/functions/imap_search.php:196
msgid "messages"
msgstr ""
+#: squirrelmail/functions/imap_search.php:198
+msgid "Folder:"
+msgstr ""
+
#: squirrelmail/functions/mailbox_display.php:156
msgid "A"
msgstr ""
}
-function showComposeButtonRow()
-{
+function showComposeButtonRow() {
global $use_javascript_addr_book, $save_as_draft,
- $default_use_priority, $mailprio, $default_use_mdn,
- $data_dir, $username;
-
+ $default_use_priority, $mailprio, $default_use_mdn,
+ $data_dir, $username;
+
echo " <TR><TD>\n</TD><TD>\n";
if ($default_use_priority) {
if(!isset($mailprio)) {
$mailprio = "3";
- }
- echo _("Priority") .':<select name="mailprio">'.
- "<option value=1".($mailprio=='1'?' selected':'').'>'. _("High") .'</option>'.
- "<option value=3".($mailprio=='3'?' selected':'').'>'. _("Normal") .'</option>'.
- "<option value=5".($mailprio=='5'?' selected':'').'>'. _("Low").'</option>'.
- "</select>";
+ }
+ echo _("Priority") .': <select name="mailprio">'.
+ '<option value="1"'.($mailprio=='1'?' selected':'').'>'. _("High") .'</option>'.
+ '<option value="3"'.($mailprio=='3'?' selected':'').'>'. _("Normal") .'</option>'.
+ '<option value="5"'.($mailprio=='5'?' selected':'').'>'. _("Low").'</option>'.
+ "</select>";
}
$mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
if ($default_use_mdn) {
- if ($mdn_user_support) {
- echo "\n\t". _("Receipt") .': '.
- '<input type="checkbox" name="request_mdn" value=1>'. _("On read").
- ' <input type="checkbox" name="request_dr" value=1>'. _("On Delivery");
- }
+ if ($mdn_user_support) {
+ echo "\n\t". _("Receipt") .': '.
+ '<input type="checkbox" name="request_mdn" value=1>'. _("On read").
+ ' <input type="checkbox" name="request_dr" value=1>'. _("On Delivery");
+ }
}
echo " <TR><td>\n </td><td>\n";
echo " </TD></TR>\n\n";
}
-function checkInput ($show)
-{
+function checkInput ($show) {
/*
* I implemented the $show variable because the error messages
* were getting sent before the page header. So, I check once
/* function to update recent pref arrays */
function update_recent($what, $where, $mailbox, $username, $data_dir) {
- $what_array = get_recent("search_what", $username, $data_dir);
- $where_array = get_recent("search_where", $username, $data_dir);
- $folder_array = get_recent("search_folder", $username, $data_dir);
- $dupe = "no";
+ $what_array = get_recent('search_what', $username, $data_dir);
+ $where_array = get_recent('search_where', $username, $data_dir);
+ $folder_array = get_recent('search_folder', $username, $data_dir);
+ $dupe = 'no';
for ($i=0;$i<count($what_array);$i++) {
if ($what == $what_array[$i] &&
$where == $where_array[$i] &&
$mailbox == $folder_array[$i]) {
-
- $dupe = "yes";
+
+ $dupe = 'yes';
}
}
- if ($dupe == "no") {
+ if ($dupe == 'no') {
array_push ($what_array, $what);
array_push ($where_array, $where);
array_push ($folder_array, $mailbox);
$recent_count = getPref($data_dir, $username, 'search_memory', 0);
$n=0;
for ($i=1;$i<=$recent_count;$i++) {
- setPref($data_dir, $username, "search_what" . "$i", $what_array[$n]);
- setPref($data_dir, $username, "search_where" . "$i", $where_array[$n]);
- setPref($data_dir, $username, "search_folder" . "$i", $folder_array[$n]);
+ setPref($data_dir, $username, "search_what$i", $what_array[$n]);
+ setPref($data_dir, $username, "search_where$i", $where_array[$n]);
+ setPref($data_dir, $username, "search_folder$i", $folder_array[$n]);
$n++;
}
}
/* function to forget a recent search */
function forget_recent($forget_index, $username, $data_dir) {
- $what_array = get_recent("search_what", $username, $data_dir);
- $where_array = get_recent("search_where", $username, $data_dir);
- $folder_array = get_recent("search_folder", $username, $data_dir);
+ $what_array = get_recent('search_what', $username, $data_dir);
+ $where_array = get_recent('search_where', $username, $data_dir);
+ $folder_array = get_recent('search_folder', $username, $data_dir);
array_splice($what_array, $forget_index, 1);
array_splice($where_array, $forget_index, 1);
array_splice($folder_array, $forget_index, 1);
- array_unshift($what_array, "");
- array_unshift($where_array, "");
- array_unshift($folder_array, "");
+ array_unshift($what_array, '');
+ array_unshift($where_array, '');
+ array_unshift($folder_array, '');
$recent_count = getPref($data_dir, $username, 'search_memory', 0);
$n=0;
for ($i=1;$i<=$recent_count;$i++) {
- setPref($data_dir, $username, "search_what" . "$i", $what_array[$n]);
- setPref($data_dir, $username, "search_where" . "$i", $where_array[$n]);
- setPref($data_dir, $username, "search_folder" . "$i", $folder_array[$n]);
+ setPref($data_dir, $username, "search_what$i", $what_array[$n]);
+ setPref($data_dir, $username, "search_where$i", $where_array[$n]);
+ setPref($data_dir, $username, "search_folder$i", $folder_array[$n]);
$n++;
}
}
/* function to delete a saved search */
function delete_saved($delete_index, $username, $data_dir) {
- $saved_what_array = get_saved("saved_what", $username, $data_dir);
- $saved_where_array = get_saved("saved_where", $username, $data_dir);
- $saved_folder_array = get_saved("saved_folder", $username, $data_dir);
+ $saved_what_array = get_saved('saved_what', $username, $data_dir);
+ $saved_where_array = get_saved('saved_where', $username, $data_dir);
+ $saved_folder_array = get_saved('saved_folder', $username, $data_dir);
array_splice($saved_what_array, $delete_index, 1);
array_splice($saved_where_array, $delete_index, 1);
array_splice($saved_folder_array, $delete_index, 1);
$last_element = $saved_count + 1;
if ($last_element < 1) {
for ($i=1;$i<=$saved_count;$i++) {
- setPref($data_dir, $username, "saved_what" . "$i", $saved_what_array[$n]);
- setPref($data_dir, $username, "saved_where" . "$i", $saved_where_array[$n]);
- setPref($data_dir, $username, "saved_folder" . "$i", $saved_folder_array[$n]);
+ setPref($data_dir, $username, "saved_what$i", $saved_what_array[$n]);
+ setPref($data_dir, $username, "saved_where$i", $saved_where_array[$n]);
+ setPref($data_dir, $username, "saved_folder$i", $saved_folder_array[$n]);
$n++;
}
}
- removePref($data_dir, $username, "saved_what" . "$last_element");
- removePref($data_dir, $username, "saved_where" . "$last_element");
- removePref($data_dir, $username, "saved_folder" . "$last_element");
-}
+ removePref($data_dir, $username, "saved_what$last_element");
+ removePref($data_dir, $username, "saved_where$last_element");
+ removePref($data_dir, $username, "saved_folder$last_element");
+}
/* function to save a search from recent to saved */
function save_recent($save_index, $username, $data_dir) {
- $what_array = get_recent("search_what", $username, $data_dir);
- $where_array = get_recent("search_where", $username, $data_dir);
- $folder_array = get_recent("search_folder", $username, $data_dir);
+ $what_array = get_recent('search_what', $username, $data_dir);
+ $where_array = get_recent('search_where', $username, $data_dir);
+ $folder_array = get_recent('search_folder', $username, $data_dir);
$saved_what_once = array_slice($what_array, $save_index, 1);
$saved_where_once = array_slice($where_array, $save_index, 1);
$saved_folder_once = array_slice($folder_array, $save_index, 1);
- $saved_array = get_saved("saved_what", $username, $data_dir);
+ $saved_array = get_saved('saved_what', $username, $data_dir);
$saved_count = (count($saved_array) + 1);
- setPref($data_dir, $username, "saved_what" . "$saved_count", $saved_what_once[0]);
- setPref($data_dir, $username, "saved_where" . "$saved_count", $saved_where_once[0]);
- setPref($data_dir, $username, "saved_folder" . "$saved_count", $saved_folder_once[0]);
+ setPref($data_dir, $username, "saved_what$saved_count", $saved_what_once[0]);
+ setPref($data_dir, $username, "saved_where$saved_count", $saved_where_once[0]);
+ setPref($data_dir, $username, "saved_folder$saved_count", $saved_folder_once[0]);
}
/* ------------------------ main ------------------------ */
$saved_what_array = array ();
$saved_where_array = array ();
$saved_folder_array = array ();
-$search_all = "none";
+$search_all = 'none';
$perbox_count = array ();
/* get mailbox names */
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$boxes = sqimap_mailbox_list($imapConnection);
-
/* set current mailbox to INBOX if none was selected or if page
was called to search all folders. */
if ($mailbox == 'None' || $mailbox == '' ) {
$mailbox = $boxes[0]['unformatted'];
}
if ($mailbox == 'All Folders') {
- $search_all = "all";
+ $search_all = 'all';
}
displayPageHeader($color, $mailbox);
/* See how the page was called and fire off correct function */
-//if ( !isset( $submit ) ) {
-// $submit = '';
-//} else if ($submit == 'Search' && !empty($what)) {
if ((!isset($submit) || empty($submit)) && !empty($what)) {
- $submit = 'Search';
+ $submit = _("Search");
}
-if ($submit == 'Search' && !empty($what)) {
- update_recent($what, $where, $mailbox, $username, $data_dir);
+if ( !isset( $submit ) ) {
+ /*
+ Jason, leave E_ALL only on error reporting in php.ini
+ Variables must contain a value befor to check them,
+ or else there are compilation slow down as PHP has
+ to guess.
+ Remove this comment once read 8-)
+ */
+ $submit = '';
+} else if ($submit == _("Search") && !empty($what)) {
+ update_recent($what, $where, $mailbox, $username, $data_dir);
}
elseif ($submit == 'forget') {
forget_recent($count, $username, $data_dir);
"</TABLE>\n";
/* update the recent and saved searches from the pref files */
-$what_array = get_recent("search_what", $username, $data_dir);
-$where_array = get_recent("search_where", $username, $data_dir);
-$folder_array = get_recent("search_folder", $username, $data_dir);
+$what_array = get_recent('search_what', $username, $data_dir);
+$where_array = get_recent('search_where', $username, $data_dir);
+$folder_array = get_recent('search_folder', $username, $data_dir);
$recent_count = getPref($data_dir, $username, 'search_memory', 0);
-$saved_what_array = get_saved("saved_what", $username, $data_dir);
-$saved_where_array = get_saved("saved_where", $username, $data_dir);
-$saved_folder_array = get_saved("saved_folder", $username, $data_dir);
+$saved_what_array = get_saved('saved_what', $username, $data_dir);
+$saved_where_array = get_saved('saved_where', $username, $data_dir);
+$saved_folder_array = get_saved('saved_folder', $username, $data_dir);
$saved_count = count($saved_what_array);
$count_all = 0;
$box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']);
if( $box2 == 'INBOX' ) {
$box2 = _("INBOX");
- }
+ }
if ($mailbox == $box) {
echo " <OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
}
echo " </SELECT>\n" .
" </TD>\n".
" <TD COLSPAN=\"3\" ALIGN=\"CENTER\">\n".
- " <INPUT TYPE=\"submit\" NAME=\"submit\" VALUE=\"Search\">\n".
+ " <INPUT TYPE=\"submit\" NAME=\"submit\" VALUE=\"" . _("Search") . "\">\n".
" </TD>\n".
" </TR>\n".
"</FORM>\n".
/*
search all folders option still in the works. returns a table for each
- folder it finds a match in.
+ folder it finds a match in.
*/
if ($search_all == 'all') {
if (!in_array('noselect', $boxes[$x]['flags'])) {
$mailbox = $boxes[$x]['unformatted'];
}
- if (($submit == "Search" || $submit == "Search_no_update") && !empty($what)) {
+ if (($submit == _("Search") || $submit == 'Search_no_update') && !empty($what)) {
sqimap_mailbox_select($imapConnection, $mailbox);
$count_all = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
array_push($perbox_count, $count_all);
/* search one folder option */
else {
- if (($submit == 'Search' || $submit == 'Search_no_update') && !empty($what)) {
+ if (($submit == _("Search") || $submit == 'Search_no_update') && !empty($what)) {
echo '<BR><CENTER><B>' .
_("Search Results") .
"</B></CENTER>\n";
}
/* must have search terms to search */
-if ($submit == 'Search' && empty($what)) {
+if ($submit == _("Search") && empty($what)) {
echo "<BR><CENTER><B>Please enter something to search for</B></CENTER>\n";
}
-do_hook("search_bottom");
+do_hook('search_bottom');
sqimap_logout ($imapConnection);
echo '</body></html>';