0ct0pu5/squirrelmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Header rearranged

Browse source 
* Toggle all fixed for Konq
* Page selector now allows more customization
* Added default paramenter to get pref
This commit is contained in:
philippe_mingo 2001-10-27 15:34:19 +00:00
parent 8c8c7b1e7d
commit c5eea2115b
5 changed files with 164 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
functions/imap_general.php
View file

@ -11,8 +11,8 @@
return; return;
define ('imap_general_php', true); define ('imap_general_php', true);
global $imap_general_debug; global $imap_general_debug;
$imap_general_debug = false; $imap_general_debug = false;
/****************************************************************************** /******************************************************************************
** Sets an unique session id in order to avoid simultanous sessions crash. ** Sets an unique session id in order to avoid simultanous sessions crash.
@ -31,9 +31,10 @@
function sqimap_read_data_list ($imap_stream, $pre, $handle_errors, function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
&$response, &$message) { &$response, &$message) {
global $color, $squirrelmail_language, $imap_general_debug; global $color, $squirrelmail_language;
global $imap_general_debug;
$read = ""; $read = '';
$resultlist = array(); $resultlist = array();
$more_msgs = true; $more_msgs = true;
@ -48,11 +49,11 @@
$size = $regs[1]; $size = $regs[1];
} else if (ereg("^\\* [0-9]+ FETCH", $read, $regs)) { } else if (ereg("^\\* [0-9]+ FETCH", $read, $regs)) {
// Sizeless response, probably single-line // Sizeless response, probably single-line
// For debugging purposes // For debugging purposes
if ($imap_general_debug) { if ($imap_general_debug) {
echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n"; echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
flush(); flush();
} }
$size = 0; $size = 0;
$data[] = $read; $data[] = $read;
$read = fgets($imap_stream, 9096); $read = fgets($imap_stream, 9096);
@ -63,11 +64,11 @@
while (strpos($read, "\n") === false) { while (strpos($read, "\n") === false) {
$read .= fgets($imap_stream, 9096); $read .= fgets($imap_stream, 9096);
} }
// For debugging purposes // For debugging purposes
if ($imap_general_debug) { if ($imap_general_debug) {
echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n"; echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
flush(); flush();
} }
// If we know the size, no need to look at the end parameters // If we know the size, no need to look at the end parameters
if ($size > 0) { if ($size > 0) {
if ($total_size == $size) { if ($total_size == $size) {
@ -108,7 +109,7 @@
$response = $regs[1]; $response = $regs[1];
$message = trim($regs[2]); $message = trim($regs[2]);
if ($imap_general_debug) echo '--<br>'; if ($imap_general_debug) echo '--<br>';
if ($handle_errors == false) if ($handle_errors == false)
return $resultlist; return $resultlist;
@ -252,7 +253,7 @@
function sqimap_capability($imap_stream, $capability) { function sqimap_capability($imap_stream, $capability) {
global $sqimap_capabilities; global $sqimap_capabilities;
global $imap_general_debug; global $imap_general_debug;
if (!is_array($sqimap_capabilities)) { if (!is_array($sqimap_capabilities)) {
fputs ($imap_stream, sqimap_session_id() . " CAPABILITY\r\n"); fputs ($imap_stream, sqimap_session_id() . " CAPABILITY\r\n");
@ -270,13 +271,13 @@
if (! isset($sqimap_capabilities[$capability])) if (! isset($sqimap_capabilities[$capability]))
return false; return false;
return $sqimap_capabilities[$capability]; return $sqimap_capabilities[$capability];
} }
/****************************************************************************** /******************************************************************************
** Returns the delimeter between mailboxes: INBOX/Test, or INBOX.Test... ** Returns the delimeter between mailboxes: INBOX/Test, or INBOX.Test...
******************************************************************************/ ******************************************************************************/
function sqimap_get_delimiter ($imap_stream = false) { function sqimap_get_delimiter ($imap_stream = false) {
global $imap_general_debug; global $imap_general_debug;
global $sqimap_delimiter; global $sqimap_delimiter;
global $optional_delimiter; global $optional_delimiter;

104
functions/mailbox_display.php
View file

@ -13,6 +13,8 @@
return; return;
define('mailbox_display_php', true); define('mailbox_display_php', true);
define( 'PG_SEL_MAX', 10 ); // Default value for page_selector_max
function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, $where, $what) { function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, $where, $what) {
global $checkall; global $checkall;
global $color, $msgs, $msort; global $color, $msgs, $msort;
@ -269,7 +271,8 @@
$re_abbr = # Add more here! $re_abbr = # Add more here!
'vedr|sv|' . # Danish 'vedr|sv|' . # Danish
're|aw'; # English 're|aw'; # English
if (eregi("^($re_abbr):[ ]*(.*)$", $messages[$j]['SUBJECT-SORT'], $regs))
if (eregi( "^($re_abbr):[ ]*(.*)$", $messages[$j]['SUBJECT-SORT'], $regs))
$messages[$j]['SUBJECT-SORT'] = $regs[2]; $messages[$j]['SUBJECT-SORT'] = $regs[2];
$num = 0; $num = 0;
@ -379,9 +382,9 @@
$Message = ''; $Message = '';
if ($startMessage < $endMessage) { if ($startMessage < $endMessage) {
$Message = _("Viewing messages") ." <B>$startMessage</B> ". _("to") ." <B>$endMessage</B> ($numMessages " . _("total") . ")\n"; $Message = _("Viewing messages") .":<br><B>$startMessage</B> ". _("to") ." <B>$endMessage</B> ($numMessages " . _("total") . ")\n";
} elseif ($startMessage == $endMessage) { } elseif ($startMessage == $endMessage) {
$Message = _("Viewing message") ." <B>$startMessage</B> ($numMessages " . _("total") . ")\n"; $Message = _("Viewing message") .":<br><B>$startMessage</B> ($numMessages " . _("total") . ")\n";
} }
if ($sort == 6) { if ($sort == 6) {
@ -408,25 +411,30 @@
// Page selector block. Following code computes page links. // Page selector block. Following code computes page links.
$mMore = ''; $mMore = '';
if( getPref($data_dir, $username, 'page_selector') && $numMessages > $show_num ) { if( !getPref($data_dir, $username, 'page_selector') &&
$numMessages > $show_num ) {
$j = intval( $numMessages / $show_num ); $j = intval( $numMessages / $show_num ); // Max pages
$k = max( 1, $j / getPref($data_dir, $username, 'page_selector_max', PG_SEL_MAX ) );
if( $numMessages % $show_num <> 0 ) if( $numMessages % $show_num <> 0 )
$j++; $j++;
$startMessage = min( $startMessage, $numMessages ); $startMessage = min( $startMessage, $numMessages );
for( $i = 0; $i < $j; $i++ ) { $p = intval( $startMessage / $show_num ) + 1;
$i = 1;
$start = ( ( $i * $show_num ) + 1 ); while( $i < $p ) {
$pg = intval( $i );
if( $startMessage >= $start && $start = ( ($pg-1) * $show_num ) + 1;
$startMessage < $start + $show_num ) {
$mMore .= '<b>' . ($i+1) . '</b> ';
} else {
$mMore .= "<a href=\"right_main.php?use_mailbox_cache=$use_mailbox_cache&startMessage=$start" . $mMore .= "<a href=\"right_main.php?use_mailbox_cache=$use_mailbox_cache&startMessage=$start" .
"&mailbox=$urlMailbox\" TARGET=\"right\">" . "&mailbox=$urlMailbox\" TARGET=\"right\">$pg</a> ";
($i+1) . $i+=$k;
'</a> ';
} }
$mMore .= "<b>$p</b> ";
$i += $k;
while( $i <= $j ) {
$pg = intval( $i );
$start = ( ($pg-1) * $show_num ) + 1;
$mMore .= "<a href=\"right_main.php?use_mailbox_cache=$use_mailbox_cache&startMessage=$start" .
"&mailbox=$urlMailbox\" TARGET=\"right\">$pg</a> ";
$i+=$k;
} }
$mMore .= ' | '; $mMore .= ' | ';
} }
@ -493,11 +501,12 @@
echo "</td></tr>\n"; echo "</td></tr>\n";
echo "<TR BGCOLOR=\"$color[4]\"><TD>"; echo "<TR BGCOLOR=\"$color[4]\"><TD>";
echo '<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td>'; echo "<table BGCOLOR=\"$color[4]\" ".
echo "$lMore$mMore$rMore</td><td align=right>\n"; 'width="100%" cellpadding="0" cellspacing="2" border="0"><tr><td>';
if (!$startMessage) $startMessage=1; echo "$lMore$mMore$rMore</td><td align=right>";
if (!$startMessage)
$startMessage=1;
ShowSelectAllLink($startMessage, $sort); ShowSelectAllLink($startMessage, $sort);
echo '</td></tr></table></td></tr></table>'; /** End of message-list table */ echo '</td></tr></table></td></tr></table>'; /** End of message-list table */
do_hook('mailbox_index_after'); do_hook('mailbox_index_after');
@ -520,15 +529,8 @@
/** This is the beginning of the message list table. It wraps around all messages */ /** This is the beginning of the message list table. It wraps around all messages */
echo '<TABLE WIDTH="100%" BORDER="0" CELLPADDING="2" CELLSPACING="0">'; echo '<TABLE WIDTH="100%" BORDER="0" CELLPADDING="2" CELLSPACING="0">';
if ($Message) {
echo "<TR BGCOLOR=\"$color[4]\"><TD align=center>$Message</td></tr>\n";
}
echo "<TR BGCOLOR=\"$color[4]\"><TD>"; echo "<TR BGCOLOR=\"$color[4]\"><TD>";
echo '<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td>';
echo "$More</td><td align=right>\n";
ShowSelectAllLink($startMessage, $sort);
echo '</td></tr></table></td></tr>';
/** The delete and move options */ /** The delete and move options */
echo "<TR><TD BGCOLOR=\"$color[0]\">"; echo "<TR><TD BGCOLOR=\"$color[0]\">";
@ -536,18 +538,18 @@
echo "\n<FORM name=messageList method=post action=\"$moveURL\">\n"; echo "\n<FORM name=messageList method=post action=\"$moveURL\">\n";
echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=100%>\n"; echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=100%>\n";
echo " <TR>\n"; echo " <TR>\n" .
echo " <TD WIDTH=60% ALIGN=LEFT VALIGN=CENTER NOWRAP>\n"; " <TD ALIGN=LEFT VALIGN=CENTER NOWRAP>\n" .
echo ' <SMALL>&nbsp;' . _("Move selected to:") . "</SMALL>\n"; ' <SMALL>&nbsp;' . _("Move selected to:") . "</SMALL>\n" .
echo " </TD>\n"; " </TD>\n" .
echo " <TD>&nbsp;</TD>\n"; " <TD rowspan=2><center>$Message</TD>\n" .
echo " <TD WIDTH=\"1%\" ALIGN=RIGHT NOWRAP>\n"; " <TD ALIGN=RIGHT NOWRAP>\n" .
echo ' <SMALL>&nbsp;' . _("Transform Selected Messages") . ": &nbsp; </SMALL><BR>\n"; ' <SMALL>&nbsp;' . _("Transform Selected Messages") . ": &nbsp; </SMALL><BR>\n" .
echo " </TD>\n"; " </TD>\n" .
echo " </TR>\n"; " </TR>\n" .
echo " <TR>\n"; " <TR>\n" .
echo " <TD ALIGN=LEFT VALIGN=CENTER NOWRAP>\n"; " <TD ALIGN=LEFT VALIGN=CENTER NOWRAP>\n" .
echo ' <SMALL>&nbsp;<TT><SELECT NAME="targetMailbox">'; ' <SMALL>&nbsp;<TT><SELECT NAME="targetMailbox">';
$boxes = sqimap_mailbox_list($imapConnection); $boxes = sqimap_mailbox_list($imapConnection);
for ($i = 0; $i < count($boxes); $i++) { for ($i = 0; $i < count($boxes); $i++) {
@ -560,20 +562,28 @@
echo ' </SELECT></TT></SMALL>'; echo ' </SELECT></TT></SMALL>';
echo " <SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"" . _("Move") . "\"></SMALL>\n"; echo " <SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"" . _("Move") . "\"></SMALL>\n";
echo " </TD>\n"; echo " </TD>\n";
echo " <TD>&nbsp;</TD>\n";
echo " <TD ALIGN=RIGHT NOWRAP>&nbsp;&nbsp;&nbsp;\n"; echo " <TD ALIGN=RIGHT NOWRAP>&nbsp;&nbsp;&nbsp;\n";
if (! $auto_expunge) { if (! $auto_expunge) {
echo ' <INPUT TYPE=SUBMIT NAME="expungeButton" VALUE="'. _("Expunge") .'">&nbsp;'. _("mailbox") ."&nbsp;\n"; echo ' <INPUT TYPE=SUBMIT NAME="expungeButton" VALUE="'. _("Expunge") .'">&nbsp;'. _("mailbox") ."&nbsp;\n";
} }
echo " <INPUT TYPE=SUBMIT NAME=\"markRead\" VALUE=\"". _("Read")."\">\n"; echo " <INPUT TYPE=SUBMIT NAME=\"markRead\" VALUE=\"". _("Read")."\">\n";
echo " <INPUT TYPE=SUBMIT NAME=\"markUnread\" VALUE=\"". _("Unread")."\">\n"; echo " <INPUT TYPE=SUBMIT NAME=\"markUnread\" VALUE=\"". _("Unread")."\">\n";
echo " <INPUT TYPE=SUBMIT VALUE=\"". _("Delete") . "\">&nbsp;\n"; echo " <INPUT TYPE=SUBMIT VALUE=\"". _("Delete") . "\">&nbsp;\n";
echo " </TD>\n"; echo " </TD>\n";
echo " </TR>\n"; echo " </TR>\n";
echo "</TABLE>\n"; echo "</TABLE>\n";
do_hook('mailbox_form_before'); do_hook('mailbox_form_before');
echo '</TD></TR>'; echo '</TD></TR>';
echo "<tr bgcolor=\"$color[4]\"><td colspan=3>\n";
echo "<table bgcolor=\"$color[4]\" cellpadding=2".
' width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td>';
echo "$More</td><td align=right>";
ShowSelectAllLink($startMessage, $sort);
echo "</td></tr></table>\n</td></tr>";
echo "<TR><TD BGCOLOR=\"$color[0]\">"; echo "<TR><TD BGCOLOR=\"$color[0]\">";
echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING="; echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=";
if ($GLOBALS['alt_index_colors']) { if ($GLOBALS['alt_index_colors']) {
@ -621,6 +631,8 @@
echo "</TR>\n"; echo "</TR>\n";
} }
/* ----------------------------------------------------------------------- */
function ShowSortButton($sort, $mailbox, $Up, $Down) { function ShowSortButton($sort, $mailbox, $Up, $Down) {
if ($sort != $Up && $sort != $Down) { if ($sort != $Up && $sort != $Down) {
$img = 'sort_none.gif'; $img = 'sort_none.gif';
@ -642,21 +654,19 @@
{ {
global $checkall, $PHP_SELF, $what, $where, $mailbox; global $checkall, $PHP_SELF, $what, $where, $mailbox;
// This code is from Philippe Mingo <mingo@rotedic.com> ?>&nbsp;
?>
<script language="JavaScript"> <script language="JavaScript">
<!-- <!--
function CheckAll() { function CheckAll() {
for (var i = 0; i < document.messageList.elements.length; i++) { for (var i = 0; i < document.messageList.elements.length; i++) {
if( document.messageList.elements[i].name.substr( 0, 3 ) == 'msg') { if( document.messageList.elements[i].type == 'checkbox' ) {
document.messageList.elements[i].checked = document.messageList.elements[i].checked =
!(document.messageList.elements[i].checked); !(document.messageList.elements[i].checked);
} }
} }
} }
window.document.write('<a href="#" onClick="CheckAll();"><?php echo window.document.write('<input type=button onClick="CheckAll();" value="<?php echo
_("Toggle All") ?></A>'); _("Toggle All") ?>">');
//--> //-->
</script><noscript> </script><noscript>
<?PHP <?PHP

5
functions/prefs.php
View file

@ -62,14 +62,15 @@
/** returns the value for $string **/ /** returns the value for $string **/
function getPref($data_dir, $username, $string) { function getPref($data_dir, $username, $string, $default = '') {
global $prefs_cache; global $prefs_cache;
cachePrefValues($data_dir, $username); cachePrefValues($data_dir, $username);
if (isset($prefs_cache[$string])) if (isset($prefs_cache[$string]))
return $prefs_cache[$string]; return $prefs_cache[$string];
return ''; else
return $default;
} }

10
src/options.php
View file

@ -110,10 +110,16 @@
removePref($data_dir, $username, 'include_self_reply_all'); removePref($data_dir, $username, 'include_self_reply_all');
} }
if (isset($pageselector)) { if (isset($pageselectormax)) {
setPref($data_dir, $username, 'page_selector', 1); setPref($data_dir, $username, 'page_selector_max', $pageselectormax);
} else { } else {
removePref($data_dir, $username, 'page_selector_max', 0 );
}
if (isset($pageselector)) {
removePref($data_dir, $username, 'page_selector'); removePref($data_dir, $username, 'page_selector');
} else {
setPref($data_dir, $username, 'page_selector', 1);
} }
do_hook('options_display_save'); do_hook('options_display_save');

21
src/options_display.php
View file

@ -235,7 +235,7 @@ echo _("Yes, show me the HTML version of a mail message, if it is available.");
</td> </td>
</tr> </tr>
<tr> <tr>
<td align=right> <td align=right valign=middle>
<?php echo _("Include Self"); ?>: <?php echo _("Include Self"); ?>:
</td> </td>
<td> <td>
@ -247,14 +247,16 @@ echo _("Yes, show me the HTML version of a mail message, if it is available.");
</td> </td>
</tr> </tr>
<tr> <tr>
<td align=right> <td align=right valign=middle>
<?php echo _("Page Selector"); ?>: <?php
</td> echo _("Page Selector") . ': </td><td>';
<td> echo '<input type=checkbox name=pageselector';
<input type=checkbox name=pageselector <?php if (!getPref($data_dir, $username, 'page_selector') )
if (getPref($data_dir, $username, 'page_selector') != '' ) echo ' checked';
echo " checked"; echo '> ' . _("Show page selector") . ' ';
echo '> ' . _("Show page selector"); $psw = getPref($data_dir, $username, 'page_selector_max', 10 );
echo "<input name=pageselectormax size=3 value=\"$psw\">";
echo ' ' . _("pages max");
?> ?>
</td> </td>
</tr> </tr>
@ -265,6 +267,7 @@ echo _("Yes, show me the HTML version of a mail message, if it is available.");
<input type="submit" value="<?php echo _("Submit"); ?>"name="submit_display"> <input type="submit" value="<?php echo _("Submit"); ?>"name="submit_display">
</td> </td>
</tr> </tr>
</table> </table>
</form> </form>