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

Merge pull request #15974 from frederic34/davadmin

Browse Source 
fix trans
This commit is contained in:
Laurent Destailleur 2021-01-16 17:13:37 +01:00 committed by GitHub
commit cdcc6b7324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/dav.php
View File

@ -172,13 +172,13 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
// Show message
$message = '';
$url = '<a href="'.$urlwithroot.'/dav/fileserver.php" target="_blank">'.$urlwithroot.'/dav/fileserver.php</a>';
$message .= img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV', $url);
$message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV', '{url}'));
$message .= '<br>';
if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR))
{
$urlEntity = (!empty($conf->multicompany->enabled) ? '?entity='.$conf->entity : '');
$url = '<a href="'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'" target="_blank">'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'</a>';
$message .= img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV public', $url);
$message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV public', '{url}'));
$message .= '<br>';
}
print $message;

12
htdocs/core/class/commonobject.class.php
View File

@ -3672,7 +3672,9 @@ abstract class CommonObject
*/
static public function getAllItemsLinkedByObjectID($fk_object_where, $field_select, $field_where, $table_element)
{
if (empty($fk_object_where) || empty($field_where) || empty($table_element)) return -1;
if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {
return -1;
}
global $db;
@ -3699,14 +3701,18 @@ abstract class CommonObject
*/
static public function deleteAllItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)
{
if (empty($fk_object_where) || empty($field_where) || empty($table_element)) return -1;
if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {
return -1;
}
global $db;
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table_element.' WHERE '.$field_where.' = '.$fk_object_where;
$resql = $db->query($sql);
if (empty($resql)) return 0;
if (empty($resql)) {
return 0;
}
return 1;
}

12
htdocs/core/class/html.formmail.class.php
View File

@ -1516,9 +1516,15 @@ class FormMail extends Form
//,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet in mass emailing
$onlinepaymentenabled = 0;
if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;
if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;
if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;
if (!empty($conf->paypal->enabled)) {
$onlinepaymentenabled++;
}
if (!empty($conf->paybox->enabled)) {
$onlinepaymentenabled++;
}
if (!empty($conf->stripe->enabled)) {
$onlinepaymentenabled++;
}
if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {