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

Change display of placeholder tags from 2432...2432 to {{...}}

Browse Source
This commit is contained in:
Nathan Gray 2011-02-18 17:03:20 +00:00
parent c44e418d87
commit 3296d09385
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infolog/inc/class.infolog_hooks.inc.php
View File

@ -381,7 +381,7 @@ class infolog_hooks
'label' => 'Default document to insert entries', 'label' => 'Default document to insert entries',
'name' => 'default_document', 'name' => 'default_document',
'help' => lang('If you specify a document (full vfs path) here, infolog displays an extra document icon for each entry. That icon allows to download the specified document with the contact data inserted.').' '. 'help' => lang('If you specify a document (full vfs path) here, infolog displays an extra document icon for each entry. That icon allows to download the specified document with the contact data inserted.').' '.
lang('The document can contain placeholder like $$info_subject$$, to be replaced with the contact data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>').' '. lang('The document can contain placeholder like {{info_subject}}, to be replaced with the contact data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>').' '.
lang('At the moment the following document-types are supported:').'*.rtf, *.txt', lang('At the moment the following document-types are supported:').'*.rtf, *.txt',
'run_lang' => false, 'run_lang' => false,
'xmlrpc' => True, 'xmlrpc' => True,
@ -393,7 +393,7 @@ class infolog_hooks
'label' => 'Directory with documents to insert entries', 'label' => 'Directory with documents to insert entries',
'name' => 'document_dir', 'name' => 'document_dir',
'help' => lang('If you specify a directory (full vfs path) here, infolog displays an action for each document. That action allows to download the specified document with the infolog data inserted.').' '. 'help' => lang('If you specify a directory (full vfs path) here, infolog displays an action for each document. That action allows to download the specified document with the infolog data inserted.').' '.
lang('The document can contain placeholder like $$info_subject$$, to be replaced with the contact data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>').' '. lang('The document can contain placeholder like {{info_subject}}, to be replaced with the contact data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>').' '.
lang('At the moment the following document-types are supported:').'*.rtf, *.txt', lang('At the moment the following document-types are supported:').'*.rtf, *.txt',
'run_lang' => false, 'run_lang' => false,
'xmlrpc' => True, 'xmlrpc' => True,

21
infolog/inc/class.infolog_merge.inc.php
View File

@ -61,6 +61,7 @@ class infolog_merge extends bo_merge
{ {
$replacements += $this->contact_replacements($replacements['$$info_link$$']['id'],'info_contact'); $replacements += $this->contact_replacements($replacements['$$info_link$$']['id'],'info_contact');
} }
if(is_array($replacements['$$info_link$$'])) unset($replacements['$$info_link$$']);
} }
return $replacements; return $replacements;
} }
@ -132,7 +133,7 @@ class infolog_merge extends bo_merge
$n++; $n++;
} }
if (!($n&1)) echo '<tr>'; if (!($n&1)) echo '<tr>';
echo '<td>$$'.$name.'$$</td><td>'.$label.'</td>'; echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>';
if ($n&1) echo "</tr>\n"; if ($n&1) echo "</tr>\n";
$n++; $n++;
} }
@ -140,7 +141,7 @@ class infolog_merge extends bo_merge
echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>"; echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
foreach($this->bo->customfields as $name => $field) foreach($this->bo->customfields as $name => $field)
{ {
echo '<tr><td>$$#'.$name.'$$</td><td colspan="3">'.$field['label']."</td></tr>\n"; echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
} }
echo '<tr><td colspan="4"><h3>'.lang('Contact fields').':</h3></td></tr>'; echo '<tr><td colspan="4"><h3>'.lang('Contact fields').':</h3></td></tr>';
@ -155,7 +156,7 @@ class infolog_merge extends bo_merge
$n++; $n++;
} }
if (!($n&1)) echo '<tr>'; if (!($n&1)) echo '<tr>';
echo '<td>$$info_contact/'.$name.'$$</td><td>'.$label.'</td>'; echo '<td>{{info_contact/'.$name.'}}</td><td>'.$label.'</td>';
if ($n&1) echo "</tr>\n"; if ($n&1) echo "</tr>\n";
$n++; $n++;
} }
@ -163,7 +164,7 @@ class infolog_merge extends bo_merge
echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>"; echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
foreach($this->contacts->customfields as $name => $field) foreach($this->contacts->customfields as $name => $field)
{ {
echo '<tr><td>$$info_contact/#'.$name.'$$</td><td colspan="3">'.$field['label']."</td></tr>\n"; echo '<tr><td>{{info_contact/#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
} }
echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>"; echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
@ -174,14 +175,14 @@ class infolog_merge extends bo_merge
'pagerepeat' => lang('For serial letter use this tag. Put the content, you want to repeat between two Tags.'), 'pagerepeat' => lang('For serial letter use this tag. Put the content, you want to repeat between two Tags.'),
'label' => lang('Use this tag for addresslabels. Put the content, you want to repeat, between two tags.'), 'label' => lang('Use this tag for addresslabels. Put the content, you want to repeat, between two tags.'),
'labelplacement' => lang('Tag to mark positions for address labels'), 'labelplacement' => lang('Tag to mark positions for address labels'),
'IF fieldname' => lang('Example $$IF n_prefix~Mr~Hello Mr.~Hello Ms.$$ - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.'), 'IF fieldname' => lang('Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.'),
'NELF' => lang('Example $$NELF role$$ - if field role is not empty, you will get a new line with the value of field role'), 'NELF' => lang('Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role'),
'NENVLF' => lang('Example $$NELFNV role$$ - if field role is not empty, set a LF without any value of the field'), 'NENVLF' => lang('Example {{NELFNV role}} - if field role is not empty, set a LF without any value of the field'),
'LETTERPREFIX' => lang('Example $$LETTERPREFIX$$ - Gives a letter prefix without double spaces, if the title is emty for example'), 'LETTERPREFIX' => lang('Example {{LETTERPREFIX}} - Gives a letter prefix without double spaces, if the title is emty for example'),
'LETTERPREFIXCUSTOM' => lang('Example $$LETTERPREFIXCUSTOM n_prefix title n_family$$ - Example: Mr Dr. James Miller'), 'LETTERPREFIXCUSTOM' => lang('Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller'),
) as $name => $label) ) as $name => $label)
{ {
echo '<tr><td>$$'.$name.'$$</td><td colspan="3">'.$label."</td></tr>\n"; echo '<tr><td>{{'.$name.'}}</td><td colspan="3">'.$label."</td></tr>\n";
} }
echo "</table>\n"; echo "</table>\n";