[prev in list] [next in list] [prev in thread] [next in thread]
List: squirrelmail-cvs
Subject: [SM-CVS] CVS: squirrelmail/src addressbook.php,1.58.2.12,1.58.2.13 compose.php,1.319.2.39,1.319.2.40
From: Fredrik Jervfors <jervfors () users ! sourceforge ! net>
Date: 2004-09-30 22:56:44
Message-ID: E1CD9qu-0004Fo-BL () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16298/src
Modified Files:
Tag: SM-1_4-STABLE
addressbook.php compose.php configtest.php
Log Message:
Minor cleanup
Index: addressbook.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/addressbook.php,v
retrieving revision 1.58.2.12
retrieving revision 1.58.2.13
diff -u -w -r1.58.2.12 -r1.58.2.13
--- addressbook.php 16 Aug 2004 06:55:27 -0000 1.58.2.12
+++ addressbook.php 30 Sep 2004 22:56:41 -0000 1.58.2.13
@@ -73,8 +73,7 @@
function address_form($name, $submittext, $values = array()) {
global $color, $squirrelmail_language;
- if ($squirrelmail_language == 'ja_JP')
- {
+ if ($squirrelmail_language == 'ja_JP') {
echo html_tag( 'table',
addressbook_inp_field(_("Nickname"), 'nickname', $name, \
15, $values,
' <small>' . _("Must be unique") . '</small>') .
@@ -365,8 +364,7 @@
} else {
$tr_bgcolor = $color[4];
}
- if ($squirrelmail_language == 'ja_JP')
- {
+ if ($squirrelmail_language == 'ja_JP') {
echo html_tag( 'tr', '', '', $tr_bgcolor);
if ($abook->backends[$row['backend']]->writeable) {
echo html_tag( 'td',
@@ -395,7 +393,6 @@
' ' ,
'center', '', 'valign="top" width="1%"' );
}
-
echo html_tag( 'td', ' ' . $row['nickname'] . ' ', 'left', '', \
'valign="top" width="1%" nowrap' ) .
html_tag( 'td', ' ' . $row['name'] . ' ', 'left', '', \
'valign="top" width="1%" nowrap' ) .
html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . \
' '; @@ -434,7 +431,7 @@
)
, 'center', '', 'width="100%"' ) ."\n";
address_form('addaddr', _("Add address"), $defdata);
-echo '</form>';
+echo "</form>\n";
/* Add hook for anything that wants on the bottom */
do_hook('addressbook_bottom');
Index: compose.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/compose.php,v
retrieving revision 1.319.2.39
retrieving revision 1.319.2.40
diff -u -w -r1.319.2.39 -r1.319.2.40
--- compose.php 16 Aug 2004 06:55:28 -0000 1.319.2.39
+++ compose.php 30 Sep 2004 22:56:41 -0000 1.319.2.40
@@ -350,19 +350,19 @@
if (! isset($passed_id)) {
$passed_id = 0;
}
- /*
+ /**
* Set $default_charset to correspond with the user's selection
* of language interface.
*/
set_my_charset();
- /*
+ /**
* This is to change all newlines to \n
* We'll change them to \r\n later (in the sendMessage function)
*/
$body = str_replace("\r\n", "\n", $body);
$body = str_replace("\r", "\n", $body);
- /*
+ /**
* Rewrap $body so that no line is bigger than $editor_size
* This should only really kick in the sqWordWrap function
* if the browser doesn't support "VIRTUAL" as the wrap type.
@@ -470,8 +470,7 @@
}
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
- }
- else {
+ } else {
displayPageHeader($color, $mailbox);
}
showInputForm($session);
@@ -496,8 +495,7 @@
} elseif (isset($do_delete)) {
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
- }
- else {
+ } else {
displayPageHeader($color, $mailbox);
}
@@ -625,7 +623,6 @@
$bodypart = preg_replace(array('/<p>/i','/<br\s*(\/)*>/i'), "\n", \
$bodypart);
$bodypart = str_replace(array(' ','>','<'),array(' \
','>','<'),$bodypart); $bodypart = strip_tags($bodypart);
-
}
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
@@ -648,7 +645,6 @@
$identity = '';
$idents = getPref($data_dir, $username, 'identities');
$from_o = $orig_header->from;
-
if (is_array($from_o)) {
if (isset($from_o[0])) {
$from_o = $from_o[0];
@@ -659,10 +655,11 @@
} else {
$orig_from = '';
}
+
$identities = array();
if (!empty($idents) && $idents > 1) {
- $identities[] = '"'. getPref($data_dir, $username, 'full_name')
- . '" <' . getPref($data_dir, $username, 'email_address') . '>';
+ $identities[] = '"'. getPref($data_dir, $username, 'full_name').
+ '" <'.getPref($data_dir, $username, 'email_address').'>';
for ($i = 1; $i < $idents; $i++) {
$enc_from_name = '"'.
getPref($data_dir, $username, 'full_name' . $i) .
@@ -1070,8 +1067,7 @@
echo "\n\n".($prefix_sig==true? "-- \
\n":'').decodeHeader($signature,false,false); }
}
- }
- else {
+ } else {
echo htmlspecialchars(decodeHeader($body,false,false));
}
echo '</textarea><br />' . "\n" .
@@ -1111,8 +1107,8 @@
} else {
$maxsize = '';
}
- echo addHidden('MAX_FILE_SIZE', min( $sizes ));
- echo ' <tr>' . "\n" .
+ echo addHidden('MAX_FILE_SIZE', min( $sizes )).
+ ' <tr>' . "\n" .
' <td colspan="2">' . "\n" .
' <table width="100%" cellpadding="1" cellspacing="0" \
align="center"'. ' border="0" bgcolor="'.$color[9].'">' . "\n" .
@@ -1131,7 +1127,6 @@
' </td>' . "\n" .
' </tr>' . "\n";
-
$s_a = array();
if ($composeMessage->entities) {
foreach ($composeMessage->entities as $key => $attachment) {
Index: configtest.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/configtest.php,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -u -w -r1.9.2.4 -r1.9.2.5
--- configtest.php 18 Aug 2004 22:36:47 -0000 1.9.2.4
+++ configtest.php 30 Sep 2004 22:56:41 -0000 1.9.2.5
@@ -261,7 +261,6 @@
fputs($stream, "A002 LOGOUT\r\n");
fclose($stream);
-
echo "Checking internationalization (i18n) settings...<br />\n";
echo "$IND gettext - ";
if (function_exists('gettext')) {
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic