[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] felamimail inc/class.bocaching.inc.php inc/clas...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] felamimail inc/class.bocaching.inc.php inc/clas... |
|
Date: |
Sat, 22 Sep 2007 14:19:46 +0000 |
CVSROOT: /sources/phpgroupware
Module name: felamimail
Changes by: Sigurd Nes <sigurdne> 07/09/22 14:19:46
Modified files:
inc : class.bocaching.inc.php
class.bofelamimail.inc.php
class.uipreferences.inc.php
hook_settings.inc.php
templates/base : config.tpl
Log message:
Add support for TLS
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bocaching.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uipreferences.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/hook_settings.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/config.tpl?cvsroot=phpgroupware&r1=1.6&r2=1.7
Patches:
Index: inc/class.bocaching.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bocaching.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- inc/class.bocaching.inc.php 18 Dec 2006 20:03:32 -0000 1.5
+++ inc/class.bocaching.inc.php 22 Sep 2007 14:19:45 -0000 1.6
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bocaching.inc.php,v 1.5 2006/12/18 20:03:32 sigurdne Exp
$ */
+ /* $Id: class.bocaching.inc.php,v 1.6 2007/09/22 14:19:45 sigurdne Exp
$ */
class bocaching
{
Index: inc/class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- inc/class.bofelamimail.inc.php 8 Sep 2007 23:05:45 -0000 1.26
+++ inc/class.bofelamimail.inc.php 22 Sep 2007 14:19:45 -0000 1.27
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bofelamimail.inc.php,v 1.26 2007/09/08 23:05:45 skwashd
Exp $ */
+ /* $Id: class.bofelamimail.inc.php,v 1.27 2007/09/22 14:19:45 sigurdne
Exp $ */
class bofelamimail
{
@@ -39,19 +39,21 @@
{
$this->restoreSessionData();
+ // default mailbox INBOX
+ $this->sessionData['mailbox'] =
isset($this->sessionData['mailbox']) && $this->sessionData['mailbox'] ?
$this->sessionData['mailbox'] : "INBOX";
+
// set some defaults
- if(count($this->sessionData) == 0)
+ // if(count($this->sessionData) == 0)
{
// this should be under user preferences
// sessionData empty
// no filter active
- $this->sessionData['activeFilter'] = "-1";
- // default mailbox INBOX
- $this->sessionData['mailbox'] =
"INBOX";
+ $this->sessionData['activeFilter'] =
isset($this->sessionData['activeFilter']) && $this->sessionData['activeFilter']
? $this->sessionData['activeFilter'] : "-1";
+
// default start message
- $this->sessionData['startMessage'] = 1;
+ $this->sessionData['startMessage'] =
isset($this->sessionData['startMessage']) && $this->sessionData['startMessage']
? $this->sessionData['startMessage']: 1;
// default mailbox for preferences pages
- $this->sessionData['preferences']['mailbox']
= "INBOX";
+ $this->sessionData['preferences']['mailbox']
= isset($this->sessionData['preferences']['mailbox']) &&
$this->sessionData['preferences']['mailbox'] ?
$this->sessionData['preferences']['mailbox'] : "INBOX";
// default sorting
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['sortOrder']))
{
@@ -121,6 +123,14 @@
$this->mailPreferences['imapPort'],
$_folderName);
break;
+
+ case "imaptls":
+ $mailboxString =
sprintf("{%s:%s/tls/novalidate-cert}%s",
+
$this->mailPreferences['imapServerAddress'],
+
$this->mailPreferences['imapPort'],
+ $_folderName);
+ break;
+
}
return $this->encodeFolderName($mailboxString);
@@ -480,7 +490,6 @@
function getHeaders($_startMessage, $_numberOfMessages, $_sort)
{
-
# printf ("this->bofelamimail->getHeaders start:
%s<br>",date("H:i:s",mktime()));
$caching = CreateObject('felamimail.bocaching',
Index: inc/class.uipreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uipreferences.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.uipreferences.inc.php 22 Dec 2006 10:36:52 -0000 1.4
+++ inc/class.uipreferences.inc.php 22 Sep 2007 14:19:46 -0000 1.5
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uipreferences.inc.php,v 1.4 2006/12/22 10:36:52 sigurdne
Exp $ */
+ /* $Id: class.uipreferences.inc.php,v 1.5 2007/09/22 14:19:46 sigurdne
Exp $ */
class uipreferences
{
@@ -53,7 +53,7 @@
$this->bofelamimail->saveSessionData();
}
- $this->selectedFolder =
$this->bofelamimail->sessionData['preferences']['mailbox'];
+ $this->selectedFolder =
isset($this->bofelamimail->sessionData['preferences']['mailbox']) ?
$this->bofelamimail->sessionData['preferences']['mailbox']:'';
// (un)subscribe to a folder??
if(isset($GLOBALS['HTTP_POST_VARS']['folderStatus']))
@@ -103,7 +103,7 @@
}
}
- $this->selectedFolder =
$this->bofelamimail->sessionData['preferences']['mailbox'];
+ $this->selectedFolder =
isset($this->bofelamimail->sessionData['preferences']['mailbox'])?$this->bofelamimail->sessionData['preferences']['mailbox']:'';
// check user input END
Index: inc/hook_settings.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/hook_settings.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- inc/hook_settings.inc.php 18 Dec 2006 20:03:32 -0000 1.3
+++ inc/hook_settings.inc.php 22 Sep 2007 14:19:46 -0000 1.4
@@ -9,7 +9,7 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: hook_settings.inc.php,v 1.3 2006/12/18 20:03:32 sigurdne Exp $
*/
+ /* $Id: hook_settings.inc.php,v 1.4 2007/09/22 14:19:46 sigurdne Exp $
*/
$this->bofelamimail = CreateObject('felamimail.bofelamimail');
$this->bofelamimail->openConnection('',OP_HALFOPEN);
@@ -101,7 +101,8 @@
$selectOptions = array(
'no' => lang('IMAP'),
'yes' => lang('IMAPS Encryption
only'),
- 'imaps-encr-auth' => lang('IMAPS Authentication')
+ 'imaps-encr-auth' => lang('IMAPS Authentication'),
+ 'imaptls' => lang('IMAP TLS')
);
create_select_box('IMAP Server
type','imapServerMode',$selectOptions);
Index: templates/base/config.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/config.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- templates/base/config.tpl 23 Feb 2007 23:06:45 -0000 1.6
+++ templates/base/config.tpl 22 Sep 2007 14:19:46 -0000 1.7
@@ -28,6 +28,7 @@
<td>
<select name="newsettings[imapServerMode]">
<option value="imap" {selected_imapServerMode_imap}>IMAP</option>
+ <option value="imaptls"
{selected_imapServerMode_imaptls}>IMAP-TLS</option>
<option value="imaps-encr-only"
{selected_imapServerMode_imaps-encr-only}>IMAPS Encryption only</option>
<option value="imaps-encr-auth"
{selected_imapServerMode_imaps-encr-auth}>IMAPS Authentication</option>
</select>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] felamimail inc/class.bocaching.inc.php inc/clas...,
Sigurd Nes <=