@@ -156,7 +156,7 @@ |
||
| 156 | 156 | $textright = make_substitutions(getDolGlobalString('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 | } |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | //include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; |
| 463 | 463 | |
| 464 | 464 | |
| 465 | -if (! ($object->id > 0)) { |
|
| 465 | +if (!($object->id > 0)) { |
|
| 466 | 466 | $langs->load("errors"); |
| 467 | 467 | print $langs->trans("ErrorRecordNotFound"); |
| 468 | 468 | } |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | |
| 1011 | 1011 | if ($adht->subscription) { |
| 1012 | 1012 | // Amount |
| 1013 | - print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : price($adht->amount, 0, '', 0)).'"> '.$langs->trans("Currency".$conf->currency) .'</td></tr>'; |
|
| 1013 | + print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : price($adht->amount, 0, '', 0)).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; |
|
| 1014 | 1014 | |
| 1015 | 1015 | // Label |
| 1016 | 1016 | print '<tr><td>'.$langs->trans("Label").'</td>'; |
@@ -1089,7 +1089,7 @@ discard block |
||
| 1089 | 1089 | if (!getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') || getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') != 'defaultforfoundationcountry') { |
| 1090 | 1090 | print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>'; |
| 1091 | 1091 | } |
| 1092 | - if (getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && (isModEnabled('product')|| isModEnabled('service'))) { |
|
| 1092 | + if (getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && (isModEnabled('product') || isModEnabled('service'))) { |
|
| 1093 | 1093 | $prodtmp = new Product($db); |
| 1094 | 1094 | $result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS); |
| 1095 | 1095 | if ($result < 0) { |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | $this->amount = $obj->amount; |
| 518 | 518 | $this->caneditamount = $obj->caneditamount; |
| 519 | 519 | $this->mail_valid = $obj->mail_valid; |
| 520 | - $this->note = $obj->note_public; // deprecated |
|
| 520 | + $this->note = $obj->note_public; // deprecated |
|
| 521 | 521 | $this->note_public = $obj->note_public; |
| 522 | 522 | $this->vote = $obj->vote; |
| 523 | 523 | |
@@ -716,7 +716,7 @@ discard block |
||
| 716 | 716 | } elseif ($this->duration_value > 0) { |
| 717 | 717 | $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year")); |
| 718 | 718 | } |
| 719 | - $datas['duration'] .= " " . (!empty($this->duration_unit) && isset($dur[$this->duration_unit]) ? $langs->trans($dur[$this->duration_unit]) : ''); |
|
| 719 | + $datas['duration'] .= " ".(!empty($this->duration_unit) && isset($dur[$this->duration_unit]) ? $langs->trans($dur[$this->duration_unit]) : ''); |
|
| 720 | 720 | } |
| 721 | 721 | |
| 722 | 722 | return $datas; |
@@ -841,13 +841,13 @@ discard block |
||
| 841 | 841 | global $conf; |
| 842 | 842 | $dn = ''; |
| 843 | 843 | if ($mode == 0) { |
| 844 | - $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES') . "=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')]."," . getDolGlobalString('LDAP_MEMBER_TYPE_DN'); |
|
| 844 | + $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')."=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')].",".getDolGlobalString('LDAP_MEMBER_TYPE_DN'); |
|
| 845 | 845 | } |
| 846 | 846 | if ($mode == 1) { |
| 847 | 847 | $dn = getDolGlobalString('LDAP_MEMBER_TYPE_DN'); |
| 848 | 848 | } |
| 849 | 849 | if ($mode == 2) { |
| 850 | - $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES') . "=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')]; |
|
| 850 | + $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')."=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')]; |
|
| 851 | 851 | } |
| 852 | 852 | return $dn; |
| 853 | 853 | } |
@@ -296,14 +296,14 @@ |
||
| 296 | 296 | return $this->binaryOpManipulator->matchFirstAndSecondConditionNode( |
| 297 | 297 | $booleanAnd, |
| 298 | 298 | // Function to check if we are in the case $conf->global->... == $value |
| 299 | - function (Node $node): bool { |
|
| 299 | + function(Node $node): bool { |
|
| 300 | 300 | if (!$node instanceof Equal) { |
| 301 | 301 | return \false; |
| 302 | 302 | } |
| 303 | 303 | return $this->isGlobalVar($node->left); |
| 304 | 304 | }, |
| 305 | 305 | // !empty(...) || isset(...) |
| 306 | - function (Node $node): bool { |
|
| 306 | + function(Node $node): bool { |
|
| 307 | 307 | if ($node instanceof BooleanNot && $node->expr instanceof Empty_) { |
| 308 | 308 | return $this->isGlobalVar($node->expr->expr); |
| 309 | 309 | } |