From 6fd953618853477f6ffe569ce3c9733ca9f9c2d0 Mon Sep 17 00:00:00 2001 From: jervfors Date: Sun, 15 Aug 2004 01:02:58 +0000 Subject: [PATCH] XHTML fixes git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7902 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- doc/plugin.txt | 4 +- functions/addressbook.php | 6 +- functions/file_prefs.php | 13 ++- functions/imap_asearch.php | 8 +- functions/imap_general.php | 58 +++++----- functions/imap_mailbox.php | 2 +- functions/options.php | 4 +- functions/prefs.php | 6 +- functions/tree.php | 4 +- help/en_US/FAQ.hlp | 4 +- help/en_US/addresses.hlp | 2 +- help/en_US/basic.hlp | 6 +- help/en_US/compose.hlp | 26 ++--- help/en_US/folders.hlp | 14 +-- help/en_US/main_folder.hlp | 6 +- help/en_US/options.hlp | 184 +++++++++++++++--------------- help/en_US/read_mail.hlp | 4 +- include/options/personal.php | 6 +- plugins/calendar/calendar.php | 22 ++-- plugins/calendar/event_create.php | 36 +++--- plugins/calendar/event_delete.php | 42 +++---- plugins/calendar/event_edit.php | 106 ++++++++--------- plugins/calendar/functions.php | 30 ++--- plugins/fortune/setup.php | 4 +- plugins/info/options.php | 4 +- plugins/mail_fetch/fetch.php | 14 +-- plugins/mail_fetch/options.php | 82 ++++++------- plugins/mail_fetch/setup.php | 8 +- plugins/message_details/setup.php | 4 +- plugins/newmail/newmail.php | 12 +- plugins/newmail/setup.php | 8 +- plugins/newmail/testsound.php | 12 +- plugins/spamcop/setup.php | 14 +-- plugins/spamcop/spamcop.php | 24 ++-- plugins/translate/options.php | 31 +++-- plugins/translate/setup.php | 100 ++++++++-------- src/addrbook_search.php | 6 +- src/left_main.php | 4 +- src/options_identities.php | 14 +-- themes/darkness.php | 4 +- 40 files changed, 469 insertions(+), 469 deletions(-) diff --git a/doc/plugin.txt b/doc/plugin.txt index 938edb21..e2aca7b9 100644 --- a/doc/plugin.txt +++ b/doc/plugin.txt @@ -858,7 +858,7 @@ name): should always set "optpage" as a POST or GET variable with a string that uniquely identifies your plugin: - + Now in your demo_save_options_do() function, do something like this: @@ -981,7 +981,7 @@ files. So, even in the HTML segments of your plugin files, you need to do this: - "> + " /> You can put any text you want inside of the quotes (you MUST use double quotes!), including HTML tags, etc. What you should think carefully diff --git a/functions/addressbook.php b/functions/addressbook.php index ab6b187b..18cf590c 100644 --- a/functions/addressbook.php +++ b/functions/addressbook.php @@ -118,7 +118,7 @@ function addressbook_init($showerr = true, $onlylocal = false) { $r = $abook->add_backend('ldap_server', $param); if (!$r && $showerr) { printf( ' ' . _("Error initializing LDAP server %s:") . - "
\n", $param['host']); + "
\n", $param['host']); echo ' ' . $abook->error; exit; } @@ -251,7 +251,7 @@ class AddressBook { if (is_array($res)) { $ret = array_merge($ret, $res); } else { - $this->error .= "
\n" . $backend->error; + $this->error .= "
\n" . $backend->error; $failed++; } } @@ -267,7 +267,7 @@ class AddressBook { $ret = $this->backends[$bnum]->search($expression); if (!is_array($ret)) { - $this->error .= "
\n" . $this->backends[$bnum]->error; + $this->error .= "
\n" . $this->backends[$bnum]->error; $ret = FALSE; } } diff --git a/functions/file_prefs.php b/functions/file_prefs.php index a6cfc6d8..c19420a4 100644 --- a/functions/file_prefs.php +++ b/functions/file_prefs.php @@ -198,9 +198,9 @@ function checkForPrefs($data_dir, $username, $filename = '') { /* Otherwise, report an error. */ $errTitle = sprintf( _("Error opening %s"), $default_pref ); if (!is_readable($default_pref)) { - $errString = $errTitle . "
\n" . - _("Default preference file not found or not readable!") . "
\n" . - _("Please contact your system administrator and report this error.") . "
\n"; + $errString = $errTitle . "
\n" . + _("Default preference file not found or not readable!") . "
\n" . + _("Please contact your system administrator and report this error.") . "
\n"; logout_error( $errString, $errTitle ); exit; } else if (!@copy($default_pref, $filename)) { @@ -209,10 +209,10 @@ function checkForPrefs($data_dir, $username, $filename = '') { $user_data = posix_getpwuid(posix_getuid()); $uid = $user_data['name']; } - $errString = $errTitle . '
' . - _("Could not create initial preference file!") . "
\n" . + $errString = $errTitle . '
' . + _("Could not create initial preference file!") . "
\n" . sprintf( _("%s should be writable by user %s"), $data_dir, $uid ) . - "
\n" . _("Please contact your system administrator and report this error.") . "
\n"; + "
\n" . _("Please contact your system administrator and report this error.") . "
\n"; logout_error( $errString, $errTitle ); exit; } @@ -270,3 +270,4 @@ function getSig($data_dir, $username, $number) { } // vim: et ts=4 +?> \ No newline at end of file diff --git a/functions/imap_asearch.php b/functions/imap_asearch.php index 49c270f2..98f2407b 100644 --- a/functions/imap_asearch.php +++ b/functions/imap_asearch.php @@ -125,16 +125,16 @@ function sqimap_asearch_error_box($response, $query, $message, $link = '') else { //Straight copy of 1.5 imap_general.php:sqimap_error_box(). Can be removed at a later time global $color; require_once(SM_PATH . 'functions/display_messages.php'); - $string = "\n" . $title . "
\n"; + $string = "\n" . $title . "
\n"; if ($query != '') - $string .= _("Query:") . ' ' . htmlspecialchars($query) . '
'; + $string .= _("Query:") . ' ' . htmlspecialchars($query) . '
'; if ($message_title != '') $string .= $message_title; if ($message != '') $string .= htmlspecialchars($message); if ($link != '') $string .= $link; - $string .= "
\n"; + $string .= "
\n"; error_box($string,$color); } } @@ -524,4 +524,4 @@ function sqimap_asearch($imapConnection, &$mailbox_array, &$biop_array, &$unop_a return ($mbox_search); } -?> +?> \ No newline at end of file diff --git a/functions/imap_general.php b/functions/imap_general.php index a82b35bd..81673749 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -53,7 +53,7 @@ function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$respon global $squirrelmail_language, $color; set_up_language($squirrelmail_language); require_once(SM_PATH . 'functions/display_messages.php'); - $string = "\n" . + $string = "\n" . _("ERROR : No available imapstream.") . "\n"; error_box($string,$color); @@ -90,7 +90,7 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, global $squirrelmail_language, $color; set_up_language($squirrelmail_language); require_once(SM_PATH . 'functions/display_messages.php'); - $string = "\n" . + $string = "\n" . _("ERROR : No available imapstream.") . "\n"; error_box($string,$color); @@ -258,16 +258,16 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors, global $color, $squirrelmail_language; set_up_language($squirrelmail_language); require_once(SM_PATH . 'functions/display_messages.php'); - $string = "\n" . + $string = "\n" . _("ERROR : Bad function call.") . - "
\n" . + "
\n" . _("Reason:") . ' '. - 'There is a plugin installed which make use of the
' . - 'SquirrelMail internal function sqimap_read_data_list.
'. - 'Please adapt the installed plugin and let it use
'. - 'sqimap_run_command or sqimap_run_command_list instead

'. - 'The following query was issued:
'. - htmlspecialchars($query) . '
' . "
\n"; + 'There is a plugin installed which make use of the
' . + 'SquirrelMail internal function sqimap_read_data_list.
'. + 'Please adapt the installed plugin and let it use
'. + 'sqimap_run_command or sqimap_run_command_list instead

'. + 'The following query was issued:
'. + htmlspecialchars($query) . '
' . "
\n"; error_box($string,$color); echo ''; exit; @@ -288,17 +288,17 @@ function sqimap_error_box($title, $query = '', $message_title = '', $message = ' set_up_language($squirrelmail_language); require_once(SM_PATH . 'functions/display_messages.php'); - $string = "\n" . $title . "
\n"; + $string = "\n" . $title . "
\n"; $cmd = explode(' ',$query); $cmd= strtolower($cmd[0]); if ($query != '' && $cmd != 'login') - $string .= _("Query:") . ' ' . htmlspecialchars($query) . '
'; + $string .= _("Query:") . ' ' . htmlspecialchars($query) . '
'; if ($message_title != '') $string .= $message_title; if ($message != '') $string .= htmlspecialchars($message); - $string .= "
\n"; + $string .= "
\n"; if ($link != '') $string .= $link; error_box($string,$color); @@ -556,9 +556,9 @@ function sqimap_create_stream($server,$port,$tls=false) { $server = 'tls://' . $server; } else { require_once(SM_PATH . 'functions/display_messages.php'); - $string = "Unable to connect to IMAP server!
TLS is enabled, but this " . + $string = "Unable to connect to IMAP server!
TLS is enabled, but this " . "version of PHP does not support TLS sockets, or is missing the openssl " . - "extension.

Please contact your system administrator."; + "extension.

Please contact your system administrator."; logout_error($string,$color); } } @@ -570,8 +570,8 @@ function sqimap_create_stream($server,$port,$tls=false) { set_up_language($squirrelmail_language, true); require_once(SM_PATH . 'functions/display_messages.php'); $string = sprintf (_("Error connecting to IMAP server: %s.") . - "
\r\n", $server) . - "$error_number : $error_string
\r\n"; + "
\r\n", $server) . + "$error_number : $error_string
\r\n"; logout_error($string,$color); exit; } @@ -694,14 +694,14 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $ set_up_language($squirrelmail_language, true); require_once(SM_PATH . 'functions/display_messages.php'); if ($response == 'BAD') { - $string = sprintf (_("Bad request: %s")."
\r\n", $message); + $string = sprintf (_("Bad request: %s")."
\r\n", $message); } else { - $string = sprintf (_("Unknown error: %s") . "
\n", $message); + $string = sprintf (_("Unknown error: %s") . "
\n", $message); } if (isset($read) && is_array($read)) { - $string .= '
' . _("Read data:") . "
\n"; + $string .= '
' . _("Read data:") . "
\n"; foreach ($read as $line) { - $string .= htmlspecialchars($line) . "
\n"; + $string .= htmlspecialchars($line) . "
\n"; } } error_box($string,$color); @@ -945,24 +945,24 @@ function sqimap_append_done ($imap_stream, $folder='') { require_once(SM_PATH . 'functions/display_messages.php'); $reason = $regs[3]; if ($regs[2] == 'NO') { - $string = "\n" . + $string = "\n" . _("ERROR : Could not append message to") ." $folder." . - "
\n" . + "
\n" . _("Server responded: ") . - $reason . "
\n"; + $reason . "
\n"; if (preg_match("/(.*)(quota)(.*)$/i", $reason, $regs)) { $string .= _("Solution: ") . _("Remove unneccessary messages from your folder and start with your Trash folder.") - ."
\n"; + ."
\n"; } $string .= "\n"; error_box($string,$color); } else { - $string = "\n" . + $string = "\n" . _("ERROR : Bad or malformed request.") . - "
\n" . + "
\n" . _("Server responded: ") . - $tmp . "
\n"; + $tmp . "
\n"; error_box($string,$color); exit; } @@ -988,4 +988,4 @@ function map_yp_alias($username) { return chop(substr($yp, strlen($username)+1)); } -?> +?> \ No newline at end of file diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index 2bcb1478..e7b456e2 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -484,7 +484,7 @@ function sqimap_mailbox_parse ($line, $line_lsub) { /** * Returns list of options (to be echoed into select statement * based on available mailboxes and separators - * Caller should surround options with and + * Caller should surround options with and * any formatting. * $imap_stream - $imapConnection to query for mailboxes * $show_selected - array containing list of mailboxes to pre-select (0 if none) diff --git a/functions/options.php b/functions/options.php index 5ae717a0..dd64ca8e 100644 --- a/functions/options.php +++ b/functions/options.php @@ -521,9 +521,9 @@ function print_option_groups($option_groups) { function OptionSubmit( $name ) { echo html_tag( 'tr', - html_tag( 'td', '    ', 'right', '', 'colspan="2"' ) + html_tag( 'td', '    ', 'right', '', 'colspan="2"' ) ) . "\n"; } // vim: et ts=4 -?> +?> \ No newline at end of file diff --git a/functions/prefs.php b/functions/prefs.php index ed4c8de0..79416cba 100644 --- a/functions/prefs.php +++ b/functions/prefs.php @@ -115,9 +115,9 @@ function getHashedDir($username, $dir, $hash_dirs = '') { $real_hash_dir .= '/' . $hash_dirs[$h]; if (!@is_dir($real_hash_dir)) { if (!@mkdir($real_hash_dir, 0770)) { - echo sprintf(_("Error creating directory %s."), $real_hash_dir) . '
' . - _("Could not create hashed directory structure!") . "
\n" . - _("Please contact your system administrator and report this error.") . "
\n"; + echo sprintf(_("Error creating directory %s."), $real_hash_dir) . '
' . + _("Could not create hashed directory structure!") . "
\n" . + _("Please contact your system administrator and report this error.") . "
\n"; exit; } } diff --git a/functions/tree.php b/functions/tree.php index 5e5c8703..e4f39977 100644 --- a/functions/tree.php +++ b/functions/tree.php @@ -175,9 +175,9 @@ function simpleWalkTreePre($index, $tree) { for ($j = 0; $j < count($tree[$index]['subNodes']); $j++) { simpleWalkTreePre($tree[$index]['subNodes'][$j], $tree); } - echo $tree[$index]['value'] . '
'; + echo $tree[$index]['value'] . '
'; } else { - echo $tree[$index]['value'] . '
'; + echo $tree[$index]['value'] . '
'; } } ?> \ No newline at end of file diff --git a/help/en_US/FAQ.hlp b/help/en_US/FAQ.hlp index 1415974c..47cc2db2 100644 --- a/help/en_US/FAQ.hlp +++ b/help/en_US/FAQ.hlp @@ -16,7 +16,7 @@
Yes. The address book search will display all matches for the search criteria entered in the search box. If 10 names are displayed - any combination may be selected for either the To: or CC: + any combination may be selected for either the To: or CC: fields. All selected addresses will be inserted into the proper field when the Use Address button is pressed.
@@ -99,7 +99,7 @@
SquirrelMail uses the IMAP protocol, info on it can be found - here. The program also uses + here. The program also uses its own IMAP functions, not those built in to PHP4. This won't matter to anybody except those responsible for installing it, but trust us when we say they appreciate it. diff --git a/help/en_US/addresses.hlp b/help/en_US/addresses.hlp index d128ed27..99d10cf5 100644 --- a/help/en_US/addresses.hlp +++ b/help/en_US/addresses.hlp @@ -107,7 +107,7 @@ stored and made available. If configured to use the universities LDAP server, SquirrelMail would then be able to list all campus email address (along with the other address book fields if available). - SquirrelMail's LDAP use is truly powerful in that it combines + SquirrelMail's LDAP use is truly powerful in that it combines your local address book and the LDAP address server information to present all of the information as if it was a single address book.
diff --git a/help/en_US/basic.hlp b/help/en_US/basic.hlp index 0d852bd4..ba44e6cb 100644 --- a/help/en_US/basic.hlp +++ b/help/en_US/basic.hlp @@ -8,11 +8,11 @@
- So what exactly is SquirrelMail? - It's a web interface to email that's written in PHP4. + So what exactly is SquirrelMail? + It's a web interface to email that's written in PHP4. It was designed to allow email access through your server from anywhere in the world via the Web. More information about exactly - how it does this and the IMAP protocol can be found here. + how it does this and the IMAP protocol can be found here.
diff --git a/help/en_US/compose.hlp b/help/en_US/compose.hlp index 385866e6..d11f63bd 100644 --- a/help/en_US/compose.hlp +++ b/help/en_US/compose.hlp @@ -21,7 +21,7 @@ From -
The From: field will only be displayed if you have enabled multiple +
The From: field will only be displayed if you have enabled multiple identities (through the Options, Personal Preferences menu). If you've done so you can choose which identity you want to use, i.e. which name and email address appear as the From-line of your message. @@ -35,7 +35,7 @@
- Next is the To: field. In this field you should + Next is the To: field. In this field you should enter the email address of the person or persons you are sending a message to. You may enter as many addresses as you like, separating them with a comma. One may also press the "Addresses" button to fill @@ -52,14 +52,14 @@
- Next is the CC: field. CC is an abbreviation for Carbon - Copy. If you wish to send someone else a copy of the message + Next is the CC: field. CC is an abbreviation for Carbon + Copy. If you wish to send someone else a copy of the message here is where you would do that. Think of this in the same way a memo - is laid out. You can have as many people as you like in the To:, - CC:, and BCC: fields. Only the people to whom the message - has direct impact would be in the To: field while recipients to - whom this is possibly only informative would be in the CC: and - BCC: fields. + is laid out. You can have as many people as you like in the To:, + CC:, and BCC: fields. Only the people to whom the message + has direct impact would be in the To: field while recipients to + whom this is possibly only informative would be in the CC: and + BCC: fields.
@@ -70,9 +70,9 @@
- BCC is an abbreviation for Blind Carbon Copy. - Use this to send someone a copy of the email without the - recipients in the To: or CC: fields knowing about it. + BCC is an abbreviation for Blind Carbon Copy. + Use this to send someone a copy of the email without the + recipients in the To: or CC: fields knowing about it.
@@ -157,7 +157,7 @@
Located at the bottom of the Compose page, this feature allows you to include a file with your email. The file must be located on your - local machine or network to be attached. A browse button is + local machine or network to be attached. A browse button is present so you may search through your directory structure and click on the file to include. Alternatively you may type directly into the attach field if you know the full path and exact file name. Simply diff --git a/help/en_US/folders.hlp b/help/en_US/folders.hlp index 6f0c8678..0201c30e 100644 --- a/help/en_US/folders.hlp +++ b/help/en_US/folders.hlp @@ -27,7 +27,7 @@
The first folder listed contains received mail. To the right of the first folder is a number in parentheses - "( )" reflecting the count of unread emails. + "( )" reflecting the count of unread emails. This number is likely to vary from the total number of emails displayed in the right frame. Under the main folder are likely to be other folders or subfolders. @@ -44,7 +44,7 @@
You may delete any folder displayed in the drop down list box to - the left of the Delete button. Notice that this list may not + the left of the Delete button. Notice that this list may not include all the folders displayed. The special folders such as your sent or your trash folder cannot be deleted, and of course, you cannot delete INBOX. @@ -82,7 +82,7 @@
You may rename any folder displayed in the drop down list box to the - left of the Rename button. Notice that this list may not + left of the Rename button. Notice that this list may not include all the folders displayed in the left frame. For obvious reasons, you cannot rename the sent, trash, or INBOX folders.
@@ -94,12 +94,12 @@ Unsubscribe and Subscribe - Definitions:
+ Definitions:
Subscribe: To register a folder with the mail server, allowing - you to view it in the folder listings.
+ you to view it in the folder listings.
Unsubscribe: The opposite of subscribing. This unregisters a - folder with the mail server.
-
+ folder with the mail server.
+
You may choose as many folders as you wish from either the subscribe or the unsubscribe box, then click the button under the box to make the action take effect. You will notice that the folders move to the diff --git a/help/en_US/main_folder.hlp b/help/en_US/main_folder.hlp index 8dc5655a..14d9536e 100644 --- a/help/en_US/main_folder.hlp +++ b/help/en_US/main_folder.hlp @@ -19,7 +19,7 @@ menu choice is a line which informs you which mails you are viewing numerically and how many total you have.
- For example: Viewing messages 20 to 30 (45 total). + For example: Viewing messages 20 to 30 (45 total).
Notice that the total message count might be different from the unread mail count which is to the right of the main mail folder. @@ -43,12 +43,12 @@ message, and if you see the "!", then the message was marked as urgent!
What remains is the actual message table. You will notice that unread - messages are bold while viewed messages are in normal text. + messages are bold while viewed messages are in normal text. Four fields form this table. On the far left is a select box. When selected, the message on the same line is subject to the actions previously discussed (moving, marking (un)read and deletion). The Toggle All link at the top of the list allows you to check all - select boxes at once.
+ select boxes at once.
Under the From header is listed whom the message is from. Surprising, we know. But hey, you don't have to read this. The date is listed next, and finally the subject. diff --git a/help/en_US/options.hlp b/help/en_US/options.hlp index 6374bcfd..f655b05e 100644 --- a/help/en_US/options.hlp +++ b/help/en_US/options.hlp @@ -23,58 +23,58 @@ Personal Information - Full Name
+ Full Name
You should put your entire name here. For example, "John Doe". This is what is shown to people that you send the message to. They will see that it is from "John Doe". If you don't fill this in, they will see it is from your email address, "jdoe@mydomain.org". -

+

- E-Mail Address
+ E-Mail Address
Optional - If your email address is different than what is automatically assigned, you can change it here. -

+

- Reply To
+ Reply To
Optional - This is the email address that people will reply to when they reply to your message. If this is different than the email address you are sending from, you can enter it here. This is useful if you want people to reply to your Yahoo account rather than your office address. -

+

- Multiple Identities
+ Multiple Identities
Click this link to edit multiple identities. This is useful if you want to choose between different From-lines for different messages (for example containing your work or your home emailaddress. On the page that appears, you can add as many identities as you like. You will be offered a choice - of these when composing a message.

+ of these when composing a message.

- Reply Citation
+ Reply Citation
If you press Reply on a message, you will be presented with the Compose form with the original message quoted. Before this quoted message, a text - like John Doe wrote: might be prepended (if the message you're replying + like John Doe wrote: might be prepended (if the message you're replying to originated from John Doe). This is called the citation line. Here you - can choose how this line looks.
-
-
No Citation
- Prepends no citation line whatsoever.

-
Author Said
- This produces the line: John Doe Said: where John Doe will be replaced - by whoever the message you're replying to was from.

-
Quote Who XML
- This produces the line: <quote who="John Doe">.

-
User-Defined
+ can choose how this line looks.
+
+
No Citation
+ Prepends no citation line whatsoever.

+
Author Said
+ This produces the line: John Doe Said: where John Doe will be replaced + by whoever the message you're replying to was from.

+
Quote Who XML
+ This produces the line: <quote who="John Doe">.

+
User-Defined
Enables you to define your own citation line. In the two text boxes below, you can type in the citation start and end. Between these the author name will be inserted. -

+

- Signature
+ Signature
Optional - Signatures are attached at the bottom of all messages you send out. If you want a signature, you must make sure that the checkbox beside "use a signature" is checked, and then fill in what you want your signature to be in the box below it. -

+

@@ -83,24 +83,24 @@ Display Preferences - Theme
+ Theme
SquirrelMail offers different color themes for your viewing pleasure. You can choose between the many listed there if you so desire. -

+

- Custom Stylesheet
+ Custom Stylesheet
Changing a theme only changes the colors, a stylesheet may change more, for example the font size used by SquirrelMail. -

+

- Language
+ Language
If English isn't your native tongue, you can easily change the language that most things display in. If your desired language is in the list, you can choose it and all future SquirrelMail related messages will be in that language. Note that this doesn't translate incoming email messages or folder names. -

+

- Use Javascript
+ Use Javascript
One of our main goals in creating SquirrelMail was to have no Javascript in any of our pages. However, some of our developers made a very good address book searching utility that uses Javascript. Some other Javascript functions @@ -108,73 +108,73 @@ give you the option of using pure HTML or allow Javascript aswell. If you don't know what this means, you are safest to choose Autodetect. -

+

- Number of Messages to Index
+ Number of Messages to Index
This is the number of messages to show at a time in a folder. If there are more than this number in the folder, you will see a "Previous" and "Next" link above and below the listing which will take you to the previous or next messages. -

+

- Enable Page Selector
+ Enable Page Selector
Setting this to Yes shows page numbers above and below the message list to - quickly jump to a specific page of messages. The number Maximum pages to show + quickly jump to a specific page of messages. The number Maximum pages to show can limit how many page numbers will be displayed above and below the - message list.

+ message list.

- Wrap incoming text at
+ Wrap incoming text at
How many characters should we allow before wrapping the text. This prevents messages from scrolling way off the screen. 86 is usually a safe thing to put in here, but you are free to change it to whatever you desire. -

+

- Size of editor window
+ Size of editor window
How wide do you want your "Compose" box to be? This is the number of characters per line that you will be able to type before wrapping in the Compose section. -

+

- Location of Buttons when Composing
- Where are the buttons Addresses, Save Draft and Send located?

+ Location of Buttons when Composing
+ Where are the buttons Addresses, Save Draft and Send located?

- Addressbook Display Format
+ Addressbook Display Format
Choose how you want the addressbook to be displayed. If you want maximum compatibility with all browsers, use HTML. Select Javascript if you know your browser supports it, it will display a nicer addressbook. -

+

- Show HTML Version by Default
+ Show HTML Version by Default
If a message you receive is in both text and HTML format, you can choose if you want to see the HTML version (Yes) or the text version (No) by - default.

+ default.

- Include Me in CC when I Reply All
+ Include Me in CC when I Reply All
Reply All sends your reply to all recepients of the original message, including yourself. To leave your own email address out, set this to No. -

+

- Enable Mailer Display
+ Enable Mailer Display
When viewing a message, this displays which email program the sender used. -

+

- Display Attached Images with Message
+ Display Attached Images with Message
If someone sends you a message with one or more images attached and you've set this to Yes, the images will be displayed right away when you view the message. -

+

- Enable Subtle Printer Friendly Link
+ Enable Subtle Printer Friendly Link
This determines the way the Printable Version-link will be displayed. -

+

- Enable Printer Friendly Clean Display
+ Enable Printer Friendly Clean Display
This will clean out the message so the print looks nicer. -

+

- Other Options
+ Other Options
Depending on the configuration of your SquirrelMail installation, some more options might be displayed here. They hopefully should be self-explanatory. -

+

@@ -188,30 +188,30 @@ it is very hard to distinguish which messages came from where while reading through the list of messages. With Message Highlighting, you can have the background color of all messages from one mailing list different than the - color of another list.

+ color of another list.

Just click on [New] to create a new one, or [Edit] to edit an existing one - and the options will appear below.

+ and the options will appear below.

- Identifying Name
+ Identifying Name
This is simply the name that you see which describes what it is. For example, if you are highlighting messages from your mother, you might set this to "From Mom". -

+

- Color
+ Color
This is the actual color that the background will be. You can choose between a number of pre-defined colors that we have selected for you, or you can enter the HEX code for the color that you desire (i.e. a6b492). If you choose to enter your own color, you must also select the radio button in front so that it is checked. -

+

- Match
+ Match
Here you can choose the matching phrase. From the drop-down box, you can choose which header field to match against (to, from, subject...) and in the text box, you can enter the phrase to match (mom@yahoo.com). -

+

@@ -220,48 +220,48 @@ Folder Preferences - Folder Path
+ Folder Path
On some systems this will not be displayed. If you don't see this option, just ignore this. On other systems, this is quite a necessary feature. Usually the option that is in there is what should be there. This is the folder in your home directory that holds all your email folders. If you don't understand this, just leave it what it is. -

+

- Trash Folder
+ Trash Folder
You can choose which folder messages will be sent to when you delete them. If you don't want deleted messages to go to the trash, set this to "Don't use Trash". -

+

- Sent Folder
+ Sent Folder
You can choose which folder your sent messages will go to. If you don't want these, just set it to "Don't use Sent". -

+

- Draft Folder
+ Draft Folder
You can choose which folder the messages you save as draft will go to. If you don't want to use this, just set it to "Don't use Drafts". -

+

- Location of folder list
+ Location of folder list
Determines wether you want the list of folders on the left or right of your window. -

+

- Width of folder list
+ Width of folder list
With this option, you can select how wide the list of folders will be. If you have very long folder names or large fonts, it is good to set this pretty high. Otherwise, you should set it low so you don't waste screen space. -

+

- Auto refresh folder list
+ Auto refresh folder list
SquirrelMail has the functionality to automatically refresh the folder listing on the left side of your browser window. This will also update the number of unseen messages that are in each folder. This is a good way to check for unseen messages in the INBOX without having to click on it every time. -

+

- Enable Unread Message Notification
+ Enable Unread Message Notification
This option specifies how to display unseen messages in the folder listing on the right side of your browser window. If you set this to No Notification, you will not be notified of unseen messages. If you set it to INBOX, when you have new @@ -269,31 +269,31 @@ to say how many new messages are in it. If you set it to All Folders, this behavior will happen on all folders. If you notice that loading the folder list is really slow, you can set this to INBOX or None and that should speed it up. -

+

- Unseen message notification type
+ Unseen message notification type
When new messages are in a folder, this option tells either to only display the number of new messages or also display the total number of messages in that folder. -

+

- Enable Collapsable Folders
+ Enable Collapsable Folders
Collapsable Folders allow you to 'fold' or collapse a folder which contains subfolders so the subfolders will not be displayed. You can collapse a folder by clicking the "-" next to it and expand it again with the "+" sign. Setting this to No disables collapsing. -

+

- Show Clock on Folders Panel
+ Show Clock on Folders Panel
Choose if you want a clock to be displayed above the folder list and how it should look (Y=year, D=day, H=hour, M=minute, S=second). The option - Hour Format below gives you the choice of a 12- or 24-hour clock. -

+ Hour Format below gives you the choice of a 12- or 24-hour clock. +

- Memory Search
+ Memory Search
If you search a mailbox, the search will be saved for quick access later. This defines how many mailbox searches will be saved. -

+

@@ -306,7 +306,7 @@ This section gives you control over the message list. You can choose how much information you want in the message list and in what order it should be displayed. -

+

Use the Up and Down links to move columns around, Del to remove a column from the display and Add to add one. diff --git a/help/en_US/read_mail.hlp b/help/en_US/read_mail.hlp index d4b2ec3d..866bdc4b 100644 --- a/help/en_US/read_mail.hlp +++ b/help/en_US/read_mail.hlp @@ -45,7 +45,7 @@ Click this link to delete the message being currently viewed. All attachments of deleted mail are deleted as well. You can prevent the loss of attachments by Downloading them first (explained further in - this chapter).
+ this chapter).
In this context, deleting means that the message will be moved to the folder called Trash. If you wish to keep the message afterall, view the Trash folder and move the message out. @@ -171,7 +171,7 @@ on the file name will either display the attachment or present a download dialog depending on the file type. If you wish to download the file (rather than possibly viewing it), click on the "download" - link on the right side.
+ link on the right side.
If your webbrowser supports viewing the attachment file type, another link, "view" will be displayed which displays the file in your browser.
diff --git a/include/options/personal.php b/include/options/personal.php index 07b16a3a..952269ae 100644 --- a/include/options/personal.php +++ b/include/options/personal.php @@ -118,9 +118,9 @@ function load_optpage_data_personal() { ); if ($edit_identity) { - $identities_link_value = '' + $identities_link_value = '' . _("Edit Advanced Identities") - . ' ' + . ' ' . _("(discards changes made on this form so far)"); $optvals[SMOPT_GRP_CONTACT][] = array( 'name' => 'identities_link', @@ -232,4 +232,4 @@ function save_option_signature($option) { setSig($data_dir, $username, 'g', $option->new_value); } -?> +?> \ No newline at end of file diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index edfacbef..098ef000 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -109,7 +109,7 @@ function drawmonthview() { if ( $aday <= $days_in_month && $aday > 0){ echo html_tag( 'td', '', 'left', $color[4], 'height="50" valign="top"' ) ."\n". html_tag( 'div', '', 'right' ); - echo(($cdate==$todayis) ? "[ " . _("TODAY") . " ] " : ""); + echo(($cdate==$todayis) ? '[ ' . _("TODAY") . " ] " : ''); echo "$aday"; @@ -122,7 +122,7 @@ function drawmonthview() { while ($calfoo = each($calendardata[$cdate])) { $calbar = $calendardata[$cdate][$calfoo['key']]; $title = '['. $calfoo['key']. '] ' .$calbar['message']; - echo ($calbar['priority']==1) ? "$calbar[title]
\n" : "$calbar[title]
\n"; + echo ($calbar['priority']==1) ? "$calbar[title]
\n" : "$calbar[title]
\n"; $i=$i+1; if($i==2){ break; @@ -142,17 +142,17 @@ function endcalendar() { echo html_tag( 'tr' ) ."\n" . html_tag( 'td', '', 'left', '', 'colspan="7"' ) ."\n" . - "
\n". - " \n"; select_option_year($year); - echo " \n". - " \n". + " \n". - ' \n". - "
\n". - " \n". - "\n"; + echo " \n". + ' \n". + " \n". + " \n". + "\n"; } diff --git a/plugins/calendar/event_create.php b/plugins/calendar/event_create.php index e09a63a6..da1e49e9 100644 --- a/plugins/calendar/event_create.php +++ b/plugins/calendar/event_create.php @@ -86,52 +86,52 @@ if (isset($_POST['send'])) { function show_event_form() { global $color, $editor_size, $year, $day, $month, $hour; - echo "\n
\n". - " \n". - " \n". - " \n". + echo "\n\n". + " \n". + " \n". + " \n". html_tag( 'tr' ) . html_tag( 'td', _("Start time:"), 'right', $color[4] ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . "\n" . - " \n"; select_option_hour($hour); - echo " \n" . + echo " \n" . " : \n" . - " \n"; select_option_minute("00"); - echo " \n". + echo " \n". " \n". html_tag( 'tr' ) . html_tag( 'td', _("Length:"), 'right', $color[4] ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . "\n" . - " \n"; select_option_length("0"); - echo " \n". + echo " \n". " \n". html_tag( 'tr' ) . html_tag( 'td', _("Priority:"), 'right', $color[4] ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . "\n" . - " \n"; select_option_priority("0"); - echo " \n". + echo " \n". " \n". html_tag( 'tr' ) . html_tag( 'td', _("Title:"), 'right', $color[4] ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . "\n" . - "
\n". + "
\n". " \n". html_tag( 'tr', html_tag( 'td', - "" , + "" , 'left', $color[4], 'colspan="2"' ) ) ."\n" . html_tag( 'tr', html_tag( 'td', - "" , + '' , 'left', $color[4], 'colspan="2"' ) ) ."\n"; - echo "
\n"; + echo "\n"; } @@ -180,7 +180,7 @@ if(!isset($event_text)){ writecalendardata(); echo html_tag( 'table', html_tag( 'tr', - html_tag( 'th', _("Event Has been added!") . "
\n", '', $color[4], 'colspan="2"' ) + html_tag( 'th', _("Event Has been added!") . "
\n", '', $color[4], 'colspan="2"' ) ) . html_tag( 'tr', html_tag( 'td', _("Date:"), 'right', $color[4] ) . "\n" . diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php index 09bf4214..fa94d380 100644 --- a/plugins/calendar/event_delete.php +++ b/plugins/calendar/event_delete.php @@ -94,7 +94,7 @@ function confirm_deletion() echo html_tag( 'table', html_tag( 'tr', - html_tag( 'th', _("Do you really want to delete this event?") . '
', '', $color[4], 'colspan="2"' ) + html_tag( 'th', _("Do you really want to delete this event?") . '
', '', $color[4], 'colspan="2"' ) ) . html_tag( 'tr', html_tag( 'td', _("Date:"), 'right', $color[4] ) . @@ -114,26 +114,26 @@ function confirm_deletion() ) . html_tag( 'tr', html_tag( 'td', - "
\n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - ' \n". - "
\n" , + "
\n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + ' \n". + "
\n" , 'right', $color[4] ) . html_tag( 'td', - "
\n". - " \n". - " \n". - " \n". - ' \n". - "
\n" , + "
\n". + " \n". + " \n". + " \n". + ' \n". + "
\n" , 'left', $color[4] ) ) , '', $color[0], 'border="0" cellpadding="2" cellspacing="1"' ); @@ -164,7 +164,7 @@ echo html_tag( 'tr', '', '', $color[0] ) . if (isset($dyear) && isset($dmonth) && isset($dday) && isset($dhour) && isset($dminute)){ if (isset($confirmed)){ delete_event("$dmonth$dday$dyear", "$dhour$dminute"); - echo '

' . _("Event deleted!") . "
\n"; + echo '

' . _("Event deleted!") . "
\n"; echo "" . _("Day View") . "\n"; } else { @@ -172,7 +172,7 @@ if (isset($dyear) && isset($dmonth) && isset($dday) && isset($dhour) && isset($d confirm_deletion(); } } else { - echo '
' . _("Nothing to delete!"); + echo '
' . _("Nothing to delete!"); } ?> diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php index bcf71381..28e3e0a9 100644 --- a/plugins/calendar/event_edit.php +++ b/plugins/calendar/event_edit.php @@ -107,67 +107,67 @@ function update_event_form() { global $color, $editor_size, $year, $day, $month, $hour, $minute, $calendardata; $tmparray = $calendardata["$month$day$year"]["$hour$minute"]; - echo "\n
\n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". + echo "\n\n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". html_tag( 'tr' ) . html_tag( 'td', _("Date:"), 'right', $color[4] ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . - " \n"; select_option_year($year); - echo " \n" . + echo " \n" . "   \n" . - " \n"; select_option_month($month); - echo " \n". + echo " \n". "   \n". - " \n"; select_option_day($day); - echo " \n". + echo " \n". " \n". html_tag( 'tr' ) . html_tag( 'td', _("Time:"), 'right', $color[4] ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . - " \n"; select_option_hour($hour); - echo " \n". + echo " \n". " : \n". - " \n"; select_option_minute($minute); - echo " \n". + echo " \n". " \n". html_tag( 'tr' ) . html_tag( 'td', _("Length:"), 'right', $color[4] ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . - " \n"; select_option_length($tmparray['length']); - echo " \n". + echo " \n". " \n". html_tag( 'tr' ) . html_tag( 'td', _("Priority:"), 'right', $color[4] ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . - " \n"; select_option_priority($tmparray['priority']); - echo " \n". + echo " \n". " \n". html_tag( 'tr' ) . html_tag( 'td', _("Title:"), 'right', $color[4] ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . - "
\n". + "
\n". " \n". html_tag( 'td', - " $tmparray[message]\n" , + " $tmparray[message]\n" , 'left', $color[4], 'colspan="2"' ) . '' . html_tag( 'tr' ) . html_tag( 'td', - "\n" , + '\n" , 'left', $color[4], 'colspan="2"' ) . - "
\n"; + "\n"; } // self explenatory @@ -178,7 +178,7 @@ function confirm_update() { echo html_tag( 'table', html_tag( 'tr', - html_tag( 'th', _("Do you really want to change this event from:") . "
\n", '', $color[4], 'colspan="2"' ) ."\n" + html_tag( 'th', _("Do you really want to change this event from:") . "
\n", '', $color[4], 'colspan="2"' ) ."\n" ) . html_tag( 'tr', html_tag( 'td', _("Date:") , 'right', $color[4] ) ."\n" . @@ -201,7 +201,7 @@ function confirm_update() { html_tag( 'td', $tmparray['message'] , 'left', $color[4] ) ."\n" ) . html_tag( 'tr', - html_tag( 'th', _("to:") . "
\n", '', $color[4], 'colspan="2"' ) ."\n" + html_tag( 'th', _("to:") . "
\n", '', $color[4], 'colspan="2"' ) ."\n" ) . html_tag( 'tr', @@ -226,33 +226,33 @@ function confirm_update() { ) . html_tag( 'tr', html_tag( 'td', - "
\n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - " \n". - ' \n". - "
\n" , + "
\n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + " \n". + ' \n". + "
\n" , 'right', $color[4] ) ."\n" . html_tag( 'td', - "
\n". - " \n". - " \n". - " \n". - ' \n". - "
\n" , + "
\n". + " \n". + " \n". + " \n". + ' \n". + "
\n" , 'left', $color[4] ) ."\n" ) , '', $color[0], 'border="0" cellpadding="2" cellspacing="1"' ); diff --git a/plugins/calendar/functions.php b/plugins/calendar/functions.php index 6dba751f..d7cbb6b9 100644 --- a/plugins/calendar/functions.php +++ b/plugins/calendar/functions.php @@ -56,9 +56,9 @@ function select_option_length($selected) { while( $bar = each($eventlength)) { if($selected==$bar['key']){ - echo " \n"; + echo ' \n"; } else { - echo " \n"; + echo ' \n"; } } } @@ -81,9 +81,9 @@ function select_option_minute($selected) { while ( $bar = each($eventminute)) { if ($selected==$bar['key']){ - echo " \n"; + echo ' \n"; } else { - echo " \n"; + echo ' \n"; } } } @@ -93,9 +93,9 @@ function select_option_hour($selected) { for ($i=0;$i<24;$i++){ ($i<10)? $ih = "0" . $i : $ih = $i; if ($ih==$selected){ - echo " \n"; + echo ' \n"; } else { - echo " \n"; + echo ' \n"; } } } @@ -108,9 +108,9 @@ function select_option_priority($selected) { while( $bar = each($eventpriority)) { if($selected==$bar['key']){ - echo " \n"; + echo ' \n"; } else { - echo " \n"; + echo ' \n"; } } } @@ -119,9 +119,9 @@ function select_option_year($selected) { for ($i=1902;$i<2038;$i++){ if ($i==$selected){ - echo " \n"; + echo ' \n"; } else { - echo " \n"; + echo ' \n"; } } } @@ -132,9 +132,9 @@ function select_option_month($selected) { $im=date('m',mktime(0,0,0,$i,1,1)); $is = getMonthAbrv( date('m',mktime(0,0,0,$i,1,1)) ); if ($im==$selected){ - echo " \n"; + echo ' \n"; } else { - echo " \n"; + echo ' \n"; } } } @@ -144,11 +144,11 @@ function select_option_day($selected) { for ($i=1;$i<32;$i++){ ($i<10)? $ih="0".$i : $ih=$i; if ($i==$selected){ - echo " \n"; + echo ' \n"; } else { - echo " \n"; + echo ' \n"; } } } -?> +?> \ No newline at end of file diff --git a/plugins/fortune/setup.php b/plugins/fortune/setup.php index dbdc7b10..9cecbf44 100644 --- a/plugins/fortune/setup.php +++ b/plugins/fortune/setup.php @@ -48,7 +48,7 @@ function fortune() { if (!$exist) { echo "$fortune_location" . _(" not found."); } else { - echo "" . _("Today's Fortune") . "
"; + echo "" . _("Today's Fortune") . "
"; htmlspecialchars(system($fortune_location)); } @@ -93,4 +93,4 @@ function fortune_save() { } } -?> +?> \ No newline at end of file diff --git a/plugins/info/options.php b/plugins/info/options.php index 3295c1c7..fa4e8e03 100644 --- a/plugins/info/options.php +++ b/plugins/info/options.php @@ -148,12 +148,12 @@ foreach($type as $index=>$value) { addInput($index, $value, 60); } -echo "
\n". +echo "
\n". ''. addSubmit('submit','submit'). addSubmit('clear','submit'). addSubmit('default','submit'). - "
\n"; + "
\n"; $tests = array(); diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php index de9e1f7a..6025c414 100644 --- a/plugins/mail_fetch/fetch.php +++ b/plugins/mail_fetch/fetch.php @@ -74,14 +74,14 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); function Mail_Fetch_Select_Server($mailfetch) { global $PHP_SELF; - echo '
' . - "
" . + echo '
' . + '' . html_tag( 'table', '', 'center', '', 'width="70%" cols="2"' ) . html_tag( 'tr' ) . html_tag( 'td', _("Select Server:") . ' ', 'right' ) . html_tag( 'td', '', 'left' ) . '', 'left' ) + html_tag( 'td', '', 'left' ) ); } } echo html_tag( 'tr', html_tag( 'td', ' ' ) . - html_tag( 'td', '', 'left' ) + html_tag( 'td', '', 'left' ) ) . '
'; } @@ -113,7 +113,7 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); $mailfetch = Mail_Fetch_Servers(); displayPageHeader($color, 'None'); - echo '
'; + echo '
'; echo html_tag( 'table', html_tag( 'tr', @@ -160,7 +160,7 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); $pop3 = new POP3($mailfetch_server, 60); - echo '
' . + echo '
' . html_tag( 'table', html_tag( 'tr', html_tag( 'td', '' . _("Fetching from ") . diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php index 5a37918e..82835ac1 100644 --- a/plugins/mail_fetch/options.php +++ b/plugins/mail_fetch/options.php @@ -151,7 +151,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); } - echo '
' . + echo '
' . html_tag( 'table', html_tag( 'tr', html_tag( 'td', @@ -162,7 +162,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); html_tag( 'table', html_tag( 'tr', html_tag( 'td', - _("You should be aware that the encryption used to store your password is not perfectly secure. However, if you are using pop, there is inherently no encryption anyway. Additionally, the encryption that we do to save it on the server can be undone by a hacker reading the source to this file." ) , + _("You should be aware that the encryption used to store your password is not perfectly secure. However, if you are using pop, there is inherently no encryption anyway. Additionally, the encryption that we do to save it on the server can be undone by a hacker reading the source to this file.") , 'left' ) ) . html_tag( 'tr', @@ -172,8 +172,8 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); ) . html_tag( 'tr', html_tag( 'td', - '':'>') . + '':' />') . _("Encrypt passwords (informative only)") , 'right' ) ) , @@ -188,28 +188,28 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); html_tag( 'tr' ) . html_tag( 'td', '', 'center', $color[0] ) . - "" . - '' . + "" . + '' . html_tag( 'table' ) . html_tag( 'tr', html_tag( 'th', _("Server:"), 'right' ) . - html_tag( 'td', '', 'left' ) + html_tag( 'td', '', 'left' ) ) . html_tag( 'tr', html_tag( 'th', _("Port:"), 'right') . - html_tag( 'td', '', 'left') + html_tag( 'td', '', 'left') ) . html_tag( 'tr', html_tag( 'th', _("Alias:"), 'right' ) . - html_tag( 'td', '', 'left' ) + html_tag( 'td', '', 'left' ) ) . html_tag( 'tr', html_tag( 'th', _("Username:"), 'right' ) . - html_tag( 'td', '', 'left' ) + html_tag( 'td', '', 'left' ) ) . html_tag( 'tr', html_tag( 'th', _("Password:"), 'right' ) . - html_tag( 'td', '', 'left' ) + html_tag( 'td', '', 'left' ) ) . html_tag( 'tr' ) . html_tag( 'th', _("Store in Folder:"), 'right' ) . @@ -225,25 +225,25 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); echo '' . html_tag( 'tr', html_tag( 'th', ' ', 'right' ) . - html_tag( 'td', '' . _("Leave Mail on Server"), 'left' ) + html_tag( 'td', '' . _("Leave Mail on Server"), 'left' ) ) . html_tag( 'tr', html_tag( 'th', ' ', 'right' ) . - html_tag( 'td', '' . _("Check mail during login"), 'left' ) + html_tag( 'td', '' . _("Check mail during login"), 'left' ) ) . html_tag( 'tr', html_tag( 'th', ' ', 'right' ) . - html_tag( 'td', '' . _("Check mail during folder refresh"), 'left' ) + html_tag( 'td', '' . _("Check mail during folder refresh"), 'left' ) ) . html_tag( 'tr', html_tag( 'td', - '', + '', 'center', '', 'colspan="2"' ) ) . '
'; // Modify Server - echo '
' . + echo '
' . html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) . html_tag( 'tr', html_tag( 'td', '' . _("Modify Server") . '', 'center', $color[9] ) @@ -258,8 +258,8 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); htmlspecialchars( (($mailfetch_alias_[$i]=='')?$mailfetch_server_[$i]:$mailfetch_alias_[$i])) . ""; } echo ''. - '  '. - '  '. + '  '. + '  '. ''; } else { echo _("No-one server in use. Try to add."); @@ -272,19 +272,19 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); html_tag( 'td', '' . _("Fetching Servers") . '', 'center', $color[0] ) ) , 'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) . - '
' . + '
' . html_tag( 'table', html_tag( 'tr', html_tag( 'td', '' . _("Confirm Deletion of a Server") . '', 'center', $color[9] ) ) . html_tag( 'tr', html_tag( 'td', - "" . - '' . - '
' . _("Selected Server:") . " " . htmlspecialchars($mailfetch_server_[$mf_sn]) . "
" . - _("Confirm delete of selected server?") . '

' . - '' . - '
' , + "" . + '' . + '
' . _("Selected Server:") . " " . htmlspecialchars($mailfetch_server_[$mf_sn]) . "
" . + _("Confirm delete of selected server?") . '

' . + '' . + '
' , 'center', $color[9] ) ) , 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ); @@ -295,7 +295,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); html_tag( 'td', '' . _("Fetching Servers") . '', 'center', $color[0] ) ) , 'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) . - '
' . + '
' . html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) . html_tag( 'tr', html_tag( 'td', '' . _("Modify Server") . '', 'center', $color[9] ) @@ -303,33 +303,33 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); html_tag( 'tr' ) . html_tag( 'td', '', 'center', $color[0] ) . - "" . - '' . + "" . + '' . html_tag( 'table' ) . html_tag( 'tr', html_tag( 'th', _("Server:"), 'right' ) . html_tag( 'td', '', 'left' ) + htmlspecialchars($mailfetch_server_[$mf_sn]) . '" size="40" />', 'left' ) ) . html_tag( 'tr', html_tag( 'th', _("Port:"), 'right' ) . html_tag( 'td', '', 'left' ) + htmlspecialchars($mailfetch_port_[$mf_sn]) . '" size="40" />', 'left' ) ) . html_tag( 'tr', html_tag( 'th', _("Alias:"), 'right' ) . html_tag( 'td', '', 'left' ) + htmlspecialchars($mailfetch_alias_[$mf_sn]) . '" size="40" />', 'left' ) ) . html_tag( 'tr', html_tag( 'th', _("Username:"), 'right' ) . html_tag( 'td', '', 'left' ) + htmlspecialchars($mailfetch_user_[$mf_sn]) . '" size="20" />', 'left' ) ) . html_tag( 'tr', html_tag( 'th', _("Password:"), 'right' ) . html_tag( 'td', '', 'left' ) + htmlspecialchars($mailfetch_pass_[$mf_sn]) . '" size="20" />', 'left' ) ) . html_tag( 'tr' ) . html_tag( 'th', _("Store in Folder:"), 'right' ) . @@ -348,27 +348,27 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); html_tag( 'tr', html_tag( 'th', ' ', 'right' ) . html_tag( 'td', - '' . _("Leave Mail on Server") , + '' . _("Leave Mail on Server") , 'left' ) ) . html_tag( 'tr', html_tag( 'th', ' ', 'right' ) . html_tag( 'td', - '' . _("Check mail during login"), + '' . _("Check mail during login"), 'left' ) ) . html_tag( 'tr', html_tag( 'th', ' ', 'right' ) . html_tag( 'td', - '' . _("Check mail during folder refresh") , + '' . _("Check mail during folder refresh") , 'left' ) ) . html_tag( 'tr', html_tag( 'td', - '', + '', 'center', '', 'colspan="2"' ) ) . @@ -381,7 +381,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); html_tag( 'td', '' . _("Fetching Servers") . '', 'center', $color[0] ) ) , 'center', '', 'width="95%"' ) . - '
' . + '
' . html_tag( 'table', html_tag( 'tr', html_tag( 'td', '' . _("Undefined Function") . '', 'center', $color[9] ) . diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php index 584e75b0..e099ce1a 100644 --- a/plugins/mail_fetch/setup.php +++ b/plugins/mail_fetch/setup.php @@ -117,9 +117,9 @@ $mailfetch_uidl=$mailfetch_uidl_[$i_loop]; $mailfetch_subfolder=$mailfetch_subfolder_[$i_loop]; - // $outMsg .= "$mailfetch_alias checked
"; + // $outMsg .= "$mailfetch_alias checked
"; - // $outMsg .= "$mailfetch_alias_[$i_loop]
"; + // $outMsg .= "$mailfetch_alias_[$i_loop]
"; $pop3 = new POP3($mailfetch_server, 60); @@ -208,7 +208,7 @@ } if( trim( $outMsg ) <> '' ) { - echo '
' . _("Mail Fetch Result:") . "
$outMsg"; + echo '
' . _("Mail Fetch Result:") . "
$outMsg"; } if( $mailfetch_newlog == 'on' ) { setPref($data_dir, $username, 'mailfetch_newlog', 'off'); @@ -236,4 +236,4 @@ ); } -?> +?> \ No newline at end of file diff --git a/plugins/message_details/setup.php b/plugins/message_details/setup.php index 4f68e9bd..71b0ba29 100644 --- a/plugins/message_details/setup.php +++ b/plugins/message_details/setup.php @@ -46,9 +46,9 @@ function show_message_details() { " }\n" . "// -->\n" . "\n" . - " | $print_text\n"; + " | $print_text\n"; } echo $result; } -?> +?> \ No newline at end of file diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php index 3d343525..50122518 100644 --- a/plugins/newmail/newmail.php +++ b/plugins/newmail/newmail.php @@ -25,7 +25,7 @@ sqGetGlobalVar('numnew', $numnew, SQ_GET); displayHtmlHeader( _("New Mail"), '', FALSE ); - echo "\n". + echo ''."\n". ''. "\n" . html_tag( 'table', "\n" . html_tag( 'tr', "\n" . @@ -33,14 +33,14 @@ sqGetGlobalVar('numnew', $numnew, SQ_GET); ) . html_tag( 'tr', "\n" . html_tag( 'td', - '
' . _("You have").' '. + '
' . _("You have").' '. sprintf( ( $numnew == 1 ? _("%s new message") : _("%s new messages") ), $numnew ) . - '

' . "\n" . + '

' . "\n" . '
' . "\n". - ''."\n". + ''."\n". '
', 'center' ) ) , @@ -53,4 +53,4 @@ sqGetGlobalVar('numnew', $numnew, SQ_GET); "\n". "\n"; -?> +?> \ No newline at end of file diff --git a/plugins/newmail/setup.php b/plugins/newmail/setup.php index 12bd65f7..c0c05c73 100644 --- a/plugins/newmail/setup.php +++ b/plugins/newmail/setup.php @@ -215,11 +215,11 @@ } if ($totalNew > 0 && $newmail_enable == 'on' && $newmail_media != '' ) { - echo '\n"; + echo '\n"; } if ($totalNew > 0 && $newmail_popup == 'on') { - echo " - - + +"; '. diff --git a/themes/darkness.php b/themes/darkness.php index c8c8d202..f338774d 100755 --- a/themes/darkness.php +++ b/themes/darkness.php @@ -63,7 +63,7 @@ function DarknessTremble() { } setTimeout('DarknessTremble()', 10000); - +?> \ No newline at end of file -- 2.25.1

-'; echo '\n"; } else { ?>
- - -" /> + +"; } ?>
-
- - - +?> + + + - + \n"; } else { @@ -198,8 +198,8 @@ echo "
"; } ?> - - + + \n"; } diff --git a/plugins/translate/options.php b/plugins/translate/options.php index 68e25a78..f8e2c534 100644 --- a/plugins/translate/options.php +++ b/plugins/translate/options.php @@ -84,7 +84,7 @@ function ShowOption($Var, $value, $Desc) { echo '\n"; } @@ -102,7 +102,7 @@ function ShowTrad( $tit, $com, $url ) { } ?> - +
+

@@ -150,8 +150,8 @@ function ShowTrad( $tit, $com, $url ) {
". - ''. + ''. + '
'. ''. @@ -170,7 +170,7 @@ function ShowTrad( $tit, $com, $url ) { ''.html_tag('td',_("When reading:"),'right','','nowrap'). '\n"; $disable_compose_translate=true; if (!$disable_compose_translate) { echo ''.html_tag('td',_("When composing:"),'right','','nowrap'). - '\n"; } - echo ''. - '
' . _("Select your translator:") . '
- ' . _("Show translation box") . '
'. ' - ' . _("Translate inside the SquirrelMail frames"). "
- ' . _("Not yet functional, currently does nothing") . "
'. - ''. - '
'. - ''. -"\n"; - -?> \ No newline at end of file +?> +
+" name="submit_translate" /> +
+ + diff --git a/plugins/translate/setup.php b/plugins/translate/setup.php index c59b1c80..7ba5dd8d 100644 --- a/plugins/translate/setup.php +++ b/plugins/translate/setup.php @@ -63,7 +63,7 @@ if ($trans_ar[0] != '') { $new_body = $body; $pos = strpos($new_body, - '">'. _("Download this as a file") . '
'); + '">'. _("Download this as a file") . '
'); if (is_int($pos)) { $new_body = substr($new_body, 0, $pos); } @@ -208,11 +208,11 @@ function translate_lang_opt($from, $to, $value, $text) { $ret = ' '; + echo ''; + echo ''. + 'GPLTrans: '; translate_table_end(); } @@ -468,9 +468,9 @@ function translate_form_dictionary($message) { translate_new_form('http://dictionary.reference.com/translate/text.html'); list($usec, $sec) = explode(" ",microtime()); $time = $sec . (float)$usec*100000000; - echo "". - "". - ''. + ''. + ''. - 'Dictionary.com: '; + ''. + 'Dictionary.com: '; translate_table_end(); } @@ -534,9 +534,9 @@ function translate_form_dictionary($message) { function translate_form_otenet($message) { translate_new_form('http://systran.otenet.gr/cgi-bin/systran.cgi'); ?> - - - + + + '; + 'OTEnet: '; translate_table_end(); } @@ -593,16 +593,16 @@ function translate_form_otenet($message) { */ function translate_form_promt($message) { translate_new_form('http://www.online-translator.com/text.asp#tr_form'); - echo ''; - echo ""; + echo ''; + echo ''; echo _("Interface language")." : "; echo "
\n"; + echo '\n"; + echo '\n"; + echo '\n"; + echo '\n"; + echo '\n"; + echo "
\n"; echo _("Translation direction")." : "; echo '
\n"; - echo "\n"; - echo 'PROMT: '; + echo "
\n"; + echo "\n"; + echo 'PROMT: '; translate_table_end(); } @@ -647,10 +647,10 @@ function translate_form_promt($message) { function translate_form_google($message) { translate_new_form('http://www.google.com/translate_t'); ?> - - - - + + + + '; + 'Google: '; translate_table_end(); } diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 028c04fe..ded84c02 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -46,7 +46,7 @@ sqgetGlobalVar('backend', $backend, SQ_POST); */ function insert_javascript() { ?> - +// --> - + diff --git a/src/left_main.php b/src/left_main.php index 694ed67b..7d8ecffd 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -64,7 +64,7 @@ function formatMailboxName($imapConnection, $box_array) { $line = ''; /* If there are unseen message, bold the line. */ - if ($unseen > 0) { $line .= ''; } + if ($unseen > 0) { $line .= ''; } /* Create the link for this folder. */ if ($status !== false) { @@ -86,7 +86,7 @@ function formatMailboxName($imapConnection, $box_array) { } /* If there are unseen message, close bolding. */ - if ($unseen > 0) { $line .= ""; } + if ($unseen > 0) { $line .= ""; } /* Print unseen information. */ if ($unseen_string != '') { diff --git a/src/options_identities.php b/src/options_identities.php index 42519058..12cf4de7 100644 --- a/src/options_identities.php +++ b/src/options_identities.php @@ -301,7 +301,7 @@ if (!empty($_POST)) { function sti_input( $title, $hd, $data, $post, $bg ) { $return_val = html_tag( 'tr', html_tag( 'td', $title . ':', 'right', '', 'nowrap' ) . - html_tag( 'td', '' , 'left' ) , + html_tag( 'td', '' , 'left' ) , '', $bg ); return ($return_val); } @@ -336,19 +336,19 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post) $return_val .= html_tag( 'tr', '', '', $OtherBG); $return_val .= html_tag( 'td', ' ', 'left' ); $return_val .= html_tag( 'td', '', 'left' ); - $return_val .= ''; - $return_val .= ''; + $return_val .= ''; + $return_val .= ''; if (! $isEmptySection && $post != '') { $return_val .= ''. + _("Make Default") . '" />'. ''; + _("Delete") . '" />'; } if (! $isEmptySection && $post != '' && $post > 1) { - $return_val .= ''; + $return_val .= ''; } $return_val .= concat_hook_function('options_identities_buttons', array($isEmptySection, $post)); $return_val .= '