diff --git a/.htaccess b/.htaccess
index 7331a26c..e738e6bf 100644
--- a/.htaccess
+++ b/.htaccess
@@ -6,4 +6,8 @@ DirectoryIndex index.php
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME}\.php -f
-RewriteRule ^(.+)$ $1\.php [QSA,L]
+RewriteRule ^(.+)$ $1\.php [QSA,L]
+
+
+ Require all denied
+
diff --git a/accred_form.php b/accred_form.php
index 179b9cc4..8a3323f6 100644
--- a/accred_form.php
+++ b/accred_form.php
@@ -269,7 +269,7 @@ die();
));
$form->add('label', 'label_why', 'why', 'Précisions');
- $obj = $form->add('textarea', 'why',$ar['why']);
+ $obj = $form->add('textarea', 'why',$ar['why'], array('cols' => 60));
$obj->set_rule(array(
'required' => array('error', 'Merci de préciser la nature de la prestation!'),
));
@@ -338,7 +338,7 @@ die();
));
$form->add('label', 'label_paiement_autre', 'paiement_autre', 'Autre');
- $obj = $form->add('textarea', 'paiement_autre', $ar['paiement_autre']);
+ $obj = $form->add('textarea', 'paiement_autre', $ar['paiement_autre'], array('cols' => 60));
$obj->set_rule(array(
'required' => array('error', 'Merci de préciser la nature du paiement!'),
'dependencies' => array(array(
@@ -358,7 +358,7 @@ die();
));
$form->add('label', 'label_adresse_distrib', 'adresse_distrib', 'Adresse de distribution');
- $obj = $form->add('textarea', 'adresse_distrib', $ar['adresse_distrib']);
+ $obj = $form->add('textarea', 'adresse_distrib', $ar['adresse_distrib'], array('cols' => 60));
$obj->set_rule(array(
'required' => array('error', 'Merci de fournir une adresse de distribution'),
'dependencies' => array(array(
@@ -420,7 +420,7 @@ $(document).ready(function(){
var $form = $('#form'),
$summands = $('.num_prest');
- var $sumDisplay = null,
+var $sumDisplay = null,
$summandsNor = $form.find('.num_nor'),
$summandsVip = $form.find('.num_vip'),
@@ -439,13 +439,13 @@ var $form = $('#form'),
var value = Number($(this).val());
if($(this).hasClass('num_nor')) {
if (!isNaN(value)) {
- price = Number($(this).parent().parent().find('.prixnor').html().substring(4));
+ price = Number($(this).parent().parent().find('.prixnor').html());
cntNor += value;
sumNor += price*value;
}
} else if($(this).hasClass('num_vip')) {
if (!isNaN(value)) {
- price = Number($(this).parent().parent().find('.prixvip').html().substring(4));
+ price = Number($(this).parent().parent().find('.prixvip').html());
cntVip += value;
sumVip += price*value;
}
diff --git a/accred_list.php b/accred_list.php
index 66d32b43..03c084a2 100644
--- a/accred_list.php
+++ b/accred_list.php
@@ -35,7 +35,6 @@
if($_GET['o']=='excel') {
$objPHPExcel = new PHPExcel();
-
// Set properties
$objPHPExcel->getProperties()->setCreator("Caribana festival");
$objPHPExcel->getProperties()->setLastModifiedBy("Caribana festival");
diff --git a/accred_style.css b/accred_style.css
index c3ea3747..5b8bad8a 100644
--- a/accred_style.css
+++ b/accred_style.css
@@ -89,16 +89,6 @@ background-color:#999; color: White;
width: 150px;
float: left;
}
- .prixvip {
- padding-left: 60px;
- float: left;
- width: 50px;
- }
- .prixnor {
- padding-left: 30px;
- width: 60px;
- float: left;
- }
.ptot {
width: 225px;
float: left;
@@ -108,10 +98,13 @@ background-color:#999; color: White;
padding-left: 20px;
}
.num {
- width: 60px !important;
+ width: 30px !important;
}
.right-blob {
float: right;
text-align: right;
padding-left: 10px;
}
+ table#tpresta td {
+ padding-left: 20px;
+ }
diff --git a/composer.lock b/composer.lock
index 691d3458..4abf9758 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,7 +1,7 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "90b442b74cfbb9deb4c2e60e01b68f98",
@@ -54,16 +54,16 @@
},
{
"name": "google/apiclient",
- "version": "v2.2.1",
+ "version": "v2.2.2",
"source": {
"type": "git",
- "url": "https://github.com/google/google-api-php-client.git",
- "reference": "b69b8ac4bf6501793c389d4e013a79d09c85c5f2"
+ "url": "https://github.com/googleapis/google-api-php-client.git",
+ "reference": "4e0fd83510e579043e10e565528b323b7c2b3c81"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/google/google-api-php-client/zipball/b69b8ac4bf6501793c389d4e013a79d09c85c5f2",
- "reference": "b69b8ac4bf6501793c389d4e013a79d09c85c5f2",
+ "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/4e0fd83510e579043e10e565528b323b7c2b3c81",
+ "reference": "4e0fd83510e579043e10e565528b323b7c2b3c81",
"shasum": ""
},
"require": {
@@ -78,7 +78,7 @@
},
"require-dev": {
"cache/filesystem-adapter": "^0.3.2",
- "phpunit/phpunit": "~4",
+ "phpunit/phpunit": "~4.8.36",
"squizlabs/php_codesniffer": "~2.3",
"symfony/css-selector": "~2.1",
"symfony/dom-crawler": "~2.1"
@@ -109,20 +109,20 @@
"keywords": [
"google"
],
- "time": "2017-11-03T01:19:53+00:00"
+ "time": "2018-06-20T15:52:20+00:00"
},
{
"name": "google/apiclient-services",
- "version": "v0.57",
+ "version": "v0.88",
"source": {
"type": "git",
- "url": "https://github.com/google/google-api-php-client-services.git",
- "reference": "fc1821419f0e9d060d83a2864e2a40874b91430d"
+ "url": "https://github.com/googleapis/google-api-php-client-services.git",
+ "reference": "1ad0a77dc28f658cf65b7146ee5342bd12cfff3f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/fc1821419f0e9d060d83a2864e2a40874b91430d",
- "reference": "fc1821419f0e9d060d83a2864e2a40874b91430d",
+ "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/1ad0a77dc28f658cf65b7146ee5342bd12cfff3f",
+ "reference": "1ad0a77dc28f658cf65b7146ee5342bd12cfff3f",
"shasum": ""
},
"require": {
@@ -146,20 +146,20 @@
"keywords": [
"google"
],
- "time": "2018-04-28T00:23:39+00:00"
+ "time": "2019-03-04T00:22:51+00:00"
},
{
"name": "google/auth",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
- "url": "https://github.com/google/google-auth-library-php.git",
- "reference": "8f7c96146b2c62d3f4c6bbc4b5bb8a8e396b0b71"
+ "url": "https://github.com/googleapis/google-auth-library-php.git",
+ "reference": "196237248e636a3554a7d9e4dfddeb97f450ab5c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/8f7c96146b2c62d3f4c6bbc4b5bb8a8e396b0b71",
- "reference": "8f7c96146b2c62d3f4c6bbc4b5bb8a8e396b0b71",
+ "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/196237248e636a3554a7d9e4dfddeb97f450ab5c",
+ "reference": "196237248e636a3554a7d9e4dfddeb97f450ab5c",
"shasum": ""
},
"require": {
@@ -193,7 +193,7 @@
"google",
"oauth2"
],
- "time": "2018-04-06T19:26:30+00:00"
+ "time": "2018-09-17T20:29:21+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -313,32 +313,33 @@
},
{
"name": "guzzlehttp/psr7",
- "version": "1.4.2",
+ "version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+ "reference": "9f83dded91781a01c63574e387eaa769be769115"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
- "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
+ "reference": "9f83dded91781a01c63574e387eaa769be769115",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
- "psr/http-message": "~1.0"
+ "psr/http-message": "~1.0",
+ "ralouphie/getallheaders": "^2.0.5"
},
"provide": {
"psr/http-message-implementation": "1.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
@@ -368,26 +369,27 @@
"keywords": [
"http",
"message",
+ "psr-7",
"request",
"response",
"stream",
"uri",
"url"
],
- "time": "2017-03-20T17:10:46+00:00"
+ "time": "2018-12-04T20:46:45+00:00"
},
{
"name": "monolog/monolog",
- "version": "1.23.0",
+ "version": "1.24.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+ "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
- "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+ "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"shasum": ""
},
"require": {
@@ -452,26 +454,30 @@
"logging",
"psr-3"
],
- "time": "2017-06-19T01:22:40+00:00"
+ "time": "2018-11-05T09:00:11+00:00"
},
{
"name": "phpoffice/phpexcel",
- "version": "1.8.1",
+ "version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PHPExcel.git",
- "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32"
+ "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
- "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
+ "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/1441011fb7ecdd8cc689878f54f8b58a6805f870",
+ "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870",
"shasum": ""
},
"require": {
+ "ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "php": ">=5.2.0"
+ "php": "^5.2|^7.0"
+ },
+ "require-dev": {
+ "squizlabs/php_codesniffer": "2.*"
},
"type": "library",
"autoload": {
@@ -481,7 +487,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "LGPL"
+ "LGPL-2.1"
],
"authors": [
{
@@ -489,18 +495,19 @@
"homepage": "http://blog.maartenballiauw.be"
},
{
- "name": "Mark Baker"
+ "name": "Erik Tilt"
},
{
"name": "Franck Lefevre",
- "homepage": "http://blog.rootslabs.net"
+ "homepage": "http://rootslabs.net"
},
{
- "name": "Erik Tilt"
+ "name": "Mark Baker",
+ "homepage": "http://markbakeruk.net"
}
],
"description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
- "homepage": "http://phpexcel.codeplex.com",
+ "homepage": "https://github.com/PHPOffice/PHPExcel",
"keywords": [
"OpenXML",
"excel",
@@ -510,20 +517,20 @@
"xlsx"
],
"abandoned": "phpoffice/phpspreadsheet",
- "time": "2015-05-01T07:00:55+00:00"
+ "time": "2018-11-22T23:07:24+00:00"
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.11",
+ "version": "2.0.15",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b"
+ "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7053f06f91b3de78e143d430e55a8f7889efc08b",
- "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
+ "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
"shasum": ""
},
"require": {
@@ -602,7 +609,7 @@
"x.509",
"x509"
],
- "time": "2018-04-15T16:55:05+00:00"
+ "time": "2019-03-10T16:53:45+00:00"
},
{
"name": "psr/cache",
@@ -702,16 +709,16 @@
},
{
"name": "psr/log",
- "version": "1.0.2",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": ""
},
"require": {
@@ -745,7 +752,47 @@
"psr",
"psr-3"
],
- "time": "2016-10-10T12:19:37+00:00"
+ "time": "2018-11-20T15:27:04+00:00"
+ },
+ {
+ "name": "ralouphie/getallheaders",
+ "version": "2.0.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~3.7.0",
+ "satooshi/php-coveralls": ">=1.0"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/getallheaders.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }
+ ],
+ "description": "A polyfill for getallheaders.",
+ "time": "2016-02-11T07:05:27+00:00"
},
{
"name": "stefangabos/zebra_form",
diff --git a/custom-template.php b/custom-template.php
index 9fe4ca90..bdcf5eb4 100644
--- a/custom-template.php
+++ b/custom-template.php
@@ -26,15 +26,19 @@
Contre-prestation
+
+
+ |
+ | Jour | Normal | | VIP | |
+
$onePrice) { ?>
-
+
+ | CHF | | CHF | |
+
+
+
+