@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $this->db = $db; |
82 | 82 | } |
83 | 83 | |
84 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName |
|
84 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName |
|
85 | 85 | /** |
86 | 86 | * Check access |
87 | 87 | * |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function __isAllowed() |
94 | 94 | { |
95 | - // phpcs:enable |
|
95 | + // phpcs:enable |
|
96 | 96 | global $conf, $db, $user; |
97 | 97 | |
98 | 98 | $login = ''; |
@@ -229,13 +229,13 @@ discard block |
||
229 | 229 | return in_array(static::$role, (array) $requirefortest) || static::$role == 'admin'; |
230 | 230 | } |
231 | 231 | |
232 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName |
|
232 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName |
|
233 | 233 | /** |
234 | 234 | * @return string string to be used with WWW-Authenticate header |
235 | 235 | */ |
236 | 236 | public function __getWWWAuthenticateString() |
237 | 237 | { |
238 | - // phpcs:enable |
|
238 | + // phpcs:enable |
|
239 | 239 | return ''; |
240 | 240 | } |
241 | 241 |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | return $list; |
725 | 725 | } |
726 | 726 | |
727 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
727 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
728 | 728 | /** |
729 | 729 | * Clean sensible object datas |
730 | 730 | * |
@@ -733,7 +733,7 @@ discard block |
||
733 | 733 | */ |
734 | 734 | protected function _cleanObjectDatas($object) |
735 | 735 | { |
736 | - // phpcs:enable |
|
736 | + // phpcs:enable |
|
737 | 737 | $object = parent::_cleanObjectDatas($object); |
738 | 738 | |
739 | 739 | unset($object->error); |
@@ -1401,7 +1401,6 @@ discard block |
||
1401 | 1401 | } |
1402 | 1402 | |
1403 | 1403 | /** |
1404 | - |
|
1405 | 1404 | * Update Extrafield object |
1406 | 1405 | * |
1407 | 1406 | * @param string $attrname extrafield attrname |
@@ -1175,7 +1175,7 @@ discard block |
||
1175 | 1175 | $list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed; |
1176 | 1176 | $list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique; |
1177 | 1177 | $list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired; |
1178 | - $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1178 | + $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1179 | 1179 | $list[$tab->elementtype][$tab->name]['pos'] = $tab->pos; |
1180 | 1180 | $list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable; |
1181 | 1181 | $list[$tab->elementtype][$tab->name]['perms'] = $tab->perms; |
@@ -1285,7 +1285,7 @@ discard block |
||
1285 | 1285 | $answer[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed; |
1286 | 1286 | $answer[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique; |
1287 | 1287 | $answer[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired; |
1288 | - $answer[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1288 | + $answer[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1289 | 1289 | $answer[$tab->elementtype][$tab->name]['pos'] = $tab->pos; |
1290 | 1290 | $answer[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable; |
1291 | 1291 | $answer[$tab->elementtype][$tab->name]['perms'] = $tab->perms; |
@@ -2410,7 +2410,7 @@ discard block |
||
2410 | 2410 | throw new RestException(500, $langs->trans('XmlNotFound') . ': /install/' . $xmlshortfile); |
2411 | 2411 | } |
2412 | 2412 | } else { |
2413 | - $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. |
|
2413 | + $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. |
|
2414 | 2414 | |
2415 | 2415 | // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...) |
2416 | 2416 | if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') { |
@@ -158,11 +158,11 @@ |
||
158 | 158 | unset($object->barcode_type_code); |
159 | 159 | unset($object->barcode_type_label); |
160 | 160 | |
161 | - unset($object->mode_reglement); // We use mode_reglement_id now |
|
162 | - unset($object->cond_reglement); // We use cond_reglement_id now |
|
163 | - unset($object->note); // We use note_public or note_private now |
|
164 | - unset($object->contact); // We use contact_id now |
|
165 | - unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
161 | + unset($object->mode_reglement); // We use mode_reglement_id now |
|
162 | + unset($object->cond_reglement); // We use cond_reglement_id now |
|
163 | + unset($object->note); // We use note_public or note_private now |
|
164 | + unset($object->contact); // We use contact_id now |
|
165 | + unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
166 | 166 | |
167 | 167 | unset($object->projet); // Should be fk_project |
168 | 168 | unset($object->project); // Should be fk_project |
@@ -60,12 +60,12 @@ discard block |
||
60 | 60 | return $this->$newProperty; |
61 | 61 | } |
62 | 62 | if ($this->isDynamicPropertiesEnabled()) { |
63 | - return null; // If the property is set, then __get is not called. |
|
63 | + return null; // If the property is set, then __get is not called. |
|
64 | 64 | } |
65 | 65 | $msg = "DolDeprecationHandler: Undefined property '" . $name . "'" . self::getCallerInfoString(); |
66 | 66 | dol_syslog($msg); |
67 | 67 | trigger_error($msg, E_USER_NOTICE); |
68 | - return $this->$name; // Returning value anyway (graceful degradation) |
|
68 | + return $this->$name; // Returning value anyway (graceful degradation) |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | if (!$this->isDynamicPropertiesEnabled()) { |
96 | 96 | $msg = "DolDeprecationHandler: Undefined property '" . $name . "'" . self::getCallerInfoString(); |
97 | 97 | trigger_error($msg, E_USER_NOTICE); |
98 | - $this->$name = $value; // Setting anyway for graceful degradation |
|
98 | + $this->$name = $value; // Setting anyway for graceful degradation |
|
99 | 99 | } else { |
100 | 100 | $this->$name = $value; |
101 | 101 | } |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | if (property_exists($this, 'enableDeprecatedReporting')) { |
194 | 194 | // If the property exists, then we use it. |
195 | - return (bool)$this->enableDeprecatedReporting; |
|
195 | + return (bool) $this->enableDeprecatedReporting; |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | return (error_reporting() & E_DEPRECATED) === E_DEPRECATED; |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | |
210 | 210 | if (property_exists($this, 'enableDynamicProperties')) { |
211 | 211 | // If the property exists, then we use it. |
212 | - return (bool)$this->enableDynamicProperties; |
|
212 | + return (bool) $this->enableDynamicProperties; |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | // Otherwise it depends on a choice |
@@ -789,7 +789,7 @@ |
||
789 | 789 | $sql .= ", login = " . ($this->login ? "'" . $this->db->escape($this->login) . "'" : "null"); |
790 | 790 | $sql .= ", societe = " . ($this->company ? "'" . $this->db->escape($this->company) . "'" : ($this->societe ? "'" . $this->db->escape($this->societe) . "'" : "null")); |
791 | 791 | if ($this->socid) { |
792 | - $sql .= ", fk_soc = " . ($this->socid > 0 ? (int) $this->socid : "null"); // Must be modified only when creating from a third-party |
|
792 | + $sql .= ", fk_soc = " . ($this->socid > 0 ? (int) $this->socid : "null"); // Must be modified only when creating from a third-party |
|
793 | 793 | } |
794 | 794 | $sql .= ", address = " . ($this->address ? "'" . $this->db->escape($this->address) . "'" : "null"); |
795 | 795 | $sql .= ", zip = " . ($this->zip ? "'" . $this->db->escape($this->zip) . "'" : "null"); |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | } |
404 | 404 | |
405 | 405 | |
406 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
406 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
407 | 407 | /** |
408 | 408 | * Function sending an email to the current member with the text supplied in parameter. |
409 | 409 | * |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | */ |
425 | 425 | public function send_an_email($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '') |
426 | 426 | { |
427 | - // phpcs:enable |
|
427 | + // phpcs:enable |
|
428 | 428 | dol_syslog('Warning using deprecated Adherent::send_an_email', LOG_WARNING); |
429 | 429 | |
430 | 430 | return $this->sendEmail($text, $subject, $filename_list, $mimetype_list, $mimefilename_list, $addr_cc, $addr_bcc, $deliveryreceipt, $msgishtml, $errors_to, $moreinheader); |
@@ -1009,7 +1009,7 @@ discard block |
||
1009 | 1009 | } |
1010 | 1010 | |
1011 | 1011 | |
1012 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1012 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1013 | 1013 | /** |
1014 | 1014 | * Update denormalized last subscription date. |
1015 | 1015 | * This function is called when we delete a subscription for example. |
@@ -1019,7 +1019,7 @@ discard block |
||
1019 | 1019 | */ |
1020 | 1020 | public function update_end_date($user) |
1021 | 1021 | { |
1022 | - // phpcs:enable |
|
1022 | + // phpcs:enable |
|
1023 | 1023 | $this->db->begin(); |
1024 | 1024 | |
1025 | 1025 | // Search for last subscription id and end date |
@@ -1329,7 +1329,7 @@ discard block |
||
1329 | 1329 | } |
1330 | 1330 | |
1331 | 1331 | |
1332 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1332 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1333 | 1333 | /** |
1334 | 1334 | * Method to load member from its login |
1335 | 1335 | * |
@@ -1338,7 +1338,7 @@ discard block |
||
1338 | 1338 | */ |
1339 | 1339 | public function fetch_login($login) |
1340 | 1340 | { |
1341 | - // phpcs:enable |
|
1341 | + // phpcs:enable |
|
1342 | 1342 | global $conf; |
1343 | 1343 | |
1344 | 1344 | $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "adherent"; |
@@ -1356,7 +1356,7 @@ discard block |
||
1356 | 1356 | } |
1357 | 1357 | } |
1358 | 1358 | |
1359 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1359 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1360 | 1360 | /** |
1361 | 1361 | * Method to load member from its name |
1362 | 1362 | * |
@@ -1366,7 +1366,7 @@ discard block |
||
1366 | 1366 | */ |
1367 | 1367 | public function fetch_name($firstname, $lastname) |
1368 | 1368 | { |
1369 | - // phpcs:enable |
|
1369 | + // phpcs:enable |
|
1370 | 1370 | global $conf; |
1371 | 1371 | |
1372 | 1372 | $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "adherent"; |
@@ -1537,7 +1537,7 @@ discard block |
||
1537 | 1537 | } |
1538 | 1538 | |
1539 | 1539 | |
1540 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1540 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1541 | 1541 | /** |
1542 | 1542 | * Function to get member subscriptions data: |
1543 | 1543 | * subscriptions, |
@@ -1548,7 +1548,7 @@ discard block |
||
1548 | 1548 | */ |
1549 | 1549 | public function fetch_subscriptions() |
1550 | 1550 | { |
1551 | - // phpcs:enable |
|
1551 | + // phpcs:enable |
|
1552 | 1552 | global $langs; |
1553 | 1553 | |
1554 | 1554 | |
@@ -2109,7 +2109,7 @@ discard block |
||
2109 | 2109 | } |
2110 | 2110 | } |
2111 | 2111 | |
2112 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2112 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2113 | 2113 | /** |
2114 | 2114 | * Function to add member into external tools mailing-list, spip, etc. |
2115 | 2115 | * |
@@ -2117,7 +2117,7 @@ discard block |
||
2117 | 2117 | */ |
2118 | 2118 | public function add_to_abo() |
2119 | 2119 | { |
2120 | - // phpcs:enable |
|
2120 | + // phpcs:enable |
|
2121 | 2121 | global $langs; |
2122 | 2122 | |
2123 | 2123 | include_once DOL_DOCUMENT_ROOT . '/mailmanspip/class/mailmanspip.class.php'; |
@@ -2161,7 +2161,7 @@ discard block |
||
2161 | 2161 | } |
2162 | 2162 | |
2163 | 2163 | |
2164 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2164 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2165 | 2165 | /** |
2166 | 2166 | * Function to delete a member from external tools like mailing-list, spip, etc. |
2167 | 2167 | * |
@@ -2169,7 +2169,7 @@ discard block |
||
2169 | 2169 | */ |
2170 | 2170 | public function del_to_abo() |
2171 | 2171 | { |
2172 | - // phpcs:enable |
|
2172 | + // phpcs:enable |
|
2173 | 2173 | global $conf, $langs; |
2174 | 2174 | |
2175 | 2175 | include_once DOL_DOCUMENT_ROOT . '/mailmanspip/class/mailmanspip.class.php'; |
@@ -2428,7 +2428,7 @@ discard block |
||
2428 | 2428 | return $this->LibStatut($this->statut, $this->need_subscription, $this->datefin, $mode); |
2429 | 2429 | } |
2430 | 2430 | |
2431 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2431 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2432 | 2432 | /** |
2433 | 2433 | * Renvoi le libelle d'un statut donne |
2434 | 2434 | * |
@@ -2440,7 +2440,7 @@ discard block |
||
2440 | 2440 | */ |
2441 | 2441 | public function LibStatut($status, $need_subscription, $date_end_subscription, $mode = 0) |
2442 | 2442 | { |
2443 | - // phpcs:enable |
|
2443 | + // phpcs:enable |
|
2444 | 2444 | global $langs; |
2445 | 2445 | $langs->load("members"); |
2446 | 2446 | |
@@ -2514,7 +2514,7 @@ discard block |
||
2514 | 2514 | } |
2515 | 2515 | } |
2516 | 2516 | |
2517 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2517 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2518 | 2518 | /** |
2519 | 2519 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
2520 | 2520 | * |
@@ -2524,7 +2524,7 @@ discard block |
||
2524 | 2524 | */ |
2525 | 2525 | public function load_board($user, $mode) |
2526 | 2526 | { |
2527 | - // phpcs:enable |
|
2527 | + // phpcs:enable |
|
2528 | 2528 | global $conf, $langs; |
2529 | 2529 | |
2530 | 2530 | if ($user->socid) { |
@@ -2698,8 +2698,8 @@ discard block |
||
2698 | 2698 | } |
2699 | 2699 | |
2700 | 2700 | |
2701 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2702 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
2701 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2702 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
2703 | 2703 | /** |
2704 | 2704 | * Retourne chaine DN complete dans l'annuaire LDAP pour l'objet |
2705 | 2705 | * |
@@ -2711,7 +2711,7 @@ discard block |
||
2711 | 2711 | */ |
2712 | 2712 | public function _load_ldap_dn($info, $mode = 0) |
2713 | 2713 | { |
2714 | - // phpcs:enable |
|
2714 | + // phpcs:enable |
|
2715 | 2715 | global $conf; |
2716 | 2716 | $dn = ''; |
2717 | 2717 | if ($mode == 0) { |
@@ -2727,8 +2727,8 @@ discard block |
||
2727 | 2727 | } |
2728 | 2728 | |
2729 | 2729 | |
2730 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2731 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
2730 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
2731 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
2732 | 2732 | /** |
2733 | 2733 | * Initialise tableau info (tableau des attributes LDAP) |
2734 | 2734 | * |
@@ -2736,7 +2736,7 @@ discard block |
||
2736 | 2736 | */ |
2737 | 2737 | public function _load_ldap_info() |
2738 | 2738 | { |
2739 | - // phpcs:enable |
|
2739 | + // phpcs:enable |
|
2740 | 2740 | global $conf, $langs; |
2741 | 2741 | |
2742 | 2742 | $info = array(); |
@@ -276,12 +276,12 @@ discard block |
||
276 | 276 | } |
277 | 277 | |
278 | 278 | /** |
279 | - * Delete a language for this member type |
|
280 | - * |
|
281 | - * @param string $langtodelete Language code to delete |
|
282 | - * @param User $user Object user making delete |
|
283 | - * @return int Return integer <0 if KO, >0 if OK |
|
284 | - */ |
|
279 | + * Delete a language for this member type |
|
280 | + * |
|
281 | + * @param string $langtodelete Language code to delete |
|
282 | + * @param User $user Object user making delete |
|
283 | + * @return int Return integer <0 if KO, >0 if OK |
|
284 | + */ |
|
285 | 285 | public function delMultiLangs($langtodelete, $user) |
286 | 286 | { |
287 | 287 | $sql = "DELETE FROM " . MAIN_DB_PREFIX . "adherent_type_lang"; |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | } |
533 | 533 | } |
534 | 534 | |
535 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
535 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
536 | 536 | /** |
537 | 537 | * Return list of members' type |
538 | 538 | * |
@@ -541,7 +541,7 @@ discard block |
||
541 | 541 | */ |
542 | 542 | public function liste_array($status = -1) |
543 | 543 | { |
544 | - // phpcs:enable |
|
544 | + // phpcs:enable |
|
545 | 545 | global $langs; |
546 | 546 | |
547 | 547 | $adherenttypes = array(); |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | return $this->LibStatut($this->status, $mode); |
785 | 785 | } |
786 | 786 | |
787 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
787 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
788 | 788 | /** |
789 | 789 | * Return the label of a given status |
790 | 790 | * |
@@ -794,7 +794,7 @@ discard block |
||
794 | 794 | */ |
795 | 795 | public function LibStatut($status, $mode = 0) |
796 | 796 | { |
797 | - // phpcs:enable |
|
797 | + // phpcs:enable |
|
798 | 798 | global $langs; |
799 | 799 | $langs->load('companies'); |
800 | 800 | |
@@ -813,8 +813,8 @@ discard block |
||
813 | 813 | return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode); |
814 | 814 | } |
815 | 815 | |
816 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
817 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
816 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
817 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
818 | 818 | /** |
819 | 819 | * Retourne chaine DN complete dans l'annuaire LDAP pour l'objet |
820 | 820 | * |
@@ -826,7 +826,7 @@ discard block |
||
826 | 826 | */ |
827 | 827 | public function _load_ldap_dn($info, $mode = 0) |
828 | 828 | { |
829 | - // phpcs:enable |
|
829 | + // phpcs:enable |
|
830 | 830 | $dn = ''; |
831 | 831 | if ($mode == 0) { |
832 | 832 | $dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES') . "=" . $info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')] . "," . getDolGlobalString('LDAP_MEMBER_TYPE_DN'); |
@@ -841,8 +841,8 @@ discard block |
||
841 | 841 | } |
842 | 842 | |
843 | 843 | |
844 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
845 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
844 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
845 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore |
|
846 | 846 | /** |
847 | 847 | * Initialize the info array (array of LDAP values) that will be used to call LDAP functions |
848 | 848 | * |
@@ -850,7 +850,7 @@ discard block |
||
850 | 850 | */ |
851 | 851 | public function _load_ldap_info() |
852 | 852 | { |
853 | - // phpcs:enable |
|
853 | + // phpcs:enable |
|
854 | 854 | $info = array(); |
855 | 855 | |
856 | 856 | // Object classes |
@@ -512,7 +512,7 @@ |
||
512 | 512 | $this->amount = $obj->amount; |
513 | 513 | $this->caneditamount = $obj->caneditamount; |
514 | 514 | $this->mail_valid = $obj->mail_valid; |
515 | - $this->note = $obj->note_public; // deprecated |
|
515 | + $this->note = $obj->note_public; // deprecated |
|
516 | 516 | $this->note_public = $obj->note_public; |
517 | 517 | $this->vote = $obj->vote; |
518 | 518 |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | return ''; |
469 | 469 | } |
470 | 470 | |
471 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
471 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
472 | 472 | /** |
473 | 473 | * Return the label of a given status |
474 | 474 | * |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | */ |
479 | 479 | public function LibStatut($status, $mode = 0) |
480 | 480 | { |
481 | - // phpcs:enable |
|
481 | + // phpcs:enable |
|
482 | 482 | |
483 | 483 | //$langs->load("members"); |
484 | 484 |
@@ -241,7 +241,7 @@ |
||
241 | 241 | $this->dateh = $this->db->jdate($obj->dateh); |
242 | 242 | $this->datef = $this->db->jdate($obj->datef); |
243 | 243 | $this->amount = $obj->subscription; |
244 | - $this->note = $obj->note_public; // deprecated |
|
244 | + $this->note = $obj->note_public; // deprecated |
|
245 | 245 | $this->note_public = $obj->note_public; |
246 | 246 | $this->fk_bank = $obj->fk_bank; |
247 | 247 | return 1; |
@@ -118,7 +118,7 @@ |
||
118 | 118 | if ($this->apiService == 'groq') { |
119 | 119 | $this->apiEndpoint = 'https://api.groq.com/openai/v1/chat/completions'; |
120 | 120 | if ($model == 'auto') { |
121 | - $model = getDolGlobalString('AI_API_GROK_MODEL_TEXT', 'mixtral-8x7b-32768'); // 'llama3-8b-8192', 'gemma-7b-it' |
|
121 | + $model = getDolGlobalString('AI_API_GROK_MODEL_TEXT', 'mixtral-8x7b-32768'); // 'llama3-8b-8192', 'gemma-7b-it' |
|
122 | 122 | } |
123 | 123 | } elseif ($this->apiService == 'chatgpt') { |
124 | 124 | $this->apiEndpoint = 'https://api.openai.com/v1/chat/completions'; |
@@ -847,7 +847,7 @@ discard block |
||
847 | 847 | return $this->LibStatut($this->status, $mode); |
848 | 848 | } |
849 | 849 | |
850 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
850 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
851 | 851 | /** |
852 | 852 | * Return the status |
853 | 853 | * |
@@ -857,7 +857,7 @@ discard block |
||
857 | 857 | */ |
858 | 858 | public function LibStatut($status, $mode = 0) |
859 | 859 | { |
860 | - // phpcs:enable |
|
860 | + // phpcs:enable |
|
861 | 861 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
862 | 862 | global $langs; |
863 | 863 | //$langs->load("agenda"); |