Overview
Comment:Refactor background image getter
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA1: 4f07ae5b2c60d7a781594b44a96ae53c73e76f9a
User & Date: bohwaz on 2020-12-13 00:32:07
Other Links: branch diff | manifest | tags
Context
2020-12-13
00:32
Use Session::getInstance instead of constructor check-in: d3afacb8be user: bohwaz tags: dev
00:32
Refactor background image getter check-in: 4f07ae5b2c user: bohwaz tags: dev
00:31
We need WWW_URL constant to get file URL check-in: 6673511597 user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/Template.php from [290d250357] to [b3f70be648].

479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
	{
		$config = Config::getInstance();

		$couleur1 = $config->get('couleur1') ?: ADMIN_COLOR1;
		$couleur2 = $config->get('couleur2') ?: ADMIN_COLOR2;
		$image_fond = ADMIN_BACKGROUND_IMAGE;

		if ($config->get('image_fond'))
		{
			try {
				$f = new Fichiers($config->get('image_fond'));
				$image_fond = $f->getURL();
			}
			catch (\InvalidArgumentException $e)
			{
				// Fichier qui n'existe pas/plus
			}
		}

		// Transformation Hexa vers décimal
		$couleur1 = implode(', ', sscanf($couleur1, '#%02x%02x%02x'));
		$couleur2 = implode(', ', sscanf($couleur2, '#%02x%02x%02x'));

		$out = '







|
<
<
<
|
<
<
<
<
<







479
480
481
482
483
484
485
486



487





488
489
490
491
492
493
494
	{
		$config = Config::getInstance();

		$couleur1 = $config->get('couleur1') ?: ADMIN_COLOR1;
		$couleur2 = $config->get('couleur2') ?: ADMIN_COLOR2;
		$image_fond = ADMIN_BACKGROUND_IMAGE;

		if ($f = $config->get('image_fond')) {



			$image_fond = $f->url();





		}

		// Transformation Hexa vers décimal
		$couleur1 = implode(', ', sscanf($couleur1, '#%02x%02x%02x'));
		$couleur2 = implode(', ', sscanf($couleur2, '#%02x%02x%02x'));

		$out = '