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

Fixing style errors.

Browse Source
This commit is contained in:
stickler-ci 2021-12-23 12:45:26 +00:00
parent 5dd0aa0549
commit a2cb020394
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -2068,7 +2068,7 @@ class EmailCollector extends CommonObject
$this->error = 'Failed to create ticket: '.$langs->trans($tickettocreate->error); $this->error = 'Failed to create ticket: '.$langs->trans($tickettocreate->error);
$this->errors = $tickettocreate->errors; $this->errors = $tickettocreate->errors;
} else { } else {
if($attachments) { if ($attachments) {
$destdir = $conf->ticket->dir_output.'/'.$tickettocreate->ref; $destdir = $conf->ticket->dir_output.'/'.$tickettocreate->ref;
if (!dol_is_dir($destdir)) { if (!dol_is_dir($destdir)) {
dol_mkdir($destdir); dol_mkdir($destdir);
@ -2298,7 +2298,7 @@ class EmailCollector extends CommonObject
* @param string $mid prefix * @param string $mid prefix
* @return array Array with number and object * @return array Array with number and object
*/ */
private function getmsg($mbox, $mid, $destdir='') private function getmsg($mbox, $mid, $destdir = '')
{ {
// input $mbox = IMAP stream, $mid = message id // input $mbox = IMAP stream, $mid = message id
// output all the following: // output all the following:
@ -2348,7 +2348,7 @@ class EmailCollector extends CommonObject
* @param string $partno Partno * @param string $partno Partno
* @return void * @return void
*/ */
private function getpart($mbox, $mid, $p, $partno, $destdir='') private function getpart($mbox, $mid, $p, $partno, $destdir = '')
{ {
// $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple // $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
global $htmlmsg, $plainmsg, $charset, $attachments; global $htmlmsg, $plainmsg, $charset, $attachments;
@ -2386,11 +2386,11 @@ class EmailCollector extends CommonObject
$filename = ($params['filename']) ? $params['filename'] : $params['name']; $filename = ($params['filename']) ? $params['filename'] : $params['name'];
// filename may be encoded, so see imap_mime_header_decode() // filename may be encoded, so see imap_mime_header_decode()
$attachments[$filename] = $data; // this is a problem if two files have same name $attachments[$filename] = $data; // this is a problem if two files have same name
// Get file name (with extension) // Get file name (with extension)
$file_name_complete = $params['filename']; $file_name_complete = $params['filename'];
$destination = $destdir.'/'.$file_name_complete; $destination = $destdir.'/'.$file_name_complete;
// Extract file extension // Extract file extension
@ -2407,7 +2407,7 @@ class EmailCollector extends CommonObject
/** /**
* Check if the same file name already exists in the upload folder, * Check if the same file name already exists in the upload folder,
* append increment number to the original filename * append increment number to the original filename
*/ */
while (file_exists($destdir."/" . $file_name . "." . $extension)) { while (file_exists($destdir."/" . $file_name . "." . $extension)) {
$file_name = (string) $file_name_original . ' (' . $num . ')'; $file_name = (string) $file_name_original . ' (' . $num . ')';
@ -2418,7 +2418,6 @@ class EmailCollector extends CommonObject
file_put_contents($destination, $data); file_put_contents($destination, $data);
} }
// TEXT // TEXT

4
htdocs/main.inc.php
View File

@ -1744,9 +1744,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
} }
} }
} }
//If you want to load custom javascript file from your selected theme directory //If you want to load custom javascript file from your selected theme directory
if (!empty($conf->global->ALLOW_THEME_JS)) { if (!empty($conf->global->ALLOW_THEME_JS)) {
$theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0); $theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0);
if (file_exists($theme_js)) { if (file_exists($theme_js)) {
print '<script src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js'.($ext ? '?'.$ext : '').'"></script>'."\n";