Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3126/src
Modified Files:
addressbook.php
Log Message:
sanitizing address book listing. extra field row is added for plugins
that want to add html tags to address book listing (like vcard_abook).
Index: addressbook.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/addressbook.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -w -r1.94 -r1.95
--- addressbook.php 18 Sep 2005 10:25:53 -0000 1.94
+++ addressbook.php 15 Oct 2005 11:12:53 -0000 1.95
@@ -247,6 +247,11 @@
/* List addresses */
if (count($alist) > 0) {
echo addForm($form_url, 'post');
+ if ($abook->add_extra_field) {
+ $abook_fields = 6;
+ } else {
+ $abook_fields = 5;
+ }
while(list($undef,$row) = each($alist)) {
/* New table header for each backend */
@@ -257,10 +262,10 @@
html_tag( 'td',
addSubmit(_("Edit selected"), 'editaddr').
addSubmit(_("Delete selected"), 'deladdr'),
- 'center', '', 'colspan="5"' )
+ 'center', '', "colspan=\"$abook_fields\"" )
) .
html_tag( 'tr',
- html_tag( 'td', ' <br />', 'center', '', 'colspan="5"' )
+ html_tag( 'td', ' <br />', 'center', '', "colspan=\"$abook_fields\"" )
),
'center' );
echo "\n<!-- start of address book table -->\n" .
@@ -278,20 +283,22 @@
'left', '', 'width="1%"' ) . "\n" .
html_tag( 'th', _("Info") .
show_abook_sort_button($abook_sort_order, _("sort by info"), 6, 7),
- 'left', '', 'width="1%"' ) . "\n",
+ 'left', '', 'width="1%"' ) .
+ ($abook->add_extra_field ? html_tag( 'th', ' ','left', '', 'width="1%"'): '') .
+ "\n",
'', $color[9] ) . "\n";
}
// Separate different backends with <hr />
if($prevbackend > 0) {
echo html_tag( 'tr',
- html_tag( 'td', "<hr />", 'center', '' ,'colspan="5"' )
+ html_tag( 'td', "<hr />", 'center', '' ,"colspan=\"$abook_fields\"" )
);
}
// Print backend name
echo html_tag( 'tr',
- html_tag( 'td', "\n" . '<strong>' . $row['source'] . '</strong>' . "\n", 'center', $color[0] ,'colspan="5"' )
+ html_tag( 'td', "\n" . '<strong>' . $row['source'] . '</strong>' . "\n", 'center', $color[0] ,"colspan=\"$abook_fields\"" )
);
$line = 0;
@@ -309,7 +316,6 @@
} else {
$tr_bgcolor = $color[4];
}
- if ($squirrelmail_language == 'ja_JP') {
echo html_tag( 'tr', '', '', $tr_bgcolor);
if ($abook->backends[$row['backend']]->writeable) {
echo html_tag( 'td',
@@ -322,32 +328,42 @@
' ' ,
'center', '', 'valign="top" width="1%"' );
}
- echo html_tag( 'td', ' ' . $row['nickname'] . ' ', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) .
- html_tag( 'td', ' ' . $row['lastname'] . ' ' . $row['firstname'] . ' ', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) .
- html_tag( 'td', '', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) . ' ';
- } else {
- echo html_tag( 'tr', '', '', $tr_bgcolor);
- if ($abook->backends[$row['backend']]->writeable) {
echo html_tag( 'td',
- '<small>' .
- addCheckBox('sel[]', $selected, $row['backend'] . ':' . $row['nickname']).
- '</small>' ,
- 'center', '', 'valign="top" width="1%"' );
+ ' ' . htmlspecialchars($row['nickname']) . ' ',
+ 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' );
+
+ // different full name display formating for Japanese translation
+ if ($squirrelmail_language == 'ja_JP') {
+ /*
+ * translation uses euc-jp character set internally.
+ * htmlspecialchars() should not break any characters.
+ */
+ echo html_tag( 'td',
+ ' ' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . ' ',
+ 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' );
} else {
echo html_tag( 'td',
- ' ' ,
- 'center', '', 'valign="top" width="1%"' );
- }
- echo html_tag( 'td', ' ' . $row['nickname'] . ' ', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) .
- html_tag( 'td', ' ' . $row['name'] . ' ', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) .
- html_tag( 'td', '', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) . ' ';
+ ' ' . htmlspecialchars($row['name']) . ' ',
+ 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' );
}
+
+ // email address column
+ echo html_tag( 'td', '', 'left', '', 'valign="top" width="1%" style="white-space: nowrap;"' ) . ' ';
$email = $abook->full_address($row);
echo makeComposeLink('src/compose.php?send_to='.rawurlencode($email),
htmlspecialchars($row['email'])).
- ' </td>'."\n".
- html_tag( 'td', ' ' . htmlspecialchars($row['label']) . ' ', 'left', '', 'valign="top" width="1%"' ) .
- "</tr>\n";
+ ' </td>'."\n";
+
+ // info column
+ echo html_tag( 'td', ' ' . htmlspecialchars($row['label']) . ' ', 'left', '', 'valign="top" width="1%"' );
+
+ // add extra column if third party backend needs it
+ if ($abook->add_extra_field) {
+ echo html_tag( 'td',
+ ' ' . (isset($row['extra']) ? $row['extra'] : '') . ' ',
+ 'left', '', 'valign="top" width="1%"' );
+ }
+ echo "</tr>\n";
$line++;
}
echo "</table>" .
@@ -360,7 +376,7 @@
html_tag( 'td',
addSubmit(_("Edit selected"), 'editaddr') .
addSubmit(_("Delete selected"), 'deladdr'),
- 'center', '', 'colspan="5"' )
+ 'center', '', "colspan=\"$abook_fields\"" )
),
'center' );
}
|
