Overview
Comment:Fix calls to non-existing method
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev | 1.0.0-rc1
Files: files | file ages | folders
SHA1: 3f22ad4a10105a52daba7c72aa4f0a3dea8deb87
User & Date: bohwaz on 2020-11-26 21:39:39
Other Links: branch diff | manifest | tags
Context
2020-11-26
23:13
Clean up debug check-in: d37e68735c user: bohwaz tags: dev
21:39
Fix calls to non-existing method check-in: 3f22ad4a10 user: bohwaz tags: dev, 1.0.0-rc1
20:31
Fix issue with empty amount check-in: d2fcf382d7 user: bohwaz tags: dev, 1.0.0-rc1
Changes

Modified src/include/lib/Garradin/Services/Reminders.php from [79db0ae213] to [09c61c980b].

82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
	/**
	 * Envoi de mail pour rappel automatisé
	 */
	static public function sendAuto(\stdClass $reminder)
	{
		$replace = [
			'identite'        => $reminder->identity,
			'date_rappel'     => Utils::sqliteDateToFrench($reminder->reminder_date),
			'date_expiration' => Utils::sqliteDateToFrench($reminder->expiry_date),
			'nb_jours'        => $reminder->nb_days,
			'delai'           => $reminder->delay,
		];

		$subject = self::replaceTagsInContent($reminder->subject, $replace);
		$text = self::replaceTagsInContent($reminder->body, $replace);








|
|







82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
	/**
	 * Envoi de mail pour rappel automatisé
	 */
	static public function sendAuto(\stdClass $reminder)
	{
		$replace = [
			'identite'        => $reminder->identity,
			'date_rappel'     => Utils::date_fr($reminder->reminder_date),
			'date_expiration' => Utils::date_fr($reminder->expiry_date),
			'nb_jours'        => $reminder->nb_days,
			'delai'           => $reminder->delay,
		];

		$subject = self::replaceTagsInContent($reminder->subject, $replace);
		$text = self::replaceTagsInContent($reminder->body, $replace);

Modified src/include/lib/Garradin/Template.php from [7f7a38b762] to [dc008398eb].

526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
			case 'tel':
				return '<a href="tel:' . rawurlencode($v) . '">' . htmlspecialchars($v) . '</a>';
			case 'url':
				return '<a href="' . htmlspecialchars($v) . '">' . htmlspecialchars($v) . '</a>';
			case 'country':
				return Utils::getCountryName($v);
			case 'date':
				return Utils::sqliteDateToFrench($v);
			case 'multiple':
				$out = [];

				foreach ($config->options as $b => $name)
				{
					if ($v & (0x01 << $b))
						$out[] = $name;







|







526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
			case 'tel':
				return '<a href="tel:' . rawurlencode($v) . '">' . htmlspecialchars($v) . '</a>';
			case 'url':
				return '<a href="' . htmlspecialchars($v) . '">' . htmlspecialchars($v) . '</a>';
			case 'country':
				return Utils::getCountryName($v);
			case 'date':
				return Utils::date_fr($v);
			case 'multiple':
				$out = [];

				foreach ($config->options as $b => $name)
				{
					if ($v & (0x01 << $b))
						$out[] = $name;