@@ -153,8 +153,8 @@ discard block |
||
153 | 153 | /** |
154 | 154 | * @var int Thirdparty ID |
155 | 155 | */ |
156 | - public $socid; // both socid and fk_soc are used |
|
157 | - public $fk_soc; // both socid and fk_soc are used |
|
156 | + public $socid; // both socid and fk_soc are used |
|
157 | + public $fk_soc; // both socid and fk_soc are used |
|
158 | 158 | |
159 | 159 | /** |
160 | 160 | * @var int Status |
@@ -936,7 +936,7 @@ discard block |
||
936 | 936 | $this->date_creation = $this->db->jdate($obj->datec); |
937 | 937 | $this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem); |
938 | 938 | if (!empty($obj->datev)) { |
939 | - $this->date_validation = empty($obj->datev) ? '' : $this->db->jdate($obj->datev); |
|
939 | + $this->date_validation = empty($obj->datev) ? '' : $this->db->jdate($obj->datev); |
|
940 | 940 | } |
941 | 941 | } |
942 | 942 |
@@ -115,9 +115,9 @@ |
||
115 | 115 | |
116 | 116 | $now = dol_now(); |
117 | 117 | |
118 | -$title = $object->ref . ' - ' . $langs->trans("Notes"); |
|
118 | +$title = $object->ref.' - '.$langs->trans("Notes"); |
|
119 | 119 | if (!empty($withproject)) { |
120 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
120 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
121 | 121 | } |
122 | 122 | $help_url = ''; |
123 | 123 |
@@ -121,9 +121,9 @@ |
||
121 | 121 | */ |
122 | 122 | $form = new Form($db); |
123 | 123 | |
124 | -$title = $object->ref . ' - ' . $langs->trans("Documents"); |
|
124 | +$title = $object->ref.' - '.$langs->trans("Documents"); |
|
125 | 125 | if (!empty($withproject)) { |
126 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
126 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
127 | 127 | } |
128 | 128 | $help_url = ''; |
129 | 129 |
@@ -146,9 +146,9 @@ |
||
146 | 146 | $userstatic = new User($db); |
147 | 147 | $result = $projectstatic->fetch($object->fk_project); |
148 | 148 | |
149 | -$title = $object->ref . ' - ' . $langs->trans("Contacts"); |
|
149 | +$title = $object->ref.' - '.$langs->trans("Contacts"); |
|
150 | 150 | if (!empty($withproject)) { |
151 | - $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '') ; |
|
151 | + $title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : ''); |
|
152 | 152 | } |
153 | 153 | $help_url = ''; |
154 | 154 |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $actionType = 'delete'; |
63 | 63 | $n++; |
64 | 64 | $id = 'mybuttonid'.$n; |
65 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
65 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
66 | 66 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
67 | 67 | |
68 | 68 | |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $actionType = 'danger'; |
71 | 71 | $n++; |
72 | 72 | $id = 'mybuttonid'.$n; |
73 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
73 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
74 | 74 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
75 | 75 | |
76 | 76 | ?> |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $actionType = 'delete'; |
96 | 96 | $n++; |
97 | 97 | $id = 'mybuttonid'.$n; |
98 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
98 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
99 | 99 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
100 | 100 | |
101 | 101 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | $actionType = 'danger'; |
104 | 104 | $n++; |
105 | 105 | $id = 'mybuttonid'.$n; |
106 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
106 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
107 | 107 | print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight); |
108 | 108 | |
109 | 109 | ?> |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | $actionType = 'delete'; |
135 | 135 | $n++; |
136 | 136 | $id = 'mybuttonid'.$n; |
137 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
137 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
138 | 138 | |
139 | 139 | $params = array( |
140 | 140 | 'confirm' => array( |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | $actionType = 'delete'; |
174 | 174 | $n++; |
175 | 175 | $id = 'mybuttonid'.$n; |
176 | - $url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id; |
|
176 | + $url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id; |
|
177 | 177 | |
178 | 178 | $params = array( |
179 | 179 | 'confirm' => array( |
@@ -328,7 +328,7 @@ |
||
328 | 328 | |
329 | 329 | foreach ($arrayofvat[$key] as $k => $mt) { |
330 | 330 | if ($mt) { |
331 | - $accountingaccount->fetch(null, $k, true); // TODO Use a cache for label |
|
331 | + $accountingaccount->fetch(null, $k, true); // TODO Use a cache for label |
|
332 | 332 | $account_label = $accountingaccount->label; |
333 | 333 | |
334 | 334 | // get compte id and label |
@@ -46,7 +46,7 @@ |
||
46 | 46 | $error = 0; |
47 | 47 | $connect_id = null; |
48 | 48 | $newsectioniso = ''; |
49 | - $mesg=""; |
|
49 | + $mesg = ""; |
|
50 | 50 | |
51 | 51 | if (!is_numeric($ftp_port)) { |
52 | 52 | $mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port); |
@@ -93,7 +93,7 @@ |
||
93 | 93 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetcard'; // To manage different context of search |
94 | 94 | $backtopage = GETPOST('backtopage', 'alpha'); |
95 | 95 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
96 | -$lineid = GETPOST('lineid', 'int'); |
|
96 | +$lineid = GETPOST('lineid', 'int'); |
|
97 | 97 | |
98 | 98 | // Initialize technical objects |
99 | 99 | $object = new Target($db); |
@@ -1079,8 +1079,8 @@ discard block |
||
1079 | 1079 | $stringtoexport = str_replace('file=js/'.$website->ref.'/', "file=js/__WEBSITE_KEY__/", $stringtoexport); |
1080 | 1080 | $stringtoexport = str_replace('medias/image/'.$website->ref.'/', "medias/image/__WEBSITE_KEY__/", $stringtoexport); |
1081 | 1081 | $stringtoexport = str_replace('medias/js/'.$website->ref.'/', "medias/js/__WEBSITE_KEY__/", $stringtoexport); |
1082 | - $stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="image/websiteref/file.png" into html content |
|
1083 | - $stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="/image/websiteref/file.png" into html content |
|
1082 | + $stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="image/websiteref/file.png" into html content |
|
1083 | + $stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="/image/websiteref/file.png" into html content |
|
1084 | 1084 | $stringtoexport = str_replace('"js/'.$website->ref.'/', '"js/__WEBSITE_KEY__/', $stringtoexport); |
1085 | 1085 | $stringtoexport = str_replace('"/js/'.$website->ref.'/', '"/js/__WEBSITE_KEY__/', $stringtoexport); |
1086 | 1086 | |
@@ -1351,7 +1351,7 @@ discard block |
||
1351 | 1351 | foreach ($aliasesarray as $aliasshortcuttocreate) { |
1352 | 1352 | if (trim($aliasshortcuttocreate)) { |
1353 | 1353 | $filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php'; |
1354 | - $result = dolSavePageAlias($filealias, $object, $objectpagestatic); // This includes also a copy into sublanguage directories. |
|
1354 | + $result = dolSavePageAlias($filealias, $object, $objectpagestatic); // This includes also a copy into sublanguage directories. |
|
1355 | 1355 | if (!$result) { |
1356 | 1356 | $this->errors[] = 'Failed to write file '.basename($filealias); |
1357 | 1357 | $error++; |
@@ -1372,7 +1372,7 @@ discard block |
||
1372 | 1372 | $filetpl = $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php'; |
1373 | 1373 | } |
1374 | 1374 | $filewrapper = $pathofwebsite.'/wrapper.php'; |
1375 | - dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object); // This includes also a version of index.php into sublanguage directories |
|
1375 | + dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object); // This includes also a version of index.php into sublanguage directories |
|
1376 | 1376 | } |
1377 | 1377 | |
1378 | 1378 | if ($error) { |