holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

making the standard substitutes for signatures useable even for the user:

Browse Source 
supported substitutes are:
            $$fullname$$  => name of the user,
            $$firstname$$ => first name of the user,
            $$lastname$$  => last name of the user,
            $$domain$$    => domain name for mail-address,
            $$email$$     => email-address of the user,
            $$date$$      => todays date,

Note: substitutions are performed, as the signature is added to the email, in EDIT Mode of
the signature in question the above listed placeholders are shown, if used.

Note: this is the discussed feature for signature placeholder substitution of 1.4.
It was never dropped, (as assumed earlier, but not useable, as substitution was performed for almost 
every edit of the signature (and the placeholders where lost that way))
This commit is contained in:
Klaus Leithoff 2008-12-09 14:22:31 +00:00
parent 9d6f449bbd
commit 1445e08c72
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
felamimail/inc/class.bopreferences.inc.php
View File

@ -176,7 +176,7 @@
if(!is_a($profileData, 'ea_preferences') || !is_a($profileData->ic_server[0], 'defaultimap')) {
return false;
}
if($profileData->userDefinedAccounts) {
if($profileData->userDefinedAccounts && $GLOBALS['egw_info']['user']['apps']['felamimail']) {
// get user defined accounts
$accountData = $this->getAccountData($profileData);

2
felamimail/inc/class.felamimail_bosignatures.inc.php
View File

@ -91,7 +91,7 @@
require_once('class.felamimail_signatures.inc.php');
$signature = new felamimail_signatures($_signatureID);
if($_unparsed === false) {
$signature->fm_signature = $GLOBALS['egw']->preferences->parse_notify($signature->fm_signature);
$signature->fm_signature = ($_unparsed === true ? $this->profileData->ea_default_signature : $GLOBALS['egw']->preferences->parse_notify($signature->fm_signature));
}
return $signature;
}

6
felamimail/inc/class.uipreferences.inc.php
View File

@ -150,7 +150,7 @@
$signatureID = (int)$_GET['signatureID'];
$boSignatures = new felamimail_bosignatures();
$signatureData = $boSignatures->getSignature($signatureID);
$signatureData = $boSignatures->getSignature($signatureID,true);
}
$this->display_app_header(false);
@ -209,7 +209,7 @@
if($_POST['save'] || $_POST['apply']) {
// IMAP connection settings
$icServer =& CreateObject('emailadmin.defaultimap');
if(is_array($_POST['ic'])) {
if(is_array($_POST['ic']) && (int)$_POST['active']) {
foreach($_POST['ic'] as $key => $value) {
switch($key) {
case 'validatecert':
@ -230,7 +230,7 @@
}
// SMTP connection settings
$ogServer =& CreateObject('emailadmin.defaultsmtp');
if(is_array($_POST['og'])) {
if(is_array($_POST['og']) && (int)$_POST['active']) {
foreach($_POST['og'] as $key => $value) {
$ogServer->$key = $value;
}