Menu
▾
▴
[eGroupWare-svn] r33851 - in /trunk/infolog/inc: class.infolog_hooks.inc.php class.infolog_merge.inc.php
|
From: <nat...@us...> - 2011-02-18 17:03:29
|
Author: nathangray Date: Fri Feb 18 18:03:20 2011 New Revision: 33851 URL: http://www.egroupware.org/viewvc/egroupware?rev=33851&view=rev Log: Change display of placeholder tags from 2432...2432 to {{...}} Modified: trunk/infolog/inc/class.infolog_hooks.inc.php trunk/infolog/inc/class.infolog_merge.inc.php Modified: trunk/infolog/inc/class.infolog_hooks.inc.php URL: http://www.egroupware.org/viewvc/egroupware/trunk/infolog/inc/class.infolog_hooks.inc.php?rev=33851&r1=33850&r2=33851&view=diff ============================================================================== --- trunk/infolog/inc/class.infolog_hooks.inc.php (original) +++ trunk/infolog/inc/class.infolog_hooks.inc.php Fri Feb 18 18:03:20 2011 @@ -381,7 +381,7 @@ 'label' => 'Default document to insert entries', '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.').' '. - 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', 'run_lang' => false, 'xmlrpc' => True, @@ -393,7 +393,7 @@ 'label' => 'Directory with documents to insert entries', '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.').' '. - 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', 'run_lang' => false, 'xmlrpc' => True, Modified: trunk/infolog/inc/class.infolog_merge.inc.php URL: http://www.egroupware.org/viewvc/egroupware/trunk/infolog/inc/class.infolog_merge.inc.php?rev=33851&r1=33850&r2=33851&view=diff ============================================================================== --- trunk/infolog/inc/class.infolog_merge.inc.php (original) +++ trunk/infolog/inc/class.infolog_merge.inc.php Fri Feb 18 18:03:20 2011 @@ -61,6 +61,7 @@ { $replacements += $this->contact_replacements($replacements['$$info_link$$']['id'],'info_contact'); } + if(is_array($replacements['$$info_link$$'])) unset($replacements['$$info_link$$']); } return $replacements; } @@ -132,7 +133,7 @@ $n++; } 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"; $n++; } @@ -140,7 +141,7 @@ echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>"; 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>'; @@ -155,7 +156,7 @@ $n++; } 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"; $n++; } @@ -163,7 +164,7 @@ echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>"; 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>"; @@ -174,14 +175,14 @@ '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.'), '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.'), - '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'), - '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'), + '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'), + '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'), + 'LETTERPREFIXCUSTOM' => lang('Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller'), ) 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"; |