[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: felamimail README,1.1.1.1,1.2 addressbook.php,1.
|
From: |
Lars Kneschke <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: felamimail README,1.1.1.1,1.2 addressbook.php,1.2,1.3 download.php,1.3,1.4 folders.php,1.3,1.4 folders_create.php,1.3,1.4 folders_delete.php,1.3,1.4 folders_rename_do.php,1.3,1.4 folders_rename_getname.php,1.3,1.4 folders_subscribe.php,1.3,1.4 index.php,1.3,1.4 preferences_display.php,1.3,1.4 preferences_email.php,1.3,1.4 preferences_folder.php,1.3,1.4 preferences_highlight.php,1.3,1.4 preferences_index_order.php,1.3,1.4 preferences_translate.php,1.3,1.4 read_body.php,1.4,1.5 |
|
Date: |
Sat, 23 Nov 2002 19:32:16 -0500 |
Update of /cvsroot/phpgroupware/felamimail
In directory subversions:/tmp/cvs-serv28374
Modified Files:
README addressbook.php download.php folders.php
folders_create.php folders_delete.php folders_rename_do.php
folders_rename_getname.php folders_subscribe.php index.php
preferences_display.php preferences_email.php
preferences_folder.php preferences_highlight.php
preferences_index_order.php preferences_translate.php
read_body.php
Log Message:
updated head to my current devel version
Index: README
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** README 31 Dec 2001 00:59:03 -0000 1.1.1.1
--- README 24 Nov 2002 00:32:13 -0000 1.2
***************
*** 1,55 ****
! SquirrelMail
! http://www.felamimail.org
! Introduction:
! -------------
! SquirrelMail is a standards-based webmail package written in PHP4. It
! includes built-in pure PHP support for the IMAP and SMTP protocols, and all
! pages render in pure HTML 4.0 (with no Javascript) for maximum compatibility
! across browsers. It has very few requirements and is very easy to configure
! and install. SquirrelMail has a all the functionality you would want from an
! email client, including strong MIME support, address books, and folder
! manipulation.
!
! Why did you guys create SquirrelMail? The need arose in our organization
! for the access of email and address books from anywhere in the world.
! Obviously a web interface is ideal for this, given that the user has access
! to the Internet. After reviewing several open source projects, we realized
! that we were going to need to do some fairly major customizations to get
! things to be a nice fit for our needs. So the decision was made to create
! our own for some of these reasons, and for fun (we really like PHP4). We
! decided to open source the project to contribute to the community that has
! contributed so much to us. Since then, it has grown much bigger than we
! ever imagined, and we have an awesome development team who are actively
! working on the project.
!
! We would love to hear from you! The nature of open source projects make it
! hard to know who all is using your product. It is always nice when we get
! emails from people just telling us that they're using SquirrelMail. If you
! have a few minutes, please send us an email to let us know! You can send it
! to our mailing list: address@hidden
!
! You can also go to the page below and fill out a small form to get listed
! with the list of people already using SquirrelMail (free advertising).
!
! http://www.felamimail.org/index.php3?page=16
!
! Contact:
! --------
! It is pretty easy to get in contact with the developers if you need help or
! if you find bugs that need to be reported. The best way to contact us would
! be through our mailing list which is actively monitored. Just send an email
! to:
!
! address@hidden
!
! If you wish to actually subscribe to our mailing list, please visit our web
! page for instructions (http://www.felamimail.org) and go to the section
! titled "Mailing List".
!
! Installation:
! -------------
! For detailed instructions on how to install SquirrelMail on your server,
! please refer to the INSTALL document in the same directory as this document.
Licensing:
--- 1,9 ----
! FeLaMiMail
! http://www.phpgw.de
! Author:
! ------
! Lars Kneschke
! address@hidden
Licensing:
Index: addressbook.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/addressbook.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Index: download.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/download.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** download.php 27 Mar 2002 22:06:44 -0000 1.3
--- download.php 24 Nov 2002 00:32:13 -0000 1.4
***************
*** 11,19 ****
** $Id$
**/
! header("Pragma: ");
! header("Cache-Control: cache");
// store the value of $mailbox, because it will overwriten
- $MAILBOX = $mailbox;
$phpgw_info["flags"] = array(
'noheader' => 'True',
--- 11,18 ----
** $Id$
**/
! # header("Pragma: ");
! # header("Cache-Control: cache");
// store the value of $mailbox, because it will overwriten
$phpgw_info["flags"] = array(
'noheader' => 'True',
***************
*** 22,26 ****
);
include("../header.inc.php");
! $mailbox = $MAILBOX;
$phpgw->session->restore();
--- 21,27 ----
);
include("../header.inc.php");
! $mailbox = $GLOBALS['HTTP_GET_VARS']['mailbox'];
! $passed_id = $GLOBALS['HTTP_GET_VARS']['passed_id'];
! $passed_ent_id = $GLOBALS['HTTP_GET_VARS']['passed_ent_id'];
$phpgw->session->restore();
***************
*** 160,165 ****
$body = mime_fetch_body($imapConnection, $passed_id,
$passed_ent_id);
$body = decodeBody($body, $header->encoding);
! header("Content-type: $type0/$type1; name=\"$filename\"");
! header("Content-Disposition: attachment;
filename=\"$filename\"");
echo $body;
}
--- 161,166 ----
$body = mime_fetch_body($imapConnection, $passed_id,
$passed_ent_id);
$body = decodeBody($body, $header->encoding);
! header("Content-Type: $type0/$type1");
! header("Content-Disposition: filename=\"$filename\"");
echo $body;
}
***************
*** 174,180 ****
break;
default:
! header("Content-type: $type0/$type1; name=\"$filename\"");
! header("Content-Disposition: attachment; filename=\"$filename\"");
! mime_print_body_lines ($imapConnection, $passed_id,
$passed_ent_id, $header->encoding);
break;
}
--- 175,181 ----
break;
default:
! header("Content-Type: $type0/$type1");
! header("Content-Disposition: filename=\"$filename\"");
! mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id,
$header->encoding);
break;
}
Index: folders.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/folders.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: folders_create.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/folders_create.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: folders_delete.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/folders_delete.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: folders_rename_do.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/folders_rename_do.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: folders_rename_getname.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/folders_rename_getname.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: folders_subscribe.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/folders_subscribe.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: preferences_display.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/preferences_display.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: preferences_email.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/preferences_email.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** preferences_email.php 27 Mar 2002 22:06:44 -0000 1.3
--- preferences_email.php 24 Nov 2002 00:32:13 -0000 1.4
***************
*** 12,16 ****
/* $Id$ */
! $phpgw_info["flags"] = array(
'currentapp' => 'felamimail',
'noheader' => True,
--- 12,16 ----
/* $Id$ */
! $GLOBALS['phpgw_info']["flags"] = array(
'currentapp' => 'felamimail',
'noheader' => True,
***************
*** 21,37 ****
// ---- Save Preferences to Repository (if this is a submit) -----
! if ($submit)
{
! $phpgw->preferences->read_repository();
// ---- Typical (Non-Custom) Preferences -----
! $phpgw->preferences->delete("felamimail","mainscreen_showmail");
! if ($mainscreen_showmail)
{
!
$phpgw->preferences->add("felamimail","mainscreen_showmail");
}
! $phpgw->preferences->add("email","default_sorting");
/* email sig must not have ' nor " in it, as they screw up
the preferences in class session
--- 21,54 ----
// ---- Save Preferences to Repository (if this is a submit) -----
! if ($GLOBALS['HTTP_POST_VARS']['submit'])
{
! if($GLOBALS['HTTP_POST_VARS']['use_custom_settings'])
! $use_custom_settings =
$GLOBALS['HTTP_POST_VARS']['use_custom_settings'];
! if($GLOBALS['HTTP_POST_VARS']['userid'])
! $userid =
$GLOBALS['HTTP_POST_VARS']['userid'];
! if($GLOBALS['HTTP_POST_VARS']['passwd'])
! $passwd =
$GLOBALS['HTTP_POST_VARS']['passwd'];
! if($GLOBALS['HTTP_POST_VARS']['address'])
! $address =
$GLOBALS['HTTP_POST_VARS']['address'];
! if($GLOBALS['HTTP_POST_VARS']['mail_server'])
! $mail_server =
$GLOBALS['HTTP_POST_VARS']['mail_server'];
! if($GLOBALS['HTTP_POST_VARS']['mail_server_type'])
! $mail_server_type =
$GLOBALS['HTTP_POST_VARS']['mail_server_type'];
! if($GLOBALS['HTTP_POST_VARS']['imap_server_type'])
! $imap_server_type =
$GLOBALS['HTTP_POST_VARS']['imap_server_type'];
! if($GLOBALS['HTTP_POST_VARS']['mail_folder'])
! $mail_folder =
$GLOBALS['HTTP_POST_VARS']['mail_folder'];
!
! $GLOBALS['phpgw']->preferences->read_repository();
// ---- Typical (Non-Custom) Preferences -----
!
$GLOBALS['phpgw']->preferences->delete("felamimail","mainscreen_showmail");
! if ($GLOBALS['HTTP_POST_VARS']['mainscreen_showmail'])
{
!
$GLOBALS['phpgw']->preferences->add("felamimail","mainscreen_showmail");
}
! $GLOBALS['phpgw']->preferences->add("email","default_sorting");
/* email sig must not have ' nor " in it, as they screw up
the preferences in class session
***************
*** 48,83 ****
/*// replace ' and " with htmlspecialchars */
$email_sig_clean =
$GLOBALS['phpgw']->msg->html_quotes_encode($email_sig_clean);
!
$phpgw->preferences->add("email","email_sig",$email_sig_clean);
}
else
{
// have it set, but be empty
! $phpgw->preferences->add("email","email_sig");
}
// ---- Custom Preferences -----
// differ from account defaults set by administrator, should be
unset if not using custom prefs
! $phpgw->preferences->delete("email","use_custom_settings");
if (! $use_custom_settings)
{
! $phpgw->preferences->delete("email","userid");
! $phpgw->preferences->delete("email","passwd");
! $phpgw->preferences->delete("email","address");
! $phpgw->preferences->delete("email","mail_server");
! $phpgw->preferences->delete("email","mail_server_type");
! $phpgw->preferences->delete("email","imap_server_type");
! $phpgw->preferences->delete("email","mail_folder");
}
else
{
! $phpgw->preferences->add("email","use_custom_settings");
if ($userid)
{
! $phpgw->preferences->add("email","userid");
}
else
{
// should probably be an error message here
! $phpgw->preferences->delete("email","userid");
}
if ($passwd)
--- 65,100 ----
/*// replace ' and " with htmlspecialchars */
$email_sig_clean =
$GLOBALS['phpgw']->msg->html_quotes_encode($email_sig_clean);
!
$GLOBALS['phpgw']->preferences->add("email","email_sig",$email_sig_clean);
}
else
{
// have it set, but be empty
!
$GLOBALS['phpgw']->preferences->add("email","email_sig");
}
// ---- Custom Preferences -----
// differ from account defaults set by administrator, should be
unset if not using custom prefs
!
$GLOBALS['phpgw']->preferences->delete("email","use_custom_settings");
if (! $use_custom_settings)
{
!
$GLOBALS['phpgw']->preferences->delete("email","userid");
!
$GLOBALS['phpgw']->preferences->delete("email","passwd");
!
$GLOBALS['phpgw']->preferences->delete("email","address");
!
$GLOBALS['phpgw']->preferences->delete("email","mail_server");
!
$GLOBALS['phpgw']->preferences->delete("email","mail_server_type");
!
$GLOBALS['phpgw']->preferences->delete("email","imap_server_type");
!
$GLOBALS['phpgw']->preferences->delete("email","mail_folder");
}
else
{
!
$GLOBALS['phpgw']->preferences->add("email","use_custom_settings");
if ($userid)
{
!
$GLOBALS['phpgw']->preferences->add("email","userid");
}
else
{
// should probably be an error message here
!
$GLOBALS['phpgw']->preferences->delete("email","userid");
}
if ($passwd)
***************
*** 86,94 ****
// there were multiple problems with previous
custom email passwd handling
//echo 'in pref page b4 strip: '.$passwd.'<br>';
! $encrypted_passwd =
$phpgw->msg->stripslashes_gpc($passwd);
//echo 'in pref page after strip:
'.$encrypted_passwd.'<br>';
! $encrypted_passwd =
$phpgw->msg->encrypt_email_passwd($encrypted_passwd);
//echo 'encrypted_passwd:
'.$encrypted_passwd.'<br>';
!
$phpgw->preferences->add("email","passwd",$encrypted_passwd);
//$test_str = 'a test string';
//echo 'test_str before base64 decode:
'.$test_str.'<br>';
--- 103,111 ----
// there were multiple problems with previous
custom email passwd handling
//echo 'in pref page b4 strip: '.$passwd.'<br>';
! $encrypted_passwd =
$GLOBALS['phpgw']->msg->stripslashes_gpc($passwd);
//echo 'in pref page after strip:
'.$encrypted_passwd.'<br>';
! $encrypted_passwd =
$GLOBALS['phpgw']->msg->encrypt_email_passwd($encrypted_passwd);
//echo 'encrypted_passwd:
'.$encrypted_passwd.'<br>';
!
$GLOBALS['phpgw']->preferences->add("email","passwd",$encrypted_passwd);
//$test_str = 'a test string';
//echo 'test_str before base64 decode:
'.$test_str.'<br>';
***************
*** 99,105 ****
// BUT CURRENT CODE IS BROKEN - waiting for api
change to implement the above fix
// get rid of the escape \ that magic_quotes
HTTP POST will add, " becomes \" and ' becomes \'
! $encrypted_passwd =
$phpgw->msg->stripslashes_gpc($passwd);
! $encrypted_passwd =
$phpgw->common->encrypt($encrypted_passwd);
!
$phpgw->preferences->add("email","passwd",$encrypted_passwd); */
}
else
--- 116,122 ----
// BUT CURRENT CODE IS BROKEN - waiting for api
change to implement the above fix
// get rid of the escape \ that magic_quotes
HTTP POST will add, " becomes \" and ' becomes \'
! $encrypted_passwd =
$GLOBALS['phpgw']->msg->stripslashes_gpc($passwd);
! $encrypted_passwd =
$GLOBALS['phpgw']->common->encrypt($encrypted_passwd);
!
$GLOBALS['phpgw']->preferences->add("email","passwd",$encrypted_passwd); */
}
else
***************
*** 109,140 ****
if ($address)
{
! $phpgw->preferences->add("email","address");
}
else
{
// should probably be an error message here
! $phpgw->preferences->delete("email","address");
}
if ($mail_server)
{
! $phpgw->preferences->add("email","mail_server");
}
else
{
// should probably be an error message here
!
$phpgw->preferences->delete("email","mail_server");
}
if ($mail_server_type)
{
!
$phpgw->preferences->add("email","mail_server_type");
}
else
{
// should probably be an error message here
!
$phpgw->preferences->delete("email","mail_server_type");
}
if ($imap_server_type)
{
!
$phpgw->preferences->add("email","imap_server_type");
}
else
--- 126,157 ----
if ($address)
{
!
$GLOBALS['phpgw']->preferences->add("email","address");
}
else
{
// should probably be an error message here
!
$GLOBALS['phpgw']->preferences->delete("email","address");
}
if ($mail_server)
{
!
$GLOBALS['phpgw']->preferences->add("email","mail_server");
}
else
{
// should probably be an error message here
!
$GLOBALS['phpgw']->preferences->delete("email","mail_server");
}
if ($mail_server_type)
{
!
$GLOBALS['phpgw']->preferences->add("email","mail_server_type");
}
else
{
// should probably be an error message here
!
$GLOBALS['phpgw']->preferences->delete("email","mail_server_type");
}
if ($imap_server_type)
{
!
$GLOBALS['phpgw']->preferences->add("email","imap_server_type");
}
else
***************
*** 142,150 ****
// if ( (mail_server_type=='imap') ||
(mail_server_type=='imaps') ) then
// should probably be an error message here
!
$phpgw->preferences->delete("email","imap_server_type");
}
if ($mail_folder)
{
! $phpgw->preferences->add("email","mail_folder");
}
else
--- 159,167 ----
// if ( (mail_server_type=='imap') ||
(mail_server_type=='imaps') ) then
// should probably be an error message here
!
$GLOBALS['phpgw']->preferences->delete("email","imap_server_type");
}
if ($mail_folder)
{
!
$GLOBALS['phpgw']->preferences->add("email","mail_folder");
}
else
***************
*** 152,166 ****
// if (imap_server_type=='UW-Maildir') then
// should probably be an error message here
!
$phpgw->preferences->delete("email","mail_folder");
}
}
! $phpgw->preferences->save_repository();
! Header("Location: " . $phpgw->link("/preferences/index.php"));
}
// ---- Show The Preferences Page -----
! $phpgw->common->phpgw_header();
echo parse_navbar();
--- 169,183 ----
// if (imap_server_type=='UW-Maildir') then
// should probably be an error message here
!
$GLOBALS['phpgw']->preferences->delete("email","mail_folder");
}
}
! $GLOBALS['phpgw']->preferences->save_repository();
! Header("Location: " .
$GLOBALS['phpgw']->link("/preferences/index.php"));
}
// ---- Show The Preferences Page -----
! $GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 172,177 ****
if ($totalerrors)
{
! //echo "<p><center>" . $phpgw->common->error_list($errors) .
"</center>";
! $pref_errors = '<p><center>"'
.$phpgw->common->error_list($errors) .'"</center></p>';
}
else
--- 189,194 ----
if ($totalerrors)
{
! //echo "<p><center>" .
$GLOBALS['phpgw']->common->error_list($errors) . "</center>";
! $pref_errors = '<p><center>"'
.$GLOBALS['phpgw']->common->error_list($errors) .'"</center></p>';
}
else
***************
*** 184,204 ****
// setup the form
!
$t->set_var('form_action',$phpgw->link('/felamimail/preferences_email.php'));
// the "table header" row color
! $t->set_var('th_bg',$phpgw_info["theme"]["th_bg"]);
// ---- Typical (Non-Custom) Settings - Fill in HTML form -----
// row1 = Email Sig
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row1',$tr_color);
$t->set_var('email_sig_blurb',lang("email signature"));
$t->set_var('email_sig_textarea_name','email_sig');
!
//$t->set_var('email_sig_textarea_content',rawurldecode($phpgw_info["user"]["preferences"]["email"]["email_sig"]));
!
$t->set_var('email_sig_textarea_content',$phpgw_info["user"]["preferences"]["email"]["email_sig"]);
// row2 = Sort Order
// old_new means "lowest to highest", and new_old means "highest to
lowest", which is imap-speak for reverse sorting
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
!
$default_order_selected[$phpgw_info["user"]["preferences"]["email"]["default_sorting"]]
= " selected";
$sorting_select_options =
'<option value="old_new"' .$default_order_selected["old_new"]
.'>oldest -> newest</option>' ."\n"
--- 201,221 ----
// setup the form
!
$t->set_var('form_action',$GLOBALS['phpgw']->link('/felamimail/preferences_email.php'));
// the "table header" row color
! $t->set_var('th_bg',$GLOBALS['phpgw_info']["theme"]["th_bg"]);
// ---- Typical (Non-Custom) Settings - Fill in HTML form -----
// row1 = Email Sig
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row1',$tr_color);
$t->set_var('email_sig_blurb',lang("email signature"));
$t->set_var('email_sig_textarea_name','email_sig');
!
//$t->set_var('email_sig_textarea_content',rawurldecode($GLOBALS['phpgw_info']["user"]["preferences"]["email"]["email_sig"]));
!
$t->set_var('email_sig_textarea_content',$GLOBALS['phpgw_info']["user"]["preferences"]["email"]["email_sig"]);
// row2 = Sort Order
// old_new means "lowest to highest", and new_old means "highest to
lowest", which is imap-speak for reverse sorting
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
!
$default_order_selected[$GLOBALS['phpgw_info']["user"]["preferences"]["email"]["default_sorting"]]
= " selected";
$sorting_select_options =
'<option value="old_new"' .$default_order_selected["old_new"]
.'>oldest -> newest</option>' ."\n"
***************
*** 210,215 ****
// row3 = show sender's email address with name options
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
!
$show_addresses_selected[$phpgw_info["user"]["preferences"]["email"]["show_addresses"]]
= " selected";
$show_addresses_select_options =
'<option value="none"' .$show_addresses_selected["none"] .'>'
.lang('none') .'</option>' ."\n"
--- 227,232 ----
// row3 = show sender's email address with name options
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
!
$show_addresses_selected[$GLOBALS['phpgw_info']["user"]["preferences"]["email"]["show_addresses"]]
= " selected";
$show_addresses_select_options =
'<option value="none"' .$show_addresses_selected["none"] .'>'
.lang('none') .'</option>' ."\n"
***************
*** 222,227 ****
// row4 = show new messages on main screen
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
! if
($phpgw_info["user"]["preferences"]["felamimail"]["mainscreen_showmail"])
{
$mainscreen_showmail_checked = 'checked';
--- 239,244 ----
// row4 = show new messages on main screen
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! if
($GLOBALS['phpgw_info']["user"]["preferences"]["felamimail"]["mainscreen_showmail"])
{
$mainscreen_showmail_checked = 'checked';
***************
*** 238,243 ****
// row5 = Send deleted messages to the trash
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
! if ($phpgw_info["user"]["preferences"]["email"]["use_trash_folder"])
{
$use_trash_folder_checked = 'checked';
--- 255,260 ----
// row5 = Send deleted messages to the trash
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! if
($GLOBALS['phpgw_info']["user"]["preferences"]["email"]["use_trash_folder"])
{
$use_trash_folder_checked = 'checked';
***************
*** 258,263 ****
// ---- Custom Settings - Fill in HTML form -----
// row6 = use custon settings
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
! if ($phpgw_info["user"]["preferences"]["email"]["use_custom_settings"])
{
$use_custom_settings_checked = 'checked';
--- 275,280 ----
// ---- Custom Settings - Fill in HTML form -----
// row6 = use custon settings
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! if
($GLOBALS['phpgw_info']["user"]["preferences"]["email"]["use_custom_settings"])
{
$use_custom_settings_checked = 'checked';
***************
*** 274,285 ****
// row7 = Email Account Name
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row7',$tr_color);
$t->set_var('userid_blurb',lang("Email Account Name"));
$t->set_var('userid_text_name','userid');
!
$t->set_var('userid_text_value',$phpgw_info["user"]["preferences"]["email"]["userid"]);
// row8 = Email Password
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row8',$tr_color);
$t->set_var('passwd_blurb',lang("Email Password"));
--- 291,302 ----
// row7 = Email Account Name
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row7',$tr_color);
$t->set_var('userid_blurb',lang("Email Account Name"));
$t->set_var('userid_text_name','userid');
!
$t->set_var('userid_text_value',$GLOBALS['phpgw_info']["user"]["preferences"]["email"]["userid"]);
// row8 = Email Password
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row8',$tr_color);
$t->set_var('passwd_blurb',lang("Email Password"));
***************
*** 289,313 ****
// row9 = Email Address
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row9',$tr_color);
$t->set_var('address_blurb',lang("Email address"));
$t->set_var('address_text_name','address');
!
$t->set_var('address_text_value',$phpgw_info["user"]["preferences"]["email"]["address"]);
// row10 = Mail Server
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row10',$tr_color);
$t->set_var('mail_server_blurb',lang("Mail Server"));
$t->set_var('mail_server_text_name','mail_server');
!
$t->set_var('mail_server_text_value',$phpgw_info["user"]["preferences"]["email"]["mail_server"]);
// row11 = Mail Server type
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
!
$mail_server_type_selected[$phpgw_info["user"]["preferences"]["email"]["mail_server_type"]]
= " selected";
$mail_server_type_select_options =
'<option value="imap"' .$mail_server_type_selected["imap"]
.'>IMAP</option>' ."\n"
! .'<option value="pop3"' .$mail_server_type_selected["pop3"]
.'>POP-3</option>' ."\n"
! .'<option value="imaps"' .$mail_server_type_selected["imaps"]
.'>IMAPS</option>' ."\n"
! .'<option value="pop3s"' .$mail_server_type_selected["pop3s"]
.'>POP-3S</option>' ."\n";
$t->set_var('bg_row11',$tr_color);
$t->set_var('mail_server_type_blurb',lang("Mail Server type"));
--- 306,329 ----
// row9 = Email Address
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row9',$tr_color);
$t->set_var('address_blurb',lang("Email address"));
$t->set_var('address_text_name','address');
!
$t->set_var('address_text_value',$GLOBALS['phpgw_info']["user"]["preferences"]["email"]["address"]);
// row10 = Mail Server
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row10',$tr_color);
$t->set_var('mail_server_blurb',lang("Mail Server"));
$t->set_var('mail_server_text_name','mail_server');
!
$t->set_var('mail_server_text_value',$GLOBALS['phpgw_info']["user"]["preferences"]["email"]["mail_server"]);
// row11 = Mail Server type
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
!
$mail_server_type_selected[$GLOBALS['phpgw_info']["user"]["preferences"]["email"]["mail_server_type"]]
= " selected";
$mail_server_type_select_options =
'<option value="imap"' .$mail_server_type_selected["imap"]
.'>IMAP</option>' ."\n"
! .'<option value="imaps-encr-only"'
.$mail_server_type_selected["imaps-encr-only"] .'>IMAPS Encryption
only</option>' ."\n"
! .'<option value="imaps-encr-auth"'
.$mail_server_type_selected["imaps-encr-auth"] .'>IMAPS
Authentication</option>' ."\n";
$t->set_var('bg_row11',$tr_color);
$t->set_var('mail_server_type_blurb',lang("Mail Server type"));
***************
*** 316,321 ****
// row12 = IMAP Server Type
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
!
$imap_server_type_selected[$phpgw_info["user"]["preferences"]["email"]["imap_server_type"]]
= " selected";
$imap_server_type_select_options =
'<option value="Cyrus"' .$imap_server_type_selected["Cyrus"]
.'>Cyrus or Courier</option>' ."\n"
--- 332,337 ----
// row12 = IMAP Server Type
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
!
$imap_server_type_selected[$GLOBALS['phpgw_info']["user"]["preferences"]["email"]["imap_server_type"]]
= " selected";
$imap_server_type_select_options =
'<option value="Cyrus"' .$imap_server_type_selected["Cyrus"]
.'>Cyrus or Courier</option>' ."\n"
***************
*** 328,336 ****
// row13 = Mail Folder(UW-Maildir)
! $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row13',$tr_color);
$t->set_var('mail_folder_blurb',lang("Mail Folder(UW-Maildir)"));
$t->set_var('mail_folder_text_name','mail_folder');
!
$t->set_var('mail_folder_text_value',$phpgw_info["user"]["preferences"]["email"]["mail_folder"]);
// the submit button for the form
--- 344,352 ----
// row13 = Mail Folder(UW-Maildir)
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$t->set_var('bg_row13',$tr_color);
$t->set_var('mail_folder_blurb',lang("Mail Folder(UW-Maildir)"));
$t->set_var('mail_folder_text_name','mail_folder');
!
$t->set_var('mail_folder_text_value',$GLOBALS['phpgw_info']["user"]["preferences"]["email"]["mail_folder"]);
// the submit button for the form
***************
*** 340,343 ****
$t->pparse('out','T_preferences_out');
! $phpgw->common->phpgw_footer();
?>
--- 356,359 ----
$t->pparse('out','T_preferences_out');
! $GLOBALS['phpgw']->common->phpgw_footer();
?>
Index: preferences_folder.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/preferences_folder.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: preferences_highlight.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/preferences_highlight.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: preferences_index_order.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/preferences_index_order.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: preferences_translate.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/preferences_translate.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Index: read_body.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/read_body.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** read_body.php 27 Mar 2002 22:06:44 -0000 1.4
--- read_body.php 24 Nov 2002 00:32:13 -0000 1.5
***************
*** 15,22 ****
// store the value of $mailbox, because it will overwriten
- $MAILBOX = $mailbox;
$phpgw_info['flags'] = array('currentapp' => 'felamimail');
include('../header.inc.php');
! $mailbox = $MAILBOX;
$phpgw->session->restore();
--- 15,25 ----
// store the value of $mailbox, because it will overwriten
$phpgw_info['flags'] = array('currentapp' => 'felamimail');
include('../header.inc.php');
! $mailbox = $GLOBALS['HTTP_GET_VARS']['mailbox'];
! $passed_id = $GLOBALS['HTTP_GET_VARS']['passed_id'];
! $uid = $GLOBALS['HTTP_GET_VARS']['uid'];
! $show_more = $GLOBALS['HTTP_GET_VARS']['show_more'];
! $view_hdr = $GLOBALS['HTTP_GET_VARS']['view_hdr'];
$phpgw->session->restore();
***************
*** 63,142 ****
{
global $phpgw, $phpgw_info, $PHP_SELF, $QUERY_STRING;
!
! // if last char == , => remove it
! if (strrpos ($_addressString, ",")+1 == strlen($_addressString))
! {
! $_addressString = substr($_addressString,0,
strlen($_addressString)-1);
! }
!
! #print "$_addressString<br>";
!
! // "Lars Kneschke" <address@hidden>
! if (preg_match("/^\"(.*)\".*<(.*)>/i",$_addressString ,
$matches))
! {
! $linkData = array
! (
! 'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($matches[2]),
! 'name' => urlencode($matches[1]),
! 'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
! );
! $link = $phpgw->link('/index.php',$linkData);
! $image = '<img src="'.PHPGW_IMAGES.
! '/sm_envelope.gif" width="10"
height="8"
! alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
! return sprintf(' <a href="%s">%s</a>',
! $link, $image);
! }
! // Lars Kneschke <address@hidden>
! elseif (preg_match("/^(.*).*<(.*)>/i",$_addressString ,
$matches))
{
! $linkData = array
! (
! 'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($matches[2]),
! 'name' => urlencode($matches[1]),
! 'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
! );
! $link = $phpgw->link('/index.php',$linkData);
! $image = '<img src="'.PHPGW_IMAGES.
! '/sm_envelope.gif" width="10"
height="8"
! alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
! return sprintf(' <a href="%s">%s</a>',
! $link, $image);
}
! // address@hidden (Lars Kneschke)
! elseif
(preg_match("/^(address@hidden).*\((.*)\)/i",$_addressString , $matches))
{
$linkData = array
(
'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($matches[2]),
! 'name' => urlencode($matches[1]),
'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
);
- $link = $phpgw->link('/index.php',$linkData);
- $image = '<img src="'.PHPGW_IMAGES.
- '/sm_envelope.gif" width="10"
height="8"
- alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
- return sprintf(' <a href="%s">%s</a>',
- $link, $image);
}
! // address@hidden
! elseif (preg_match("/^(address@hidden)/i",$_addressString ,
$matches))
{
$linkData = array
(
'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($matches[1]),
'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
);
- $link = $phpgw->link('/index.php',$linkData);
- $image = '<img src="'.PHPGW_IMAGES.
- '/sm_envelope.gif" width="10"
height="8"
- alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
- return sprintf(' <a href="%s">%s</a>',
- $link, $image);
}
}
--- 66,103 ----
{
global $phpgw, $phpgw_info, $PHP_SELF, $QUERY_STRING;
!
! $addressParts = imap_rfc822_parse_adrlist($_addressString,'');
! if(count($addressParts)<1)
{
! return false;
}
!
! $email = $addressParts[0]->mailbox.'@'.$addressParts[0]->host;
! $name = $addressParts[0]->personal;
!
! if(!empty($name))
{
$linkData = array
(
'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($email),
! 'name' => urlencode($name),
'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
);
}
! else
{
$linkData = array
(
'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($email),
'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
);
}
+ $link = $phpgw->link('/index.php',$linkData);
+ $image = '<img src="'.PHPGW_IMAGES.
+ '/sm_envelope.gif" width="10" height="8"
+ alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
+ return sprintf(' <a href="%s">%s</a>', $link, $image);
}
***************
*** 449,456 ****
(
'menuaction' =>
'felamimail.uifelamimail.deleteMessage',
! 'mailbox' => $urlMailbox,
! 'message' => $_uid,
! 'sort' => $_sort,
! 'startMessage' => $_startMessage
);
--- 410,414 ----
(
'menuaction' =>
'felamimail.uifelamimail.deleteMessage',
! 'message' => $_uid
);
***************
*** 507,512 ****
$linkData = array
(
! 'menuaction' => 'felamimail.uicompose.compose',
! 'mailbox' => $urlMailbox
);
$t->set_var('link_compose',$GLOBALS['phpgw']->link('/index.php',$linkData));
--- 465,469 ----
$linkData = array
(
! 'menuaction' => 'felamimail.uicompose.compose'
);
$t->set_var('link_compose',$GLOBALS['phpgw']->link('/index.php',$linkData));
***************
*** 514,521 ****
$linkData = array
(
! 'menuaction' =>
'felamimail.uifelamimail.viewMainScreen',
! 'mailbox' => $urlMailbox,
! 'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
! 'sort' => $GLOBALS['HTTP_GET_VARS']['sort']
);
$t->set_var("link_message_list",$GLOBALS['phpgw']->link('/index.php',$linkData));
--- 471,475 ----
$linkData = array
(
! 'menuaction' =>
'felamimail.uifelamimail.viewMainScreen'
);
$t->set_var("link_message_list",$GLOBALS['phpgw']->link('/index.php',$linkData));
***************
*** 524,531 ****
(
'menuaction' => 'felamimail.uicompose.reply',
! 'mailbox' => $urlMailbox,
! 'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
! 'sort' => $GLOBALS['HTTP_GET_VARS']['sort'],
! 'reply_id' => $passed_id
);
$t->set_var("link_reply",$GLOBALS['phpgw']->link('/index.php',$linkData));
--- 478,482 ----
(
'menuaction' => 'felamimail.uicompose.reply',
! 'reply_id' => $GLOBALS['HTTP_GET_VARS']['uid']
);
$t->set_var("link_reply",$GLOBALS['phpgw']->link('/index.php',$linkData));
***************
*** 534,541 ****
(
'menuaction' => 'felamimail.uicompose.replyAll',
! 'mailbox' => $urlMailbox,
! 'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
! 'sort' => $GLOBALS['HTTP_GET_VARS']['sort'],
! 'reply_id' => $passed_id
);
$t->set_var("link_reply_all",$GLOBALS['phpgw']->link('/index.php',$linkData));
--- 485,489 ----
(
'menuaction' => 'felamimail.uicompose.replyAll',
! 'reply_id' => $GLOBALS['HTTP_GET_VARS']['uid']
);
$t->set_var("link_reply_all",$GLOBALS['phpgw']->link('/index.php',$linkData));
***************
*** 544,551 ****
(
'menuaction' => 'felamimail.uicompose.forward',
! 'mailbox' => $urlMailbox,
! 'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
! 'sort' => $GLOBALS['HTTP_GET_VARS']['sort'],
! 'reply_id' => $passed_id
);
$t->set_var("link_forward",$GLOBALS['phpgw']->link('/index.php',$linkData));
--- 492,496 ----
(
'menuaction' => 'felamimail.uicompose.forward',
! 'reply_id' => $GLOBALS['HTTP_GET_VARS']['uid']
);
$t->set_var("link_forward",$GLOBALS['phpgw']->link('/index.php',$linkData));
***************
*** 575,579 ****
// here we go!
-
$imapConnection = sqimap_login($username, $key, $imapServerAddress,
$imapPort, 0);
--- 520,523 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: felamimail README,1.1.1.1,1.2 addressbook.php,1.2,1.3 download.php,1.3,1.4 folders.php,1.3,1.4 folders_create.php,1.3,1.4 folders_delete.php,1.3,1.4 folders_rename_do.php,1.3,1.4 folders_rename_getname.php,1.3,1.4 folders_subscribe.php,1.3,1.4 index.php,1.3,1.4 preferences_display.php,1.3,1.4 preferences_email.php,1.3,1.4 preferences_folder.php,1.3,1.4 preferences_highlight.php,1.3,1.4 preferences_index_order.php,1.3,1.4 preferences_translate.php,1.3,1.4 read_body.php,1.4,1.5,
Lars Kneschke <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: felamimail/setup phpgw_de.lang,1.1.1.1,1.2 phpgw_en.lang,1.2,1.3 tables_current.inc.php,1.4,1.5 tables_update.inc.php,1.3,1.4
- Next by Date:
[Phpgroupware-cvs] CVS: felamimail/inc array.php,1.3,1.4 auth.php,1.3,1.4 class.bocaching.inc.php,1.3,1.4 class.bocompose.inc.php,1.3,1.4 class.bofelamimail.inc.php,1.5,1.6 class.bopreferences.inc.php,1.4,1.5 class.phpmailer.inc.php,1.1.1.1,1.2 class.smtp.php,1.1.1.1,1.2 class.socaching.inc.php,1.3,1.4 class.sofelamimail.inc.php,1.3,1.4 class.transformdate.inc.php,1.3,1.4 class.uicompose.inc.php,1.3,1.4 class.uifelamimail.inc.php,1.5,1.6 date.php,1.3,1.4 display_messages.php,1.3,1.4 hook_admin.inc.php,1.5,1.6 hook_home.inc.php,1.7,1.8 hook_preferences.inc.php,1.7,1.8 i18n.php,1.3,1.4 imap.php,1.3,1.4 imap_general.php,1.3,1.4 imap_mailbox.php,1.3,1.4 imap_messages.php,1.3,1.4 imap_search.php,1.3,1.4 mailbox_display.php,1.3,1.4 mime.php,1.3,1.4 page_header.php,1.3,1.4 plugin.php,1.3,1.4 prefs.php,1.3,1.4 smtp.php,1.3,1.4 strings.php,1.3,1.4 tree.php,1.3,1.4 url_parser.php,1.3,1.4
- Previous by thread:
[Phpgroupware-cvs] CVS: felamimail/setup phpgw_de.lang,1.1.1.1,1.2 phpgw_en.lang,1.2,1.3 tables_current.inc.php,1.4,1.5 tables_update.inc.php,1.3,1.4
- Next by thread:
[Phpgroupware-cvs] CVS: felamimail/inc array.php,1.3,1.4 auth.php,1.3,1.4 class.bocaching.inc.php,1.3,1.4 class.bocompose.inc.php,1.3,1.4 class.bofelamimail.inc.php,1.5,1.6 class.bopreferences.inc.php,1.4,1.5 class.phpmailer.inc.php,1.1.1.1,1.2 class.smtp.php,1.1.1.1,1.2 class.socaching.inc.php,1.3,1.4 class.sofelamimail.inc.php,1.3,1.4 class.transformdate.inc.php,1.3,1.4 class.uicompose.inc.php,1.3,1.4 class.uifelamimail.inc.php,1.5,1.6 date.php,1.3,1.4 display_messages.php,1.3,1.4 hook_admin.inc.php,1.5,1.6 hook_home.inc.php,1.7,1.8 hook_preferences.inc.php,1.7,1.8 i18n.php,1.3,1.4 imap.php,1.3,1.4 imap_general.php,1.3,1.4 imap_mailbox.php,1.3,1.4 imap_messages.php,1.3,1.4 imap_search.php,1.3,1.4 mailbox_display.php,1.3,1.4 mime.php,1.3,1.4 page_header.php,1.3,1.4 plugin.php,1.3,1.4 prefs.php,1.3,1.4 smtp.php,1.3,1.4 strings.php,1.3,1.4 tree.php,1.3,1.4 url_parser.php,1.3,1.4
- Index(es):