--- /tmp/dsg/dolibarr/htdocs/core/modules/holiday/github_mod_holiday_immaculate.php +++ /tmp/dsg/dolibarr/htdocs/core/modules/holiday/client_mod_holiday_immaculate.php @@ -31,9 +31,9 @@ class mod_holiday_immaculate extends ModelNumRefHolidays { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; /** @@ -63,9 +63,9 @@ * * @return string text description */ - public function info() - { - global $db, $conf, $langs; + public function info() + { + global $db, $conf, $langs; $langs->load("bills"); @@ -92,20 +92,20 @@ $texte .= ''; return $texte; - } + } /** * Return numbering example * * @return string Example */ - public function getExample() - { - global $conf, $langs, $user; + public function getExample() + { + global $conf, $langs, $user; - $old_login = $user->login; - $user->login = 'UUUUUUU'; - $numExample = $this->getNextValue($user, ''); + $old_login = $user->login; + $user->login = 'UUUUUUU'; + $numExample = $this->getNextValue($user, ''); $user->login = $old_login; if (!$numExample) @@ -113,7 +113,7 @@ $numExample = $langs->trans('NotConfigured'); } return $numExample; - } + } /** * Return next value @@ -122,8 +122,8 @@ * @param Object $holiday holiday object * @return string Value if OK, 0 if KO */ - public function getNextValue($user, $holiday) - { + public function getNextValue($user, $holiday) + { global $db, $conf; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; @@ -141,7 +141,7 @@ return $numFinal; } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Return next value * @@ -149,9 +149,9 @@ * @param Object $objforref Holiday object * @return string Value if OK, 0 if KO */ - public function holiday_get_num($fuser, $objforref) - { - // phpcs:enable - return $this->getNextValue($fuser, $objforref); - } + public function holiday_get_num($fuser, $objforref) + { + // phpcs:enable + return $this->getNextValue($fuser, $objforref); + } } --- /tmp/dsg/dolibarr/htdocs/core/modules/holiday/github_mod_holiday_madonna.php +++ /tmp/dsg/dolibarr/htdocs/core/modules/holiday/client_mod_holiday_madonna.php @@ -30,9 +30,9 @@ class mod_holiday_madonna extends ModelNumRefHolidays { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; public $prefix = 'HL'; @@ -65,11 +65,11 @@ * * @return string text description */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } /** @@ -139,7 +139,9 @@ $obj = $db->fetch_object($resql); if ($obj) $max = intval($obj->max); else $max = 0; - } else { + } + else + { dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG); return -1; } @@ -155,7 +157,7 @@ } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Return next value * @@ -165,7 +167,7 @@ */ public function holiday_get_num($fuser, $objforref) { - // phpcs:enable + // phpcs:enable return $this->getNextValue($fuser, $objforref); } } --- /tmp/dsg/dolibarr/htdocs/core/modules/holiday/github_modules_holiday.php +++ /tmp/dsg/dolibarr/htdocs/core/modules/holiday/client_modules_holiday.php @@ -44,17 +44,17 @@ public $error = ''; - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** * Return list of active generation modules * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of templates - */ + * @param DoliDB $db Database handler + * @param integer $maxfilenamelength Max length of value to show + * @return array List of templates + */ public static function liste_modeles($db, $maxfilenamelength = 0) { - // phpcs:enable + // phpcs:enable global $conf; $type = 'holiday';