Merge branch 'ticket-11985-MondialRelay_part2' into develop

2017-02-22 11:42:39 +01:00 · 2017-02-22 11:42:39 +01:00 · 0e1db8cc03
commit 0e1db8cc03
parent c7314febe2 3876e9e439
20 changed files with 22 additions and 0 deletions
--- a/modules/logistics/assets/AccessInter.bmp
+++ b/modules/logistics/assets/AccessInter.bmp
--- a/modules/logistics/assets/AccessInterBic3.bmp
+++ b/modules/logistics/assets/AccessInterBic3.bmp
--- a/modules/logistics/assets/COLISSIMOI.bmp
+++ b/modules/logistics/assets/COLISSIMOI.bmp
--- a/modules/logistics/assets/ColissimoAccessI.bmp
+++ b/modules/logistics/assets/ColissimoAccessI.bmp
--- a/modules/logistics/assets/DPD.bmp
+++ b/modules/logistics/assets/DPD.bmp
--- a/modules/logistics/assets/EXASANTE.bmp
+++ b/modules/logistics/assets/EXASANTE.bmp
--- a/modules/logistics/assets/ExpertInterBic3.bmp
+++ b/modules/logistics/assets/ExpertInterBic3.bmp
--- a/modules/logistics/assets/ExpresBic3.bmp
+++ b/modules/logistics/assets/ExpresBic3.bmp
--- a/modules/logistics/assets/ICICOLIS.bmp
+++ b/modules/logistics/assets/ICICOLIS.bmp
--- a/modules/logistics/assets/ICIRELAIS.bmp
+++ b/modules/logistics/assets/ICIRELAIS.bmp
--- a/modules/logistics/assets/MONDIALR.bmp
+++ b/modules/logistics/assets/MONDIALR.bmp
--- a/modules/logistics/assets/PortPayeBic3.bmp
+++ b/modules/logistics/assets/PortPayeBic3.bmp
--- a/modules/logistics/assets/PrioritaireBic3.bmp
+++ b/modules/logistics/assets/PrioritaireBic3.bmp
--- a/modules/logistics/assets/SOBelgiqueBic3.bmp
+++ b/modules/logistics/assets/SOBelgiqueBic3.bmp
--- a/modules/logistics/assets/ScanBic3.bmp
+++ b/modules/logistics/assets/ScanBic3.bmp
--- a/modules/logistics/assets/arial.ttf
+++ b/modules/logistics/assets/arial.ttf
--- a/modules/logistics/assets/arialbd.ttf
+++ b/modules/logistics/assets/arialbd.ttf
--- a/modules/logistics/assets/c128.ttf
+++ b/modules/logistics/assets/c128.ttf
--- a/modules/logistics/assets/c25I.ttf
+++ b/modules/logistics/assets/c25I.ttf
--- a/modules/logistics/getassets.php
+++ b/modules/logistics/getassets.php
@ -49,3 +49,25 @@ if(isset($_GET['secret']) && $_GET['secret'] == 'YjRcQBX75daSyKVn') {
 		exit;
 	}
 }
+elseif (isset($_GET['secret']) && $_GET['secret'] == '6yY84Hnb8EMkejH'){
+	$assets['arial.ttf'] = array('f11c0317db527bdd80fa0afa04703441', 'ARIAL', '23');
+	$assets['arialbd.ttf'] = array('34cd8fd9e4fae9f075d4c9a2c971d065', 'ARIALB', '24');
+	$assets['c128.ttf'] = array('ba8fb8ca3722a9fae58fdb68a7941838', 'C128', '25');
+	$assets['MONDIALR.bmp'] = array('646870e548bc1b32ab21a834f73bc4c1', 'MONDIALR');
+	$assets['c25I.ttf'] = array('10c0373007ee334c148d0e8594188a1b', 'C25I', '26');
+
+	if(isset($_GET['file']) && isset($assets[$_GET['file']])) {
+		header('Content-Type: image/bmp');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate');
+		header('Pragma: public');
+		header('Content-Length: '.filesize(dirname(__FILE__).'/assets/'.$_GET['file']));
+		ob_clean();
+		flush();
+		readfile(dirname(__FILE__).'/assets/'.$_GET['file']);
+		exit;
+	} else {
+		echo json_encode($assets);
+		exit;
+	}
+}