@@ -1013,7 +1013,7 @@ discard block |
||
1013 | 1013 | $list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed; |
1014 | 1014 | $list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique; |
1015 | 1015 | $list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired; |
1016 | - $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1016 | + $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1017 | 1017 | $list[$tab->elementtype][$tab->name]['pos'] = $tab->pos; |
1018 | 1018 | $list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable; |
1019 | 1019 | $list[$tab->elementtype][$tab->name]['perms'] = $tab->perms; |
@@ -1796,13 +1796,13 @@ discard block |
||
1796 | 1796 | throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile); |
1797 | 1797 | } |
1798 | 1798 | } else { |
1799 | - $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into filecheck.php. |
|
1799 | + $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into filecheck.php. |
|
1800 | 1800 | |
1801 | 1801 | // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...) |
1802 | 1802 | if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') { |
1803 | 1803 | $xmlfile = $xmlarray['content']; |
1804 | 1804 | //print "xmlfilestart".$xmlfile."endxmlfile"; |
1805 | - $xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET); |
|
1805 | + $xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET); |
|
1806 | 1806 | } else { |
1807 | 1807 | $errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg']; |
1808 | 1808 | throw new RestException(500, $errormsg); |
@@ -142,7 +142,7 @@ |
||
142 | 142 | |
143 | 143 | <div class="tagtd nowrap noborderbottom"> |
144 | 144 | <?php |
145 | - $selectedCompany = GETPOSTISSET("newcompany") ? GETPOST("newcompany", 'int') : (empty($object->socid) ? 0 : $object->socid); |
|
145 | + $selectedCompany = GETPOSTISSET("newcompany") ? GETPOST("newcompany", 'int') : (empty($object->socid) ? 0 : $object->socid); |
|
146 | 146 | $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?> |
147 | 147 | </div> |
148 | 148 | <div class="tagtd noborderbottom minwidth500imp"> |
@@ -152,7 +152,7 @@ |
||
152 | 152 | while ($i < $num) { |
153 | 153 | $objp = $db->fetch_object($resql); |
154 | 154 | $listofoppstatus[$objp->rowid] = $objp->percent; |
155 | - $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found. |
|
155 | + $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found. |
|
156 | 156 | $listofoppcode[$objp->rowid] = $objp->code; |
157 | 157 | switch ($objp->code) { |
158 | 158 | case 'PROSP': |
@@ -251,9 +251,9 @@ discard block |
||
251 | 251 | $thirdparty = new Societe($db); |
252 | 252 | $resultfetchthirdparty = $thirdparty->fetch('', $societe); |
253 | 253 | |
254 | - if ($resultfetchthirdparty<=0) { |
|
254 | + if ($resultfetchthirdparty <= 0) { |
|
255 | 255 | // Need to create a new one (not found or multiple with the same name) |
256 | - $thirdparty->name = $societe; |
|
256 | + $thirdparty->name = $societe; |
|
257 | 257 | $thirdparty->address = GETPOST("address"); |
258 | 258 | $thirdparty->zip = GETPOST("zipcode"); |
259 | 259 | $thirdparty->town = GETPOST("town"); |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | } |
283 | 283 | $thirdparty->code_client = $tmpcode; |
284 | 284 | $readythirdparty = $thirdparty->create($user); |
285 | - if ($readythirdparty <0) { |
|
285 | + if ($readythirdparty < 0) { |
|
286 | 286 | $error++; |
287 | 287 | $errmsg .= $thirdparty->error; |
288 | 288 | } else { |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | if (!$error) { |
295 | 295 | $contact = new Contact($db); |
296 | 296 | $resultcontact = $contact->fetch('', '', '', $email); |
297 | - if ($resultcontact<=0) { |
|
297 | + if ($resultcontact <= 0) { |
|
298 | 298 | // Need to create a contact |
299 | 299 | $contact->socid = $thirdparty->id; |
300 | 300 | $contact->lastname = (string) GETPOST("lastname", 'alpha'); |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | $contact->statut = 1; //Default status to Actif |
309 | 309 | |
310 | 310 | $resultcreatecontact = $contact->create($user); |
311 | - if ($resultcreatecontact<0) { |
|
311 | + if ($resultcreatecontact < 0) { |
|
312 | 312 | $error++; |
313 | 313 | $errmsg .= $contact->error; |
314 | 314 | } |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | |
322 | 322 | $resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH); |
323 | 323 | |
324 | - if ($resultcategory<=0) { |
|
324 | + if ($resultcategory <= 0) { |
|
325 | 325 | $error++; |
326 | 326 | $errmsg .= $category->error; |
327 | 327 | } else { |
@@ -372,13 +372,13 @@ discard block |
||
372 | 372 | $conforbooth->datec = dol_now(); |
373 | 373 | $conforbooth->tms = dol_now(); |
374 | 374 | $resultconforbooth = $conforbooth->create($user); |
375 | - if ($resultconforbooth<=0) { |
|
375 | + if ($resultconforbooth <= 0) { |
|
376 | 376 | $error++; |
377 | 377 | $errmsg .= $conforbooth->error; |
378 | 378 | } else { |
379 | 379 | // Adding the contact to the project |
380 | 380 | $resultaddcontact = $conforbooth->add_contact($contact->id, 'RESPONSIBLE'); |
381 | - if ($resultaddcontact<0) { |
|
381 | + if ($resultaddcontact < 0) { |
|
382 | 382 | $error++; |
383 | 383 | $errmsg .= $conforbooth->error; |
384 | 384 | } else { |
@@ -774,7 +774,7 @@ |
||
774 | 774 | $hashtags = trim(join(' #', array_map('trim', explode(',', $websitepage->keywords)))); |
775 | 775 | |
776 | 776 | // Open Graph |
777 | - $out .= '<meta name="og:type" content="website">'."\n"; // TODO If blogpost, use type article |
|
777 | + $out .= '<meta name="og:type" content="website">'."\n"; // TODO If blogpost, use type article |
|
778 | 778 | $out .= '<meta name="og:title" content="'.$websitepage->title.'">'."\n"; |
779 | 779 | if ($websitepage->image) { |
780 | 780 | $out .= '<meta name="og:image" content="'.$website->virtualhost.$image.'">'."\n"; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $sql .= ", s.fk_forme_juridique , s.fk_pays , s.phone , s.fax , f.datec , f.fk_soc , cp.label as country "; |
140 | 140 | $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; |
141 | 141 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
142 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
142 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
143 | 143 | } |
144 | 144 | $sql .= ", ".MAIN_DB_PREFIX."facture as f"; |
145 | 145 | $sql .= ", ".MAIN_DB_PREFIX."c_country as cp"; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $sql .= " s.fk_forme_juridique , s.fk_pays , s.phone , s.fax , ff.datec , ff.fk_soc , cp.label as country "; |
164 | 164 | $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; |
165 | 165 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
166 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
166 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
167 | 167 | } |
168 | 168 | $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as ff"; |
169 | 169 | $sql .= ", ".MAIN_DB_PREFIX."c_country as cp"; |
@@ -58,8 +58,8 @@ |
||
58 | 58 | |
59 | 59 | require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; |
60 | 60 | require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; |
61 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php'; |
|
62 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; |
|
61 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php'; |
|
62 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php'; |
|
63 | 63 | |
64 | 64 | // Load translation files required by the page |
65 | 65 | $langs->loadLangs(array("hrm", "companies", "other", "mails")); |
@@ -58,8 +58,8 @@ |
||
58 | 58 | |
59 | 59 | require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; |
60 | 60 | require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; |
61 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php'; |
|
62 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_evaluation.lib.php'; |
|
61 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/evaluation.class.php'; |
|
62 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_evaluation.lib.php'; |
|
63 | 63 | |
64 | 64 | // Load translation files required by the page |
65 | 65 | $langs->loadLangs(array("hrm", "companies", "other", "mails")); |
@@ -81,9 +81,9 @@ |
||
81 | 81 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
82 | 82 | require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; |
83 | 83 | require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; |
84 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php'; |
|
85 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php'; |
|
86 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
84 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php'; |
|
85 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php'; |
|
86 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
87 | 87 | |
88 | 88 | // Load translation files required by the page |
89 | 89 | $langs->loadLangs(array("hrm", "companies", "other", "mails")); |