@@ -136,8 +136,12 @@ |
||
| 136 | 136 | //if ($user->socid > 0) $socid = $user->socid; |
| 137 | 137 | //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
| 138 | 138 | //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft); |
| 139 | -if (empty($conf->hrm->enabled)) accessforbidden(); |
|
| 140 | -if (!$permissiontoread) accessforbidden(); |
|
| 139 | +if (empty($conf->hrm->enabled)) { |
|
| 140 | + accessforbidden(); |
|
| 141 | +} |
|
| 142 | +if (!$permissiontoread) { |
|
| 143 | + accessforbidden(); |
|
| 144 | +} |
|
| 141 | 145 | |
| 142 | 146 | |
| 143 | 147 | /* |
@@ -29,8 +29,8 @@ discard block |
||
| 29 | 29 | // Load Dolibarr environment |
| 30 | 30 | require '../main.inc.php'; |
| 31 | 31 | |
| 32 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
| 33 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php'; |
|
| 32 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
| 33 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php'; |
|
| 34 | 34 | |
| 35 | 35 | // Load translation files required by the page |
| 36 | 36 | $langs->loadLangs(array('hrm', 'companies')); |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
| 107 | 107 | |
| 108 | 108 | $morehtmlref = '<div class="refid">'; |
| 109 | - $morehtmlref.= $object->label; |
|
| 109 | + $morehtmlref .= $object->label; |
|
| 110 | 110 | $morehtmlref .= '</div>'; |
| 111 | 111 | |
| 112 | 112 | |
@@ -136,8 +136,12 @@ |
||
| 136 | 136 | //if ($user->socid > 0) $socid = $user->socid; |
| 137 | 137 | //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0); |
| 138 | 138 | //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft); |
| 139 | -if (empty($conf->hrm->enabled)) accessforbidden(); |
|
| 140 | -if (!$permissiontoread) accessforbidden(); |
|
| 139 | +if (empty($conf->hrm->enabled)) { |
|
| 140 | + accessforbidden(); |
|
| 141 | +} |
|
| 142 | +if (!$permissiontoread) { |
|
| 143 | + accessforbidden(); |
|
| 144 | +} |
|
| 141 | 145 | |
| 142 | 146 | |
| 143 | 147 | /* |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; |
| 35 | 35 | require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php'; |
| 36 | 36 | require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php'; |
| 37 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
| 37 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
| 38 | 38 | |
| 39 | 39 | |
| 40 | 40 | // Load translation files required by the page |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | $filters['search_agenda_label'] = $search_agenda_label; |
| 228 | 228 | $filters['search_rowid'] = $search_rowid; |
| 229 | 229 | |
| 230 | - $object->fields['label']=array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly) |
|
| 230 | + $object->fields['label'] = array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly) |
|
| 231 | 231 | |
| 232 | 232 | // TODO Replace this with same code than into list.php |
| 233 | 233 | show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | llxHeader('', $title, '', '', 0, 0, $arrayjs); |
| 78 | 78 | |
| 79 | -print load_fiche_titre($title, '', $memberstatic->picto); |
|
| 79 | +print load_fiche_titre($title, '', $memberstatic->picto); |
|
| 80 | 80 | |
| 81 | 81 | //dol_mkdir($dir); |
| 82 | 82 | |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | if ($mode == 'memberbyregion') { //+ |
| 173 | 173 | $data[] = array( |
| 174 | 174 | 'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')), |
| 175 | - 'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label :'<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')), |
|
| 175 | + 'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')), |
|
| 176 | 176 | 'label2'=>($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'), |
| 177 | 177 | 'nb'=>$obj->nb, |
| 178 | 178 | 'lastdate'=>$db->jdate($obj->lastdate), |
@@ -156,7 +156,7 @@ |
||
| 156 | 156 | $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray); |
| 157 | 157 | |
| 158 | 158 | if (is_numeric($foruserid) || $foruserlogin) { |
| 159 | - $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY']; // $_Avery_Labels is defined into an include |
|
| 159 | + $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY']; // $_Avery_Labels is defined into an include |
|
| 160 | 160 | if ($nb <= 0) { |
| 161 | 161 | $nb = 1; // Protection to avoid empty page |
| 162 | 162 | } |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | |
| 75 | 75 | // update of object |
| 76 | 76 | if ($forcelangprod == $current_lang) { |
| 77 | - $object->label = GETPOST("libelle", 'alphanohtml'); |
|
| 77 | + $object->label = GETPOST("libelle", 'alphanohtml'); |
|
| 78 | 78 | $object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml')); |
| 79 | 79 | //$object->other = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml')); |
| 80 | 80 | } else { |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | $sql .= ", s.canvas, s.tms as date_modification, s.status as status"; |
| 276 | 276 | $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; |
| 277 | 277 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
| 278 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
| 278 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
| 279 | 279 | } |
| 280 | 280 | if (empty($user->rights->societe->client->voir) && !$socid) { |
| 281 | 281 | $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | $sql .= $db->plimit($max, 0); |
| 295 | 295 | |
| 296 | 296 | //print $sql; |
| 297 | -$lastmodified=""; |
|
| 297 | +$lastmodified = ""; |
|
| 298 | 298 | $result = $db->query($sql); |
| 299 | 299 | if ($result) { |
| 300 | 300 | $num = $db->num_rows($result); |
@@ -109,7 +109,7 @@ |
||
| 109 | 109 | $sql .= " AND e.fk_statut = 1"; |
| 110 | 110 | } |
| 111 | 111 | if ($user->socid > 0) { |
| 112 | - $sql.= " AND s.rowid = ".((int) $user->socid); |
|
| 112 | + $sql .= " AND s.rowid = ".((int) $user->socid); |
|
| 113 | 113 | } |
| 114 | 114 | if (empty($user->rights->societe->client->voir) && !$user->socid) { |
| 115 | 115 | $sql .= " AND sc.fk_user = ".((int) $user->id); |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON sp.fk_pays = co.rowid"; |
| 102 | 102 | $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid"; |
| 103 | 103 | if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) { |
| 104 | - $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity); |
|
| 104 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity); |
|
| 105 | 105 | } |
| 106 | 106 | if (empty($user->rights->societe->client->voir) && !$user->socid) { |
| 107 | 107 | $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; |
@@ -644,7 +644,7 @@ |
||
| 644 | 644 | include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; |
| 645 | 645 | |
| 646 | 646 | $urlendpoint = 'http://api.currencylayer.com/live?access_key='.$key; |
| 647 | - $urlendpoint .= '&source=' . (empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE); |
|
| 647 | + $urlendpoint .= '&source='.(empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE); |
|
| 648 | 648 | |
| 649 | 649 | dol_syslog("Call url endpoint ".$urlendpoint); |
| 650 | 650 | |