Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

NEW Remove hardcoded code for OVH sms. Generic method is ok now.

Browse Source
This commit is contained in:
Laurent Destailleur
2023-08-26 12:02:19 +02:00
parent 3199bd7137
commit 8cc3d2358b
8 changed files with 56 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ class FormSms
public function show_form($morecss = 'titlefield', $showform = 1)
{
// phpcs:enable
global $conf, $langs, $user, $form;
global $conf, $langs, $form;
if (!is_object($form)) {
$form = new Form($this->db);
@@ -185,21 +185,14 @@ function limitChars(textarea, limit, infodiv)
print "</td></tr>\n";
} else {
print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
//print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
if ($conf->global->MAIN_SMS_SENDMODE == 'ovh') { // For backward compatibility @deprecated
dol_include_once('/ovh/class/ovhsms.class.php');
try {
$sms = new OvhSms($this->db);
if (empty($conf->global->OVHSMS_ACCOUNT)) {
$resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
} else {
$resultsender = $sms->SmsSenderList();
}
} catch (Exception $e) {
dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
if (getDolGlobalString('MAIN_SMS_SENDMODE')) {
$sendmode = getDolGlobalString('MAIN_SMS_SENDMODE'); // $conf->global->MAIN_SMS_SENDMODE looks like a value 'module'
$classmoduleofsender = getDolGlobalString('MAIN_MODULE_'.strtoupper($sendmode).'_SMS', $sendmode); // $conf->global->MAIN_MODULE_XXX_SMS looks like a value 'class@module'
if ($classmoduleofsender == 'ovh') {
$classmoduleofsender = 'ovhsms@ovh'; // For backward compatibility
}
} elseif (!empty($conf->global->MAIN_SMS_SENDMODE)) { // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
$tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
$tmp = explode('@', $classmoduleofsender);
$classfile = $tmp[0];
$module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
@@ -210,7 +203,7 @@ function limitChars(textarea, limit, infodiv)
$resultsender = $sms->SmsSenderList();
} else {
$sms = new stdClass();
$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_MODULE_'.strtoupper($sendmode).'_SMS is not found';
}
} catch (Exception $e) {
dol_print_error('', 'Error to get list of senders: '.$e->getMessage());