lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nostop option

Browse Source
This commit is contained in:
Laurent Destailleur 2017-09-01 17:07:26 +02:00
parent 920d6270c3
commit bda507d191
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/CSMSFile.class.php
View File

@ -212,6 +212,7 @@ class CSMSFile
fputs($fp, "Priority: ".$this->priority."\n"); fputs($fp, "Priority: ".$this->priority."\n");
fputs($fp, "Class: ".$this->class."\n"); fputs($fp, "Class: ".$this->class."\n");
fputs($fp, "Deferred: ".$this->deferred."\n"); fputs($fp, "Deferred: ".$this->deferred."\n");
fputs($fp, "DisableStop: ".$this->nostop."\n");
fputs($fp, "Message:\n".$this->message); fputs($fp, "Message:\n".$this->message);
fclose($fp); fclose($fp);

18
htdocs/core/class/html.formsms.class.php
View File

@ -147,7 +147,7 @@ function limitChars(textarea, limit, infodiv)
{ {
if ($this->withfromreadonly) if ($this->withfromreadonly)
{ {
print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom"); print '<tr><td class="titlefield '.$morecss.'">'.$langs->trans("SmsFrom");
print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">'; print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';
print "</td><td>"; print "</td><td>";
if ($this->fromtype == 'user') if ($this->fromtype == 'user')
@ -223,7 +223,7 @@ function limitChars(textarea, limit, infodiv)
if (is_array($resultsender) && count($resultsender) > 0) if (is_array($resultsender) && count($resultsender) > 0)
{ {
print '<select name="fromsms" id="valid" class="flat">'; print '<select name="fromsms" id="fromsms" class="flat">';
foreach($resultsender as $obj) foreach($resultsender as $obj)
{ {
print '<option value="'.$obj->number.'">'.$obj->number.'</option>'; print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
@ -244,7 +244,7 @@ function limitChars(textarea, limit, infodiv)
// To (target) // To (target)
if ($this->withto || is_array($this->withto)) if ($this->withto || is_array($this->withto))
{ {
print '<tr><td width="180">'; print '<tr><td>';
//$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"); //$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
$moretext=''; $moretext='';
print $form->textwithpicto($langs->trans("SmsTo"),$moretext); print $form->textwithpicto($langs->trans("SmsTo"),$moretext);
@ -285,7 +285,7 @@ function limitChars(textarea, limit, infodiv)
$defaultmessage=str_replace('\n',"\n",$defaultmessage); $defaultmessage=str_replace('\n',"\n",$defaultmessage);
print "<tr>"; print "<tr>";
print "<td width=\"180\" valign=\"top\">".$langs->trans("SmsText")."</td>"; print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
print "<td>"; print "<td>";
if ($this->withbodyreadonly) if ($this->withbodyreadonly)
{ {
@ -306,7 +306,7 @@ function limitChars(textarea, limit, infodiv)
<td> <input name="deferred" id="deferred" size="4" value="0"></td></tr> <td> <input name="deferred" id="deferred" size="4" value="0"></td></tr>
<tr><td>'.$langs->trans("Priority").' :</td><td> <tr><td>'.$langs->trans("Priority").' :</td><td>
<select name="priority" id="valid" class="flat"> <select name="priority" id="priority" class="flat">
<option value="0">high</option> <option value="0">high</option>
<option value="1">medium</option> <option value="1">medium</option>
<option value="2" selected>low</option> <option value="2" selected>low</option>
@ -314,11 +314,17 @@ function limitChars(textarea, limit, infodiv)
</select></td></tr> </select></td></tr>
<tr><td>'.$langs->trans("Type").' :</td><td> <tr><td>'.$langs->trans("Type").' :</td><td>
<select name="class" id="valid" class="flat"> <select name="class" id="class" class="flat">
<option value="0">Flash</option> <option value="0">Flash</option>
<option value="1" selected>Standard</option> <option value="1" selected>Standard</option>
<option value="2">SIM</option> <option value="2">SIM</option>
<option value="3">ToolKit</option> <option value="3">ToolKit</option>
</select></td></tr>
<tr><td>'.$langs->trans("DisableStopIfSupported").' :</td><td>
<select name="disablestop" id="disablestop" class="flat">
<option value="0" selected>No</option>
<option value="1" selected>Yes</option>
</select></td></tr>'; </select></td></tr>';
print "</table>\n"; print "</table>\n";

2
htdocs/langs/en_US/sms.lang
View File

@ -48,4 +48,4 @@ SmsInfoNumero= (format international ie : +33899701761)
DelayBeforeSending=Delay before sending (minutes) DelayBeforeSending=Delay before sending (minutes)
SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider. SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider. SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
DisableStopIfSupported=Disable STOP message (if supported)