From: Jonny B. <jo...@ti...> - 2011-06-25 13:36:54
|
+1 On 25 Jun 2011, at 12:11, xa...@us... wrote: > Revision: 35052 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35052&view=rev > Author: xavidp > Date: 2011-06-25 11:11:49 +0000 (Sat, 25 Jun 2011) > > Log Message: > ----------- > [bp/r35051][FIX]Allow intra-tiki messaging to understand multiple usernames (in to, cc or bcc ) separated with commas also, besides semicolon, so that it works by default with the usernames given by plugin trackerlist with the checkbox param. http://doc.tiki.org/PluginTrackerList upated also recovering the lost information about that checkbox feature, which is not fully bug free, but it just works (at least) with these last two fixes. Thanks luciash (sorry, forgot acknowledge your help in the previous commit message) > > Modified Paths: > -------------- > branches/proposals/6.x/messu-compose.php > branches/proposals/6.x/templates/messu-compose.tpl > > Modified: branches/proposals/6.x/messu-compose.php > =================================================================== > --- branches/proposals/6.x/messu-compose.php 2011-06-25 11:06:53 UTC (rev 35051) > +++ branches/proposals/6.x/messu-compose.php 2011-06-25 11:11:49 UTC (rev 35052) > @@ -61,9 +61,9 @@ > die; > } > // Parse the to, cc and bcc fields into an array > - $arr_to = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['to']); > - $arr_cc = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['cc']); > - $arr_bcc = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['bcc']); > + $arr_to = preg_split('/\s*(?<!\\\)[;,]\s*/', $_REQUEST['to']); > + $arr_cc = preg_split('/\s*(?<!\\\)[;,]\s*/', $_REQUEST['cc']); > + $arr_bcc = preg_split('/\s*(?<!\\\)[;,]\s*/', $_REQUEST['bcc']); > if ($prefs['user_selector_realnames_messu'] == 'y') { > $groups = ''; > $arr_to = $userlib->find_best_user($arr_to, $groups, 'login'); > > Modified: branches/proposals/6.x/templates/messu-compose.tpl > =================================================================== > --- branches/proposals/6.x/templates/messu-compose.tpl 2011-06-25 11:06:53 UTC (rev 35051) > +++ branches/proposals/6.x/templates/messu-compose.tpl 2011-06-25 11:11:49 UTC (rev 35052) > @@ -34,7 +34,7 @@ > <tr> > <td> > <label for="mess-composeto">{tr}To:{/tr}</label> > - {help url="Inter-User+Messages#Composing_messages" desc="{tr}To{/tr}:{tr}Multiple addresses can be separated with semicolons (\";\"){/tr}"} > + {help url="Inter-User+Messages#Composing_messages" desc="{tr}To{/tr}:{tr}Multiple addresses can be separated with semicolons (\";\"){/tr} {tr}or commas (\",\"){/tr}"} > </td> > <td> > <input type="text" name="to" id="mess-composeto" value="{$to|escape}" class="username" size="80" /> > @@ -45,7 +45,7 @@ > <tr> > <td> > <label for="mess-composecc">{tr}CC:{/tr}</label> > - {help url="Inter-User+Messages#Composing_messages" desc="{tr}CC{/tr}:{tr}Multiple addresses can be separated with semicolons (\";\"){/tr}"} > + {help url="Inter-User+Messages#Composing_messages" desc="{tr}CC{/tr}:{tr}Multiple addresses can be separated with semicolons (\";\"){/tr} {tr}or commas (\",\"){/tr}"} > </td> > <td> > <input type="text" name="cc" id="mess-composecc" value="{$cc|escape}" class="username" size="80" /> > @@ -54,7 +54,7 @@ > <tr> > <td> > <label for="mess-composebcc">{tr}BCC:{/tr}</label> > - {help url="Inter-User+Messages#Composing_messages" desc="{tr}BCC{/tr}:{tr}Multiple addresses can be separated with semicolons (\";\"){/tr}"} > + {help url="Inter-User+Messages#Composing_messages" desc="{tr}BCC{/tr}:{tr}Multiple addresses can be separated with semicolons (\";\"){/tr} {tr}or commas (\",\"){/tr}"} > </td> > <td> > <input type="text" name="bcc" id="mess-composebcc" value="{$bcc|escape}" class="username" size="80" /> > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > All the data continuously generated in your IT infrastructure contains a > definitive record of customers, application performance, security > threats, fraudulent activity and more. Splunk takes this data and makes > sense of it. Business sense. IT sense. Common sense.. > http://p.sf.net/sfu/splunk-d2d-c1 > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |