@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php // BEGIN PHP |
| 2 | -$websitekey=basename(__DIR__); |
|
| 3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
| 2 | +$websitekey = basename(__DIR__); |
|
| 3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
| 4 | 4 | require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php'; |
| 5 | 5 | require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php'; |
| 6 | 6 | ob_start(); |
| 7 | -if (! headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
| 7 | +if (!headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
| 8 | 8 | header('Cache-Control: max-age=3600, public, must-revalidate'); |
| 9 | 9 | header('Content-type: text/css'); |
| 10 | 10 | } |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // File generated to link to the master file - DO NOT MODIFY - It is just an include |
| 3 | 3 | if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
| 4 | - if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
| 5 | - require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; |
|
| 4 | + if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
| 5 | + require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; |
|
| 6 | 6 | } |
| 7 | 7 | ?> |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // File generated to link to the master file - DO NOT MODIFY - It is just an include |
| 3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
|
| 4 | - if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
| 3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { |
|
| 4 | + if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
| 5 | 5 | require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; |
| 6 | 6 | } |
| 7 | 7 | ?> |
@@ -1,7 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // File generated to link to the master file - DO NOT MODIFY - It is just an include |
| 3 | 3 | if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
| 4 | - if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
| 4 | + if (! defined('USEEXTERNALSERVER')) { |
|
| 5 | + define('USEEXTERNALSERVER', 1); |
|
| 6 | + } |
|
| 5 | 7 | require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; |
| 6 | 8 | } |
| 7 | 9 | ?> |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php // BEGIN PHP |
| 2 | -$websitekey=basename(__DIR__); |
|
| 3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
| 2 | +$websitekey = basename(__DIR__); |
|
| 3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
| 4 | 4 | require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php'; |
| 5 | 5 | require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php'; |
| 6 | 6 | ob_start(); |
| 7 | -if (! headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
| 7 | +if (!headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
| 8 | 8 | header('Cache-Control: max-age=3600, public, must-revalidate'); |
| 9 | 9 | header('Content-type: text/css'); |
| 10 | 10 | } |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // File generated to link to the master file - DO NOT MODIFY - It is just an include |
| 3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
|
| 4 | - if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
| 3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { |
|
| 4 | + if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
| 5 | 5 | require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; |
| 6 | 6 | } |
@@ -1,6 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | // File generated to link to the master file - DO NOT MODIFY - It is just an include |
| 3 | 3 | if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
| 4 | - if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
| 4 | + if (! defined('USEEXTERNALSERVER')) { |
|
| 5 | + define('USEEXTERNALSERVER', 1); |
|
| 6 | + } |
|
| 5 | 7 | require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; |
| 6 | 8 | } |
@@ -56,16 +56,16 @@ |
||
| 56 | 56 | // Editing global variables not related to a specific theme |
| 57 | 57 | $constantes = array( |
| 58 | 58 | 'MEMBER_REMINDER_EMAIL'=>array('type'=>'yesno', 'label'=>$langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))), |
| 59 | - 'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 60 | - 'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 61 | - 'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 62 | - 'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 63 | - 'ADHERENT_EMAIL_TEMPLATE_CANCELATION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 64 | - 'ADHERENT_EMAIL_TEMPLATE_EXCLUSION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
| 65 | - 'ADHERENT_MAIL_FROM' =>array('type'=>'string','label'=>''), |
|
| 66 | - 'ADHERENT_CC_MAIL_FROM' =>array('type'=>'string','label'=>''), |
|
| 67 | - 'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT' =>array('type'=>'string','label'=>''), |
|
| 68 | - 'ADHERENT_AUTOREGISTER_NOTIF_MAIL' =>array('type'=>'html', 'tooltip'=>$helptext,'label'=>'') |
|
| 59 | + 'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 60 | + 'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 61 | + 'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 62 | + 'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 63 | + 'ADHERENT_EMAIL_TEMPLATE_CANCELATION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 64 | + 'ADHERENT_EMAIL_TEMPLATE_EXCLUSION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
| 65 | + 'ADHERENT_MAIL_FROM' =>array('type'=>'string', 'label'=>''), |
|
| 66 | + 'ADHERENT_CC_MAIL_FROM' =>array('type'=>'string', 'label'=>''), |
|
| 67 | + 'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT' =>array('type'=>'string', 'label'=>''), |
|
| 68 | + 'ADHERENT_AUTOREGISTER_NOTIF_MAIL' =>array('type'=>'html', 'tooltip'=>$helptext, 'label'=>'') |
|
| 69 | 69 | ); |
| 70 | 70 | |
| 71 | 71 | |
@@ -802,7 +802,7 @@ discard block |
||
| 802 | 802 | |
| 803 | 803 | if (!empty($object->refuse_note)) { |
| 804 | 804 | $object->actionmsg .= '<br>'; |
| 805 | - $object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note; |
|
| 805 | + $object->actionmsg .= $langs->trans("Reason").': '.$object->refuse_note; |
|
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | $object->sendtoid = 0; |
@@ -823,7 +823,7 @@ discard block |
||
| 823 | 823 | |
| 824 | 824 | if (!empty($object->cancel_note)) { |
| 825 | 825 | $object->actionmsg .= '<br>'; |
| 826 | - $object->actionmsg .= $langs->trans("Reason") . ': '.$object->cancel_note; |
|
| 826 | + $object->actionmsg .= $langs->trans("Reason").': '.$object->cancel_note; |
|
| 827 | 827 | } |
| 828 | 828 | |
| 829 | 829 | $object->sendtoid = 0; |
@@ -844,7 +844,7 @@ discard block |
||
| 844 | 844 | |
| 845 | 845 | if (!empty($object->context['comments'])) { |
| 846 | 846 | $object->actionmsg .= '<br>'; |
| 847 | - $object->actionmsg .= $langs->trans("Comment") . ': '.$object->context['comments']; |
|
| 847 | + $object->actionmsg .= $langs->trans("Comment").': '.$object->context['comments']; |
|
| 848 | 848 | } |
| 849 | 849 | |
| 850 | 850 | $object->sendtoid = 0; |
@@ -1472,8 +1472,8 @@ discard block |
||
| 1472 | 1472 | $actioncomm = new ActionComm($this->db); |
| 1473 | 1473 | $actioncomm->type_code = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...) |
| 1474 | 1474 | $actioncomm->code = 'AC_'.$action; |
| 1475 | - $actioncomm->label = $object->actionmsg2; // Label of event |
|
| 1476 | - $actioncomm->note_private = $object->actionmsg; // Description |
|
| 1475 | + $actioncomm->label = $object->actionmsg2; // Label of event |
|
| 1476 | + $actioncomm->note_private = $object->actionmsg; // Description |
|
| 1477 | 1477 | $actioncomm->fk_project = $projectid; |
| 1478 | 1478 | $actioncomm->datep = $now; |
| 1479 | 1479 | $actioncomm->datef = $now; |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | // the default behaviour but there is no way to change keeping old saved date compatible. |
| 210 | 210 | $tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT'); |
| 211 | 211 | // Local time should be used to prevent users in time zones earlier than GMT from being one day earlier |
| 212 | - $prefix = ";VALUE=DATE"; |
|
| 212 | + $prefix = ";VALUE=DATE"; |
|
| 213 | 213 | if ($tzforfullday) { |
| 214 | 214 | $startdatef = dol_print_date($startdate, "dayxcard", 'gmt'); |
| 215 | 215 | } else { |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | $enddatef = dol_print_date($enddate, "dayhourxcard", 'gmt'); |
| 238 | 238 | |
| 239 | 239 | if ($fulldayevent) { |
| 240 | - $prefix = ";VALUE=DATE"; |
|
| 240 | + $prefix = ";VALUE=DATE"; |
|
| 241 | 241 | // We add 1 second so we reach the +1 day needed for full day event (DTEND must be next day after event) |
| 242 | 242 | // This is mention in https://datatracker.ietf.org/doc/html/rfc5545: |
| 243 | 243 | // "The "DTEND" property for a "VEVENT" calendar component specifies the non-inclusive end of the event." |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | $head[$h][0] = DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id; |
| 101 | 101 | $head[$h][1] = $langs->trans("Events"); |
| 102 | - if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
| 102 | + if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
| 103 | 103 | $nbEvent = 0; |
| 104 | 104 | // Enable caching of thirdparty count actioncomm |
| 105 | 105 | require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | } else { |
| 120 | 120 | dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR); |
| 121 | 121 | } |
| 122 | - dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
| 122 | + dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | $head[$h][1] .= '/'; |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | |
| 132 | 132 | $head[$h][0] = DOL_URL_ROOT.'/commande/agenda.php?id='.$object->id; |
| 133 | 133 | $head[$h][1] = $langs->trans("Events"); |
| 134 | - if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
| 134 | + if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
| 135 | 135 | $nbEvent = 0; |
| 136 | 136 | // Enable caching of thirdparty count actioncomm |
| 137 | 137 | require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | } else { |
| 152 | 152 | dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR); |
| 153 | 153 | } |
| 154 | - dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
| 154 | + dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | $head[$h][1] .= '/'; |