[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: felamimail/inc class.bocompose.inc.php,1.1.1.1.2
|
From: |
Lars Kneschke <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: felamimail/inc class.bocompose.inc.php,1.1.1.1.2.11.2.1,1.1.1.1.2.11.2.2 class.bopreferences.inc.php,1.1.1.1.2.10.2.2,1.1.1.1.2.10.2.3 class.uidisplay.inc.php,1.1.2.4.2.3,1.1.2.4.2.4 hook_settings.inc.php,1.1.2.3.2.4,1.1.2.3.2.5 |
|
Date: |
Wed, 25 Jun 2003 17:25:34 -0400 |
Update of /cvsroot/phpgroupware/felamimail/inc
In directory subversions:/tmp/cvs-serv15139/inc
Modified Files:
Tag: Version-0_9_16-branch
class.bocompose.inc.php class.bopreferences.inc.php
class.uidisplay.inc.php hook_settings.inc.php
Log Message:
added user defined EMail accounts again, can be deactivated by admin
Index: class.bocompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.1.1.1.2.11.2.1
retrieving revision 1.1.1.1.2.11.2.2
diff -C2 -r1.1.1.1.2.11.2.1 -r1.1.1.1.2.11.2.2
*** class.bocompose.inc.php 25 May 2003 19:37:39 -0000 1.1.1.1.2.11.2.1
--- class.bocompose.inc.php 25 Jun 2003 21:25:32 -0000 1.1.1.1.2.11.2.2
***************
*** 320,324 ****
#}
! $this->sessionData['body'] = $headers->fromaddress
. " ".lang("wrote").": \n>";
// get the body
--- 320,324 ----
#}
! $this->sessionData['body'] =
$bofelamimail->decode_header($headers->fromaddress) . " ".lang("wrote").": \n>";
// get the body
***************
*** 546,556 ****
}
! reset($this->sessionData['attachments']);
! while(list($key,$value) =
@each($this->sessionData['attachments']))
{
! #print "$key: ".$value['file']."<br>";
! unlink($value['file']);
}
!
$this->sessionData = '';
$this->saveSessionData();
--- 546,559 ----
}
! if(is_array($this->sessionData['attachments']))
{
! reset($this->sessionData['attachments']);
! while(list($key,$value) =
@each($this->sessionData['attachments']))
! {
! #print "$key: ".$value['file']."<br>";
! unlink($value['file']);
! }
}
!
$this->sessionData = '';
$this->saveSessionData();
Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.1.1.1.2.10.2.2
retrieving revision 1.1.1.1.2.10.2.3
diff -C2 -r1.1.1.1.2.10.2.2 -r1.1.1.1.2.10.2.3
*** class.bopreferences.inc.php 25 May 2003 19:37:39 -0000 1.1.1.1.2.10.2.2
--- class.bopreferences.inc.php 25 Jun 2003 21:25:32 -0000 1.1.1.1.2.10.2.3
***************
*** 44,49 ****
--- 44,52 ----
$config->read_repository();
$felamimailConfig = $config->config_data;
+ #_debug_array($felamimailConfig);
unset($config);
+ $felamimailUserPrefs =
$GLOBALS['phpgw_info']['user']['preferences']['felamimail'];
+
#_debug_array($GLOBALS['phpgw_info']['user']);
#print "<hr>";
***************
*** 63,77 ****
$data['smtpPort'] =
$GLOBALS['phpgw_info']["server"]["smtp_port"];
- switch($data['imap_server_type'])
- {
- case "imaps-encr-only":
- case "imaps-encr-auth":
- $data['imapPort'] = 993;
- break;
- default:
- $data['imapPort'] = 143;
- break;
- }
-
// check for felamimail specific settings
if(!empty($felamimailConfig['imapServer']))
--- 66,69 ----
***************
*** 121,141 ****
// check for user specific settings
! if
($GLOBALS['phpgw_info']['user']['preferences']['email']['use_custom_settings']
== 'True')
{
!
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['userid']))
! $data['username'] =
$GLOBALS['phpgw_info']['user']['preferences']['email']['userid'];
!
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['passwd']))
! $data['key'] =
$GLOBALS['phpgw_info']['user']['preferences']['email']['passwd'];
!
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['address']))
! $data['emailAddress'] =
$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
!
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server']))
! $data['imapServerAddress'] =
$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server'];
!
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['imap_server_type']))
! $data['imap_server_type'] =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type']);
}
$GLOBALS['phpgw']->preferences->read_repository();
--- 113,148 ----
// check for user specific settings
! #_debug_array($felamimailUserPrefs);
! if ($felamimailConfig['userDefinedAccounts'] == 'yes' &&
! $felamimailUserPrefs['use_custom_settings'] ==
'yes')
{
! if(!empty($felamimailUserPrefs['username']))
! $data['username'] =
$felamimailUserPrefs['username'];
! if(!empty($felamimailUserPrefs['key']))
! $data['key'] =
$felamimailUserPrefs['key'];
! if(!empty($felamimailUserPrefs['emailAddress']))
! $data['emailAddress'] =
$felamimailUserPrefs['emailAddress'];
!
if(!empty($felamimailUserPrefs['imapServerAddress']))
! $data['imapServerAddress'] =
$felamimailUserPrefs['imapServerAddress'];
!
if(!empty($felamimailUserPrefs['imap_server_type']))
! $data['imap_server_type'] =
strtolower($felamimailUserPrefs['imap_server_type']);
}
+
+ switch($data['imap_server_type'])
+ {
+ case "imaps-encr-only":
+ case "imaps-encr-auth":
+ $data['imapPort'] = 993;
+ break;
+ default:
+ $data['imapPort'] = 143;
+ break;
+ }
+
+ #_debug_array($data);
$GLOBALS['phpgw']->preferences->read_repository();
Index: class.uidisplay.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.uidisplay.inc.php,v
retrieving revision 1.1.2.4.2.3
retrieving revision 1.1.2.4.2.4
diff -C2 -r1.1.2.4.2.3 -r1.1.2.4.2.4
*** class.uidisplay.inc.php 25 May 2003 20:11:21 -0000 1.1.2.4.2.3
--- class.uidisplay.inc.php 25 Jun 2003 21:25:32 -0000 1.1.2.4.2.4
***************
*** 53,56 ****
--- 53,57 ----
$this->bofelamimail->saveSessionData();
}
+
}
***************
*** 358,362 ****
$tag_list = Array(true, "b", "a", "i", "img", "strong", "em", "p");
! $tag_list = Array(true, "b", "a", "i", "strong", 'pre',
"em", "p", 'td', 'tr', 'table',
'font', 'hr', 'br', 'div');
--- 359,363 ----
$tag_list = Array(true, "b", "a", "i", "img", "strong", "em", "p");
! $tag_list = Array(true, "b", "a", "i", "strong", 'pre', 'ul', 'li',
"em", "p", 'td', 'tr', 'table',
'font', 'hr', 'br', 'div');
Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/hook_settings.inc.php,v
retrieving revision 1.1.2.3.2.4
retrieving revision 1.1.2.3.2.5
diff -C2 -r1.1.2.3.2.4 -r1.1.2.3.2.5
*** hook_settings.inc.php 25 May 2003 19:37:40 -0000 1.1.2.3.2.4
--- hook_settings.inc.php 25 Jun 2003 21:25:32 -0000 1.1.2.3.2.5
***************
*** 18,21 ****
--- 18,28 ----
$this->bofelamimail->closeConnection();
+
+ $config = CreateObject('phpgwapi.config','felamimail');
+ $config->read_repository();
+ $felamimailConfig = $config->config_data;
+ #_debug_array($felamimailConfig);
+ unset($config);
+
$refreshTime = array(
***************
*** 78,79 ****
--- 85,114 ----
);
create_select_box('sent folder','sentFolder',$sentOptions);
+
+ if ($felamimailConfig['userDefinedAccounts'] == 'yes')
+ {
+ $selectOptions = array(
+ 'no' => lang('no'),
+ 'yes' => lang('yes')
+ );
+ create_select_box('use custom
settings','use_custom_settings',$selectOptions);
+
+ create_input_box('username','username','','',40);
+ create_password_box('password','key','','',40);
+ create_input_box('EMail Address','emailAddress','','',40);
+ create_input_box('IMAP Server
Address','imapServerAddress','','',40);
+
+ $selectOptions = array(
+ 'no' => lang('IMAP'),
+ 'yes' => lang('IMAPS Encryption
only'),
+ 'imaps-encr-auth' => lang('IMAPS Authentication')
+ );
+ create_select_box('IMAP Server
type','imapServerMode',$selectOptions);
+
+ #$selectOptions = array(
+ # 'no' => lang('no'),
+ # 'yes' => lang('yes')
+ #);
+ #create_select_box('use custom
settings','use_custom_settings',$selectOptions);
+ }
+ ?>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: felamimail/inc class.bocompose.inc.php,1.1.1.1.2.11.2.1,1.1.1.1.2.11.2.2 class.bopreferences.inc.php,1.1.1.1.2.10.2.2,1.1.1.1.2.10.2.3 class.uidisplay.inc.php,1.1.2.4.2.3,1.1.2.4.2.4 hook_settings.inc.php,1.1.2.3.2.4,1.1.2.3.2.5,
Lars Kneschke <address@hidden> <=