tagged as 1.11.2

fix config missing key
tagged as 1.11.1
2021-08-30 22:49:49 +04:00 · 2021-08-30 22:49:34 +04:00 · 2021-08-30 21:48:13 +04:00 · 2021-08-30 21:47:25 +04:00 · 2021-08-30 21:10:58 +04:00 · 2021-08-30 21:10:33 +04:00
19 changed files with 800 additions and 934 deletions
@@ -1 +1 @@
-1.10.1
+1.11.2
@@ -1,67 +1,79 @@
 CAGETTE PEI
 ===========
-Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018
+> <french>
 > Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018
 > 
 > Certaines portions du code source de Cagette.net n'étant plus disponibles en téléchargement à partir de cette date, 
 > j'ai repris sur la base d'un existant pour adapter au marché local réunionnais et leurs AMAPéi.
 > </french>
-Certaines portions du code source de Cagette.net n'étant plus disponibles en téléchargement, 
+## PREREQUISITE MARIADB
 j'ai repris sur la base d'un existant pour adapter au marché local réunionnais et leurs AMAPéi.
-## INSTALL FROM SCRATCH (debian-buster)
+```bash
-
+apt install -y mariadb-server
-* apt install -y curl 
+mysql -u root <<EOF
 * curl -L https://deb.nodesource.com/setup_8.x | bash -
 * apt install -y nodejs=8.17.0-1nodesource1
 * apt install -y sudo haxe apache2 make git imagemagick gettext libapache2-mod-neko mariadb-server
 * mysql -u root <<EOF
 CREATE DATABASE cagettepei;
 GRANT ALL ON cagettepei.* TO 'cagettepei'@'%' IDENTIFIED BY 'cagettepei';
 EOF
-* cd /var/www
+```
-  * git clone https://git.artcode.re/cagetters/cagettepei.git
+
-  * cd cagettepei
+## INSTALL FROM SCRATCH
-    * make install ENV=dev # first time
+
-      * make compile # classes
+Rk: Works on any Debian (>=Buster) compatible server!
-      * make templates # templates + i18n
+
-* vim /etc/apache2/sites-available/cagettepei.conf
+```
 apt install -y curl 
 curl -L https://deb.nodesource.com/setup_8.x | bash -
 apt install -y nodejs=8.17.0-1nodesource1
 apt install -y sudo haxe apache2 make git imagemagick gettext libapache2-mod-neko mariadb-server sendemail libio-socket-ssl-perl libnet-ssleay-perl
 cd /var/www
 git clone https://git.artcode.re/cagetters/cagettepei.git
 cd cagettepei
 make install ENV=dev
 vim /etc/apache2/sites-available/cagettepei.conf
 ```
 ```
 <VirtualHost *:80>
  ServerName cagettepei
  DirectoryIndex index.n
  DocumentRoot /var/www/cagettepei/www/
-  
+  CustomLog ${APACHE_LOG_DIR}/cagettepei/access.log combined
  ErrorLog ${APACHE_LOG_DIR}/cagettepei/debug.log
  ErrorLogFormat "[%{uc}t] %M"
 </VirtualHost>
 ```
-* sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
+
-* a2dissite 000-default.conf
+```bash
-* a2ensite cagettepei.conf
+sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
-* a2enmod neko rewrite
+a2dissite 000-default.conf
-* systemctl restart apache2
+a2ensite cagettepei.conf
 a2enmod rewrite
 mkdir -p /var/log/apache2/cagettepei
 systemctl restart apache2
 ```
 ## CONFIGURATION
-* cd /var/www/cagettepei
+```bash
-* vim config.xml
+cd /var/www/cagettepei
 vim config.xml
 ```
 ```
 <config
 host = "<DOMAIN.TLD>"
 database = "mysql://cagettepei:cagettepei@localhost/cagettepei"
 key = "<SECRET_PHRASE>"
 name = "CagettePéi"
 default_email = "<EMAIL>"
 webmaster_email = "<EMAIL>"
 database="mysql://cagettepei:cagettepei@localhost/cagettepei"
 smtp_host="localhost"
 smtp_port="25"
 smtp_user=""
 smtp_pass=""
 lang="fr"
 langs="fr"
 langnames="Français"
 maintain="0"
 debug = "0"
 sqllog = "0"
 maintain = "0"
 cache = "1"
 cachetpl = "0"
 />
@@ -72,16 +84,19 @@ ADMIN RESET PASSWORD
 go to http://localhost for ERROR + table regeneration, then
-* cd /var/www/cagettepei
+```
-* SECRET=$(grep key= config.xml | cut -d= -f2 | cut -d'"' -f2)
+cd /var/www/cagettepei
-* echo "insert into User values (1,'fr',MD5('${SECRET}cagettepei'),1,'Administrateur','Cagette Péi', 'admin', null, null, null, null, null, null, null, null, null, now(), now(),6,null, null)" | mysql -h localhost -u cagettepei -pcagettepei cagettepei
+SECRET=$(grep key config.xml | cut -d= -f2 | cut -d'"' -f2)
 echo "insert into User values (1,'fr',MD5('${SECRET}cagettepei'),1,'Administrateur','Cagette Péi', 'admin', null, null, null, null, null, null, null, null, null, now(), now(),6,null, null)" | mysql -h localhost -u cagettepei -pcagettepei cagettepei
 ```
 then, connect with admin / cagettepei
 ### change admin password
-* echo "update User set pass=MD5('${SECRET}cagettepei') where id=1" | mysql -h localhost -u cagettepei -pcagettepei cagettepei
+```
-
+echo "update User set pass=MD5('${SECRET}cagettepei') where id=1" | mysql -h localhost -u cagettepei -pcagettepei cagettepei
 ```
 SYSTEMD-TIMERS
 --------------
@@ -98,7 +113,7 @@ SYSTEMD-TIMERS
 	SELECTOR=$1
-	for i in /var/www/cagettepei-* ; do
+	for i in /var/www/cagettepei* ; do
 		if [[ -d $i ]]; then
 			cd $i/www
 			echo "cron-$SELECTOR in: $i"
@@ -1,19 +1,14 @@
 <config
 	database = "mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
 	host = "<URL without http>"
 	name = "<HTML head title>"
 	default_email = "<EMAIL>"
 	webmaster_email = "<EMAIL>"
 	key = "<SECRET_PHRASE>"
 	maintain="0"
 	cache="1"
 	cachetpl="0"
 	debug="0"
 	sqllog="0"
 	maintain="0"
-	lang="fr"
+	cache="1"
-	langs="fr"
+	cachetpl="0"
  	langnames="Français"
 />
@@ -1,7 +1,7 @@
 ::use 'admin/design.mtt'::
-<h3>Console d'administration de Cagette.net</h3>
+<h3>Console d'administration de CagettePéi</h3>
 <p>
 	::hDate(now)::
 </p>
@@ -13,11 +13,7 @@
 				::if groupName!=null && noGroup!=true::
 					<h1>::groupName::</h1>
 				::else::
-					<div style="margin-bottom:22px;" >
+					<h1>::_("Cagette.net")::</h1>
 							<a href="https://git.artcode.re/cagetters/cagettepei" target="_blank">
 								<img src="/img/logo3.png" alt="::NAME::" />
 							</a>
 					</div>		
 				::end::
 			</div>
@@ -129,10 +125,13 @@
 		<div class="row" id="footer">
-				<div class="col-md-9" >
+				<div class="col-md-2" >
-					<a href="https://git.artcode.re/cagetters/cagette" target="_blank">
+					<img width="120" style="border: white 5px solid;" src="/img/logo-mini.jpg" alt="::_("Cagette.net")::" title="Logo ::_("Cagette.net")::"/>
-						<img src="/img/logo.png" alt="::_("Cagette.net")::"/>
+				</div>
-					</a>  
+
 				<div class="col-md-7" style="padding-top:1em">
 					Cagette Péi est un logiciel libre qui favorise les circuits courts.<br/>
 					Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.<br/>
 				</div>
 				<div class="col-md-3" >
@@ -149,57 +148,12 @@
 						</li>
 					</ul>				
 					<!--<p style="position: absolute;display: block;top: 96px;width: 700px;">
 						<b>::raw _("Vous êtes producteur ?")::</b>
 						::raw _("Découvrez nos formations gratuites pour utiliser <b>Cagette Pro</b> "):: 
 						&nbsp;&nbsp;<a href="http://alilo.fr/formations-producteurs" target="_blank" class="btn btn-xs btn-info">C'est parti !</a>
 					</p>-->
 				</div>
 				<!--
 				<div class="col-md-3" >
 					::_("FOLLOW US")::
 					<ul class="cagsocialmedia">
 						<li class="cagfb">
 							<a title="Facebook" href="https://www.facebook.com/cagette" target="_blank"> <i class="fa fa-facebook"></i></a>	
 						</li>
 						<li class="cagtwitter">
 							<a title="Twitter" href="https://twitter.com/Cagettenet" target="_blank"> <i class="fa fa-twitter"></i></a> 
 						</li>
 						<li class="cagyoutube">
 							<a title="Youtube" href="https://www.youtube.com/channel/UC3cvGxAUrbN9oSZmr1oZEaw" target="_blank"> <i class="fa fa-youtube"></i></a> 						
 						</li>
 						<li style="background-color:#333;">
 							<a title="Github" href="https://github.com/bablukid/cagette" target="_blank"> <i class="fa fa-github"></i></a> 						
 						</li>
 					</ul>
 				</div>
 				-->
 				<!--				
 				<div class="col-md-3">
 					::_("CONTACT US")::
 					<ul>
 						<li>
 							<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
 							<input type="hidden" name="cmd" value="_s-xclick"/>
 							<input type="hidden" name="hosted_button_id" value="S9KT7FQS7P622"/>
 							<input type="image" src="https://www.paypalobjects.com/fr_FR/FR/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal, le réflexe sécurité pour payer en ligne"/>
 							<img alt="" border="0" src="https://www.paypalobjects.com/fr_FR/i/scr/pixel.gif" width="1" height="1"/>
 							</form>
 						</li>
 					</ul>
 				</div>
 				-->
 		</div>
 		<div class="row" id="subfooter">
-			<!--
+			<span>version cagettepei-<a target="_blank" href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a></span>
 			::raw _("Cagette.net is made by <a href='https://www.alilo.fr' target='_blank'><img src='/img/alilo-trans-black.png' /></a>")::<br/>
 			-->
 			<span>version ::VERSION::</span>
 		</div>
 		<div class="row">
@@ -219,49 +173,4 @@
 			</div>
 		</div>
 			::if (false && user!=null && user.isAmapManager())::
 			<script>
 			// Include the UserVoice JavaScript SDK (only needed once on a page)
 			UserVoice=window.UserVoice||[];(function(){var uv=document.createElement('script');uv.type='text/javascript';uv.async=true;uv.src='//widget.uservoice.com/sayZ1eIZLfSZUa3IwslHCw.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(uv,s)})();
 			//
 			// UserVoice Javascript SDK developer documentation:
 			// https://www.uservoice.com/o/javascript-sdk
 			//
 			// Set colors
 			UserVoice.push(['set', {
 			  accent_color: '#6aba2e',
 			  trigger_color: 'white',
 			  trigger_background_color: '#e2753a'
 			}]);
 			// Identify the user and pass traits
 			// To enable, replace sample data with actual user traits and uncomment the line
 			UserVoice.push(['identify', {
 			  //email:      'john.doe@example.com', // User’s email address
 			  //name:       'John Doe', // User’s real name
 			  //created_at: 1364406966, // Unix timestamp for the date the user signed up
 			  //id:         123, // Optional: Unique id of the user (if set, this should not change)
 			  //type:       'Owner', // Optional: segment your users by type
 			  //account: {
 			  //  id:           123, // Optional: associate multiple users with a single account
 			  //  name:         'Acme, Co.', // Account name
 			  //  created_at:   1364406966, // Unix timestamp for the date the account was created
 			  //  monthly_rate: 9.99, // Decimal; monthly rate of the account
 			  //  ltv:          1495.00, // Decimal; lifetime value of the account
 			  //  plan:         'Enhanced' // Plan name for the account
 			  //}
 			}]);
 			// Add default trigger to the bottom-right corner of the window:
 			UserVoice.push(['addTrigger', { mode: 'smartvote', trigger_position: 'bottom-right' }]);
 			// Or, use your own custom trigger:
 			//UserVoice.push(['addTrigger', '#id', { mode: 'smartvote' }]);
 			// Autoprompt for Satisfaction and SmartVote (only displayed under certain conditions)
 			UserVoice.push(['autoprompt', {}]);
 			</script>
 			::end::
 ::end::
@@ -1,4 +1,4 @@
-::use 'design.mtt'::
+<!--::use 'design.mtt'::-->
 <div class="text-center" style="height:400px;width:100%;">
 	<h1>
 		<span class="glyphicon glyphicon-cog"></span>
@@ -14,4 +14,4 @@
 </div>
-::end::
+<!--::end::-->
@@ -1,5 +1,5 @@
 {
-  "name": "CagettePei",
+  "name": "cagette-pei",
  "description": "le logiciel libre du circuit court",
  "license": "AGPL-3.0",
  "dependencies": {
@@ -47,5 +47,5 @@
  "bugs": {
    "url": "https://github.com/bablukid/cagette/issues"
  },
-  "version": "1.10.1"
+  "version": "1.11.2"
 }
@@ -1,5 +1,4 @@
 import db.User;
 import thx.semver.Version;
 import Common;
 class App extends sugoi.BaseApp {
@@ -10,13 +9,7 @@ class App extends sugoi.BaseApp {
 	public var eventDispatcher:hxevents.Dispatcher<Event>;
 	public var plugins:Array<sugoi.plugin.IPlugIn>;
-	/**
+	public static var VERSION = "cagette-pei"; // empty yet, cf.BaseApp.loadConfig
 	 * Version management
 	 * @doc https://github.com/fponticelli/thx.semver
 	 */
 	// public static var VERSION = ([0,9,2]  : Version).withPre("july");
 	// public static var VERSION = ([0,9,2]  : Version).withPre(MyMacros.getGitShortSHA(), MyMacros.getGitCommitDate());
 	public static var VERSION = "cagette-péi " + MyMacros.getGitCommitDate();
 	public function new() {
 		super();
@@ -1,4 +1,5 @@
 package controller;
 import db.UserContract;
 import sugoi.form.elements.DateDropdowns;
 import sugoi.form.elements.Input;
@@ -7,14 +8,13 @@ import sugoi.form.Form;
 import db.Contract;
 import Common;
 import plugin.Tutorial;
 using Std;
 import service.OrderService;
-class Contract extends Controller
+class Contract extends Controller {
-{
+	public function new() {
 	public function new() 
 	{
 		super();
 	}
@@ -29,14 +29,12 @@ class Contract extends Controller
 	 */
 	@tpl("contract/default.mtt")
 	function doDefault() {
 		// Create the list of links to change the language
-		var langs = App.config.get("langs").split(";");
+		var langs = App.config.get("langs", "fr").split(";");
-		var langNames = App.config.get("langnames").split(";");
+		var langNames = App.config.get("langnames", "Français").split(";");
 		var i = 0;
 		var langLinks = "";
-		for (lang in langs)
+		for (lang in langs) {
 		{
 			langLinks += "<li><a href=\"?lang=" + langs[i] + "\">" + langNames[i] + "</a></li>";
 			i++;
 		}
@@ -51,7 +49,8 @@ class Contract extends Controller
 		}
 		var ua = db.UserAmap.get(app.user, app.user.amap);
-		if (ua == null) throw Error("/", t._("You are not a member of this group"));
+		if (ua == null)
 			throw Error("/", t._("You are not a member of this group"));
 		var constOrders = null;
 		var varOrders = new Map<String, Array<db.UserContract>>();
@@ -64,7 +63,8 @@ class Contract extends Controller
 		constOrders = [];
 		for (c in contracts) {
 			var orders = app.user.getOrdersFromContracts([c]);
-			if (orders.length == 0) continue;
+			if (orders.length == 0)
 				continue;
 			constOrders.push({contract: c, orders: service.OrderService.prepare(orders)});
 		}
@@ -91,7 +91,6 @@ class Contract extends Controller
 		// final structure
 		var varOrders2 = new Array<{date:Date, orders:Array<UserOrder>}>();
 		for (k in varOrders.keys()) {
 			var d = new Date(k.split("-")[0].parseInt(), k.split("-")[1].parseInt() - 1, k.split("-")[2].parseInt(), 0, 0, 0);
 			var orders = service.OrderService.prepare(Lambda.list(varOrders[k]));
@@ -106,14 +105,10 @@ class Contract extends Controller
 		view.varOrders = varOrders2;
 		view.constOrders = constOrders;
 		// tutorials
 		if (app.user.isAmapManager()) {
 			// actions
 			if (app.params.exists('startTuto')) {
 				// start a tuto
 				app.user.lock();
 				var t = app.params.get('startTuto');
@@ -121,7 +116,6 @@ class Contract extends Controller
 				app.user.update();
 			}
 			// tuto state
 			var tutos = new Array<{name:String, completion:Float, key:String}>();
@@ -129,7 +123,8 @@ class Contract extends Controller
 				var t = Tutorial.all().get(k);
 				var completion = null;
-				if (app.user.tutoState!=null && app.user.tutoState.name == k) completion = app.user.tutoState.step / t.steps.length;
+				if (app.user.tutoState != null && app.user.tutoState.name == k)
 					completion = app.user.tutoState.step / t.steps.length;
 				tutos.push({name: t.name, completion: completion, key: k});
 			}
@@ -155,9 +150,9 @@ class Contract extends Controller
 	 */
 	@tpl("form.mtt")
 	function doEdit(c:db.Contract) {
 		view.category = 'contractadmin';
-		if (!app.user.isContractManager(c)) throw Error('/', t._("Forbidden action"));
+		if (!app.user.isContractManager(c))
 			throw Error('/', t._("Forbidden action"));
 		view.title = t._("Edit contract ::contractName::", {contractName: c.name});
@@ -176,7 +171,8 @@ class Contract extends Controller
 			c.amap = group;
 			// checks & warnings
-			if (c.hasPercentageOnOrders() && c.percentageValue==null) throw Error("/contract/edit/"+c.id, t._("If you would like to add fees to the order, define a rate (%) and a label."));
+			if (c.hasPercentageOnOrders() && c.percentageValue == null)
 				throw Error("/contract/edit/" + c.id, t._("If you would like to add fees to the order, define a rate (%) and a label."));
 			if (c.hasStockManagement()) {
 				for (p in c.getProducts()) {
@@ -193,7 +189,6 @@ class Contract extends Controller
 				app.session.addMessage(t._("Managing stock is not available for CSA contracts"), true);
 			}
 			c.update();
 			// update rights
@@ -212,7 +207,6 @@ class Contract extends Controller
 						x.update();
 					}
 				}
 			}
 			throw Ok("/contractAdmin/view/" + c.id, t._("Contract updated"));
@@ -224,7 +218,6 @@ class Contract extends Controller
 	@tpl("contract/insertChoose.mtt")
 	function doInsertChoose() {
 		// checkToken();
 	}
 	/**
@@ -232,8 +225,10 @@ class Contract extends Controller
 	 */
 	@tpl("form.mtt")
 	function doInsert(?type:Int) {
-		if (!app.user.canManageAllContracts()) throw Error('/', t._("Forbidden action"));
+		if (!app.user.canManageAllContracts())
-		if (type == null) throw Redirect('/contract/insertChoose');
+			throw Error('/', t._("Forbidden action"));
 		if (type == null)
 			throw Redirect('/contract/insertChoose');
 		view.title = if (type == db.Contract.TYPE_CONSTORDERS) t._("Create a contract with fixed orders") else t._("Create a contract with variable orders");
@@ -271,8 +266,8 @@ class Contract extends Controller
 	 * Delete a contract (... and its products, orders & distributions)
 	 */
 	function doDelete(c:db.Contract) {
-		
+		if (!app.user.canManageAllContracts())
-		if (!app.user.canManageAllContracts()) throw Error("/contractAdmin", t._("You don't have the authorization to remove a contract"));
+			throw Error("/contractAdmin", t._("You don't have the authorization to remove a contract"));
 		if (checkToken()) {
 			c.lock();
@@ -282,7 +277,8 @@ class Contract extends Controller
 			var orders = db.UserContract.manager.search($productId in Lambda.map(products, function(p) return p.id));
 			var qt = 0.0;
-			for ( o in orders) qt += o.quantity; //there could be "zero c qt" orders
+			for (o in orders)
 				qt += o.quantity; // there could be "zero c qt" orders
 			if (qt > 0) {
 				throw Error("/contractAdmin", t._("You cannot delete this contract because some orders are linked to it."));
 			}
@@ -315,12 +311,13 @@ class Contract extends Controller
 	 */
 	@tpl("contract/order.mtt")
 	function doOrder(c:db.Contract) {
 		// checks
-		if (app.user.amap.hasPayments()) throw Redirect("/contract/orderAndPay/" + c.id);
+		if (app.user.amap.hasPayments())
-		if (app.user.amap.hasShopMode()) throw Redirect("/shop");
+			throw Redirect("/contract/orderAndPay/" + c.id);
-		if (!c.isUserOrderAvailable()) throw Error("/", t._("This contract is not opened for orders"));
+		if (app.user.amap.hasShopMode())
-
+			throw Redirect("/shop");
 		if (!c.isUserOrderAvailable())
 			throw Error("/", t._("This contract is not opened for orders"));
 		var distributions = [];
 		// If its a varying contract, we display a column by distribution
@@ -335,7 +332,6 @@ class Contract extends Controller
 		var products = c.getProducts();
 		if (c.type == db.Contract.TYPE_VARORDER) {
 			for (d in distributions) {
 				var datas = [];
 				for (p in products) {
@@ -343,33 +339,30 @@ class Contract extends Controller
 					var order = db.UserContract.manager.select($user == app.user && $productId == p.id && $distributionId == d.id, true);
-					if (order != null) ua.order = order;
+					if (order != null)
 						ua.order = order;
 					datas.push(ua);
 				}
 				userOrders.push({distrib: d, datas: datas});
 			}
 		} else {
 			var datas = [];
 			for (p in products) {
 				var ua = {order: null, product: p};
 				var order = db.UserContract.manager.select($user == app.user && $productId == p.id, true);
-				if (order != null) ua.order = order;
+				if (order != null)
 					ua.order = order;
 				datas.push(ua);
 			}
 			userOrders.push({distrib: null, datas: datas});
 		}
 		// form check
 		if (checkToken()) {
 			// get dsitrib if needed
 			// var distrib : db.Distribution = null;
 			// if (c.type == db.Contract.TYPE_VARORDER) {
@@ -377,117 +370,11 @@ class Contract extends Controller
 			// }
 			for (k in app.params.keys()) {
-				
+				if (k.substr(0, 1) != "d")
 				if (k.substr(0, 1) != "d") continue;
 				var qt = app.params.get(k);
 				if (qt == "") continue;
 				var pid = null;
 				var did = null;
 				try{
 				pid = Std.parseInt(k.split("-")[1].substr(1));
 				did = Std.parseInt(k.split("-")[0].substr(1));
 				}catch (e:Dynamic){trace("unable to parse key "+k); }
 				//find related element in userOrders
 				var uo = null;
 				for ( x in userOrders){
 					if (x.distrib!=null && x.distrib.id != did) {
 					continue;
 					}else{
 						for (a in x.datas){
 							if (a.product.id == pid){
 								uo = a;
 								break;
 							}
 						}
 					}
 				}
 				if (uo == null) throw t._("Could not find the product ::produ:: and delivery ::deliv::", {produ:pid, deliv:did});
 				var q = 0.0;
 				if (uo.product.hasFloatQt ) {
 					var param = StringTools.replace(qt, ",", ".");
 					q = Std.parseFloat(param);
 				}else {
 					q = Std.parseInt(qt);
 				}
 				if (uo.order != null) {	
 					OrderService.edit(uo.order, q);
 				}else {
 					OrderService.make(app.user, q, uo.product, did);
 				}
 			}
 			throw Ok("/contract/order/"+c.id, t._("Your order has been updated"));
 		}
 		view.c = view.contract = c;
 		view.userOrders = userOrders;
 	}
 	/**
 	 * Make an order by contract ( standard mode ) + payment process
 	 */
 	@tpl("contract/orderAndPay.mtt")
 	function doOrderAndPay(c:db.Contract ) {
 		//checks
 		if (!app.user.amap.hasPayments()) throw Redirect("/contract/order/" + c.id);
 		if (app.user.amap.hasShopMode()) throw Redirect("/");
 		if (!c.isUserOrderAvailable()) throw Error("/", t._("This contract is not opened for orders"));
 		var distributions = [];
 		/* If its a varying contract, we display a column by distribution*/
 		if (c.type == db.Contract.TYPE_VARORDER) {
 			distributions = db.Distribution.getOpenToOrdersDeliveries(c);
 		}
 		//list of distribs with a list of product and optionnaly an order
 		var userOrders = new Array< {distrib:db.Distribution,datas:Array<{order:db.UserContract,product:db.Product}>} >();
 		var products = c.getProducts();
 		for ( d in distributions){
 			var datas = [];
 			for ( p in products) {
 				var ua = { order:null, product:p };
 				var order : db.UserContract = null;
 				if (c.type == db.Contract.TYPE_VARORDER) {
 					order = db.UserContract.manager.select($user == app.user && $productId == p.id && $distributionId==d.id, true);	
 				}else {
 					order = db.UserContract.manager.select($user == app.user && $productId == p.id, true);
 				}
 				if (order != null) ua.order = order;
 				datas.push(ua);
 			}
 			userOrders.push({distrib:d,datas:datas});
 		}
 		//form check
 		if (checkToken()) {
 			//get distrib if needed
 			var distrib = null;
 			if (c.type == db.Contract.TYPE_VARORDER) {
 				distrib = db.Distribution.manager.get(Std.parseInt(app.params.get("distribution")), false);
 			}
 			var orders : OrderInSession = {products:[],userId:app.user.id,total:0};
 			for (k in app.params.keys()) {
 				if (k.substr(0, 1) != "d") continue;
 				var qt = app.params.get(k);
-				if (qt == "") continue;
+				if (qt == "")
 					continue;
 				var pid = null;
 				var did = null;
@@ -513,7 +400,117 @@ class Contract extends Controller
 					}
 				}
-				if (uo == null) throw t._("Could not find the product ::produ:: and delivery ::deliv::", {produ:pid, deliv:did});
+				if (uo == null)
 					throw t._("Could not find the product ::produ:: and delivery ::deliv::", {produ: pid, deliv: did});
 				var q = 0.0;
 				if (uo.product.hasFloatQt) {
 					var param = StringTools.replace(qt, ",", ".");
 					q = Std.parseFloat(param);
 				} else {
 					q = Std.parseInt(qt);
 				}
 				if (uo.order != null) {
 					OrderService.edit(uo.order, q);
 				} else {
 					OrderService.make(app.user, q, uo.product, did);
 				}
 			}
 			throw Ok("/contract/order/" + c.id, t._("Your order has been updated"));
 		}
 		view.c = view.contract = c;
 		view.userOrders = userOrders;
 	}
 	/**
 	 * Make an order by contract ( standard mode ) + payment process
 	 */
 	@tpl("contract/orderAndPay.mtt")
 	function doOrderAndPay(c:db.Contract) {
 		// checks
 		if (!app.user.amap.hasPayments())
 			throw Redirect("/contract/order/" + c.id);
 		if (app.user.amap.hasShopMode())
 			throw Redirect("/");
 		if (!c.isUserOrderAvailable())
 			throw Error("/", t._("This contract is not opened for orders"));
 		var distributions = [];
 		/* If its a varying contract, we display a column by distribution*/
 		if (c.type == db.Contract.TYPE_VARORDER) {
 			distributions = db.Distribution.getOpenToOrdersDeliveries(c);
 		}
 		// list of distribs with a list of product and optionnaly an order
 		var userOrders = new Array<{distrib:db.Distribution, datas:Array<{order:db.UserContract, product:db.Product}>}>();
 		var products = c.getProducts();
 		for (d in distributions) {
 			var datas = [];
 			for (p in products) {
 				var ua = {order: null, product: p};
 				var order:db.UserContract = null;
 				if (c.type == db.Contract.TYPE_VARORDER) {
 					order = db.UserContract.manager.select($user == app.user && $productId == p.id && $distributionId == d.id, true);
 				} else {
 					order = db.UserContract.manager.select($user == app.user && $productId == p.id, true);
 				}
 				if (order != null)
 					ua.order = order;
 				datas.push(ua);
 			}
 			userOrders.push({distrib: d, datas: datas});
 		}
 		// form check
 		if (checkToken()) {
 			// get distrib if needed
 			var distrib = null;
 			if (c.type == db.Contract.TYPE_VARORDER) {
 				distrib = db.Distribution.manager.get(Std.parseInt(app.params.get("distribution")), false);
 			}
 			var orders:OrderInSession = {products: [], userId: app.user.id, total: 0};
 			for (k in app.params.keys()) {
 				if (k.substr(0, 1) != "d")
 					continue;
 				var qt = app.params.get(k);
 				if (qt == "")
 					continue;
 				var pid = null;
 				var did = null;
 				try {
 					pid = Std.parseInt(k.split("-")[1].substr(1));
 					did = Std.parseInt(k.split("-")[0].substr(1));
 				} catch (e:Dynamic) {
 					trace("unable to parse key " + k);
 				}
 				// find related element in userOrders
 				var uo = null;
 				for (x in userOrders) {
 					if (x.distrib != null && x.distrib.id != did) {
 						continue;
 					} else {
 						for (a in x.datas) {
 							if (a.product.id == pid) {
 								uo = a;
 								break;
 							}
 						}
 					}
 				}
 				if (uo == null)
 					throw t._("Could not find the product ::produ:: and delivery ::deliv::", {produ: pid, deliv: did});
 				// quantity
 				var q = 0.0;
@@ -528,7 +525,6 @@ class Contract extends Controller
 				var p = db.Product.manager.get(pid, false);
 				orders.total += p.getPrice() * q;
 			}
 			App.current.session.data.order = orders;
@@ -539,22 +535,17 @@ class Contract extends Controller
 			} else {
 				throw Ok("/transaction/pay/", t._("In order to save your order, please choose a means of payment."));
 			}
 		}
 		view.c = view.contract = c;
 		view.userOrders = userOrders;
 	}
 	/**
 	 * A user edit an order for a multidistrib.
 	 */
 	@tpl("contract/orderByDate.mtt")
 	function doEditOrderByDate(date:Date) {
 		if (app.user.amap.hasPayments()) {
 			// when payments are active, the user cannot modify his order
 			throw Redirect("/");
@@ -562,9 +553,9 @@ class Contract extends Controller
 		// cannot edit order if date is in the past
 		if (Date.now().getTime() > date.getTime()) {
 			var msg = t._("This delivery has already taken place, you can no longer modify the order.");
-			if (app.user.isContractManager()) msg += t._("<br/>As the manager of the contract you can modify the order from this page: <a href='/contractAdmin'>Management of contracts</a>");
+			if (app.user.isContractManager())
 				msg += t._("<br/>As the manager of the contract you can modify the order from this page: <a href='/contractAdmin'>Management of contracts</a>");
 			throw Error("/contract", msg);
 		}
@@ -575,23 +566,23 @@ class Contract extends Controller
 		var cids = Lambda.map(app.user.amap.getActiveContracts(true), function(c) return c.id);
 		var distribs = db.Distribution.manager.search(($contractId in cids) && $date >= d1 && $date <= d2, false);
-		var orders = db.UserContract.manager.search($userId==app.user.id && $distributionId in Lambda.map(distribs,function(d)return d.id)  );
+		var orders = db.UserContract.manager.search($userId == app.user.id
 			&& $distributionId in Lambda.map(distribs, function(d) return d.id));
 		view.orders = service.OrderService.prepare(orders);
 		view.date = date;
 		// form check
 		if (checkToken()) {
 			var orders_out = [];
 			for (k in app.params.keys()) {
 				var param = app.params.get(k);
 				if (k.substr(0, "product".length) == "product") {
 					// trouve le produit dans userOrders
 					var pid = Std.parseInt(k.substr("product".length));
 					var order = Lambda.find(orders, function(uo) return uo.product.id == pid);
-					if (order == null) throw t._("Error, could not find the order");
+					if (order == null)
 						throw t._("Error, could not find the order");
 					var q = 0.0;
 					if (order.product.hasFloatQt) {
@@ -606,7 +597,8 @@ class Contract extends Controller
 					if (order.distribution.canOrderNow()) {
 						// met a jour la commande
 						var o = OrderService.edit(order, quantity);
-						if(o!=null) orders_out.push( o );
+						if (o != null)
 							orders_out.push(o);
 					}
 				}
 			}
@@ -19,8 +19,6 @@ class ContractAdmin extends Controller {
 		if (!app.user.isContractManager())
 			throw Error("/", t._("You don't have the authorization to manage contracts"));
 		view.nav = ["contractadmin"];
 		App.log("first message");
 	}
 	public function sendNav(c) {
@@ -31,8 +31,8 @@ class Messages extends Controller {
 		var lists = getLists();
 		form.addElement(new StringInput("senderName", t._("Sender name"), senderName, true));
 		form.addElement(new StringInput("senderMail", t._("Sender E-Mail"), senderMail, true));
-		form.addElement(new StringSelect("list", t._("Recipients"), lists, "1", true, null, "style='width:500px;'"));
+		form.addElement(new StringSelect("list", t._("Recipients"), lists, "3", true, null, "style='width:500px;'"));
-		form.addElement(new StringInput("subject", t._("Subject:"), "", false, null, "style='width:500px;'"));
+		form.addElement(new StringInput("subject", t._("Subject:"), "", true, null, "style='width:500px;'"));
 		form.addElement(new TextArea("text", t._("Message:"), "", false, null, "style='width:500px;height:350px;'"));
 		if (form.checkToken()) {
@@ -52,7 +52,7 @@ class Messages extends Controller {
 			// send mail confirmation link
 			var e = new sugoi.mail.Mail();
 			e.setSender(App.config.get("default_email"), t._("Cagette.net"));
-			e.setSubject(subject);
+			e.setSubject('[cagettepei] $subject');
 			var replyTo = form.getValueOf("senderMail");
 			var replyToName = form.getValueOf("senderName");
@@ -63,9 +63,13 @@ class Messages extends Controller {
 				e.addRecipient(x);
 			var text:String = form.getValueOf("text");
 			if (text == null)
 				text = "";
 			var html = app.processTemplate("mail/message.mtt", {text: text, group: app.user.amap, list: getListName(listId)});
 			e.setHtmlBody(html);
 			App.log('text=[$text]');
 			App.log('html= ${e.getHtmlBody()}');
 			App.sendMail(e, app.user.getAmap(), listId, app.user);
 			// store message
@@ -82,8 +86,6 @@ class Messages extends Controller {
 			lm.insert();
 			throw Ok("/messages", t._("The message has been sent"));
 		} else {
 			App.log('Administrator #${app.user.id} <${senderName}> prepares sending an email from choices list');
 		}
 		view.form = form;
@@ -1,4 +1,5 @@
 package controller;
 import haxe.crypto.Md5;
 import sugoi.form.elements.Input;
 import sugoi.form.Form;
@@ -7,22 +8,16 @@ import sugoi.form.elements.StringInput;
 import sugoi.form.validators.EmailValidator;
 import ufront.mail.*;
-class User extends Controller
+class User extends Controller {
-{
+	public function new() {
 	public function new() 
 	{
 		super();
 	}
 	@tpl("user/default.mtt")
-	function doDefault() {
+	function doDefault() {}
 	}
 	@tpl("user/login.mtt")
 	function doLogin() {
 		if (App.current.user != null) {
 			throw Redirect('/');
 		}
@@ -35,15 +30,14 @@ class User extends Controller
 		}
 	}
 	/**
 	 * Choose which group to connect to.
 	 */
 	@logged
 	@tpl("user/choose.mtt")
 	function doChoose(?args:{amap:db.Amap}) {
-		
+		if (app.user == null)
-		if (app.user == null) throw t._("You are not connected");
+			throw t._("You are not connected");
 		var amaps = db.UserAmap.manager.search($user == app.user, false);
@@ -68,7 +62,6 @@ class User extends Controller
 		view.amaps = amaps;
 		view.wl = db.WaitingList.manager.search($user == app.user, false);
 		#if plugins
 		view.pros = pro.db.PUserCompany.getCompanies(app.user);
 		#end
@@ -85,7 +78,6 @@ class User extends Controller
 	 */
 	@tpl("user/forgottenPassword.mtt")
 	function doForgottenPassword(?key:String, ?u:db.User) {
 		// STEP 1
 		var step = 1;
 		var error:String = null;
@@ -118,10 +110,12 @@ class User extends Controller
 			var email:String = askmailform.getValueOf("email");
 			var user = db.User.manager.select(email == $email, false);
 			// could be user 2
-			if(user==null) user = db.User.manager.select(email == $email2, false);
+			if (user == null)
 				user = db.User.manager.select(email == $email2, false);
 			// user not found
-			if (user == null) throw Error(url, t._("This E-mail is not linked to a known account"));
+			if (user == null)
 				throw Error(url, t._("This E-mail is not linked to a known account"));
 			// create token
 			var token = haxe.crypto.Md5.encode("chp" + Std.random(1000000000));
@@ -130,8 +124,9 @@ class User extends Controller
 			var m = new sugoi.mail.Mail();
 			m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 			m.setRecipient(email, user.name);
-			m.setSubject( "["+App.config.NAME+"] : "+t._("Password change"));
+			m.setSubject("[" + App.config.NAME + "] " + t._("Password change"));
-			m.setHtmlBody( app.processTemplate('mail/forgottenPassword.mtt', { user:user, link:'http://' + App.config.HOST + '/user/forgottenPassword/'+token+"/"+user.id }) );
+			m.setHtmlBody(app.processTemplate('mail/forgottenPassword.mtt',
 				{user: user, link: 'http://' + App.config.HOST + '/user/forgottenPassword/' + token + "/" + user.id}));
 			App.sendMail(m);
 		}
@@ -151,7 +146,6 @@ class User extends Controller
 			step = 4;
 			if (chpassform.getValueOf("pass1") == chpassform.getValueOf("pass2")) {
 				var uid = Std.parseInt(chpassform.getValueOf("uid"));
 				var user = db.User.manager.get(uid, true);
 				var pass = chpassform.getValueOf("pass1");
@@ -161,10 +155,12 @@ class User extends Controller
 				var m = new sugoi.mail.Mail();
 				m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 				m.setRecipient(user.email, user.name);
-				if(user.email2!=null) m.setRecipient(user.email2, user.name);					
+				if (user.email2 != null)
 					m.setRecipient(user.email2, user.name);
 				m.setSubject("[" + App.config.NAME + "] : " + t._("New password confirmed"));
 				var emails = [user.email];
-				if(user.email2!=null) emails.push(user.email2);
+				if (user.email2 != null)
 					emails.push(user.email2);
 				var params = {
 					user: user,
 					emails: emails.join(", "),
@@ -173,7 +169,6 @@ class User extends Controller
 				}
 				m.setHtmlBody(app.processTemplate('mail/newPasswordConfirmed.mtt', params));
 				App.sendMail(m);
 			} else {
 				error = t._("You must key-in two times the same password");
 			}
@@ -187,7 +182,6 @@ class User extends Controller
 		view.error = error;
 	}
 	/**
 	 * generate a custom key for transactionnal emails, valid during the current day
 	 */
@@ -195,12 +189,11 @@ class User extends Controller
 	// return haxe.crypto.Md5.encode(App.config.get("key")+m.email+(Date.now().getDate())).substr(0,12);
 	// }
 	@logged
 	@tpl("form.mtt")
 	function doDefinePassword(?key:String, ?u:db.User) {
-		
+		if (app.user.isFullyRegistred())
-		if (app.user.isFullyRegistred()) throw Error("/", t._("You already have a password"));
+			throw Error("/", t._("You already have a password"));
 		var form = new Form("definepass");
 		var pass1 = new StringInput("pass1", t._("Your new password"));
@@ -211,14 +204,11 @@ class User extends Controller
 		form.addElement(pass2);
 		if (form.isValid()) {
 			if (form.getValueOf("pass1") == form.getValueOf("pass2")) {
 				app.user.lock();
 				app.user.setPass(form.getValueOf("pass1"));
 				app.user.update();
 				throw Ok('/', t._("Congratulations, your account is now protected by a password."));
 			} else {
 				form.addError(t._("You must key-in two times the same password"));
 			}
@@ -232,24 +222,19 @@ class User extends Controller
 	 * @param	k
 	 */
 	public function doValidate(k:String) {
 		var uid = Std.parseInt(sugoi.db.Cache.get("validation" + k));
-		if (uid == null || uid==0) throw Error('/user/login', t._("Your invitation is invalid or expired ($k)"));
+		if (uid == null || uid == 0)
 			throw Error('/user/login', t._("Your invitation is invalid or expired ($k)"));
 		var user = db.User.manager.get(uid, true);
 		db.User.login(user, user.email);
 		var groups = user.getAmaps();
-		if(groups.length>0)	app.session.data.amapId = groups.first().id;
+		if (groups.length > 0)
 			app.session.data.amapId = groups.first().id;
 		sugoi.db.Cache.destroy("validation" + k);
 		throw Ok("/user/definePassword", t._("Congratulations ::userName::, your account is validated!", {userName: user.getName()}));
 	}
 }
@@ -1,9 +1,9 @@
 package controller.admin;
 import haxe.web.Dispatch;
 import Common;
 class Admin extends Controller {
 	public function new() {
 		super();
 		view.category = 'admin';
@@ -13,7 +13,6 @@ class Admin extends Controller {
 		var e = Nav(nav, "admin");
 		app.event(e);
 		view.nav = e.getParameters()[0];
 	}
 	@tpl("admin/default.mtt")
@@ -30,24 +29,18 @@ class Admin extends Controller {
 		var count = sugoi.db.BufferedMail.manager.count($sdate == null);
 		view.browser = new sugoi.tools.ResultsBrowser(count, 10, browse);
 		view.num = count;
 	}
 	@tpl("form.mtt")
 	function doSmtp() {
 		var f = new sugoi.form.Form("emails");
-		var data = [
+		var data = [{label: "SMTP", value: "smtp"}, {label: "Mandrill API", value: "mandrill"},];
 			{label:"SMTP",value:"smtp"},
 			{label:"Mandrill API",value:"mandrill"},
 		];
 		var mailer = sugoi.db.Variable.get("mailer") == null ? "smtp" : sugoi.db.Variable.get("mailer");
-		var host = sugoi.db.Variable.get("smtp_host")==null ? App.config.get("smtp_host") : sugoi.db.Variable.get("smtp_host");
+		var host = sugoi.db.Variable.get("smtp_host") == null ? "<SMTP_SERVER>" : sugoi.db.Variable.get("smtp_host");
-		var port = sugoi.db.Variable.get("smtp_port")==null ? App.config.get("smtp_port") : sugoi.db.Variable.get("smtp_port");
+		var port = sugoi.db.Variable.get("smtp_port") == null ? "587" : sugoi.db.Variable.get("smtp_port");
-		var user = sugoi.db.Variable.get("smtp_user")==null ? App.config.get("smtp_user") : sugoi.db.Variable.get("smtp_user");
+		var user = sugoi.db.Variable.get("smtp_user") == null ? "" : sugoi.db.Variable.get("smtp_user");
-		var pass = sugoi.db.Variable.get("smtp_pass")==null ? App.config.get("smtp_pass") : sugoi.db.Variable.get("smtp_pass");
+		var pass = sugoi.db.Variable.get("smtp_pass") == null ? "" : sugoi.db.Variable.get("smtp_pass");
 		f.addElement(new sugoi.form.elements.StringSelect("mailer", "Mailer", data, mailer));
 		f.addElement(new sugoi.form.elements.StringInput("smtp_host", "host", host));
@@ -55,13 +48,11 @@ class Admin extends Controller {
 		f.addElement(new sugoi.form.elements.StringInput("smtp_user", "user", user));
 		f.addElement(new sugoi.form.elements.StringInput("smtp_pass", "pass", pass));
 		if (f.isValid()) {
 			for (k in ["mailer", "smtp_host", "smtp_port", "smtp_user", "smtp_pass"]) {
 				sugoi.db.Variable.set(k, f.getValueOf(k));
 			}
 			throw Ok("/admin/emails", t._("Configuration updated"));
 		}
 		view.title = t._("Email service configuration");
@@ -72,12 +63,9 @@ class Admin extends Controller {
 		d.dispatch(new controller.admin.Plugins());
 	}
 	@tpl("admin/taxo.mtt")
 	function doTaxo() {
 		view.categ = db.TxpCategory.manager.all();
 	}
 	/**
@@ -91,31 +79,31 @@ class Admin extends Controller {
 		view.like = args.like != null ? args.like : "";
 		var sql = "";
-		if( args.user!=null ) sql += " AND uid="+args.user;
+		if (args.user != null)
 			sql += " AND uid=" + args.user;
 		// if( args.like!=null && args.like != "" ) sql += " AND error like "+sys.db.Manager.cnx.quote("%"+args.like+"%");
 		if (args.empty) {
 			sys.db.Manager.cnx.request("truncate table Error");
 		}
-		var errorsStats = sys.db.Manager.cnx.request("select count(id) as c, DATE_FORMAT(date,'%y-%m-%d') as day from Error where date > NOW()- INTERVAL 1 MONTH "+sql+" group by day order by day").results();
+		var errorsStats = sys.db.Manager.cnx.request("select count(id) as c, DATE_FORMAT(date,'%y-%m-%d') as day from Error where date > NOW()- INTERVAL 1 MONTH "
 			+ sql
 			+ " group by day order by day")
 			.results();
 		view.errorsStats = errorsStats;
-		view.browser = new sugoi.tools.ResultsBrowser(
+		view.browser = new sugoi.tools.ResultsBrowser(sugoi.db.Error.manager.unsafeCount("SELECT count(*) FROM Error WHERE 1 " + sql), 20,
-			sugoi.db.Error.manager.unsafeCount("SELECT count(*) FROM Error WHERE 1 "+sql),
+			function(start, limit) {
-			20,
+				return sugoi.db.Error.manager.unsafeObjects("SELECT * FROM Error WHERE 1 " + sql + " ORDER BY date DESC LIMIT " + start + "," + limit, false);
-			function(start, limit) {  return sugoi.db.Error.manager.unsafeObjects("SELECT * FROM Error WHERE 1 "+sql+" ORDER BY date DESC LIMIT "+start+","+limit,false); }
+			});
 		);
 	}
 	@tpl("admin/graph.mtt")
 	function doGraph(?key:String, ?year:Int, ?month:Int) {
 		var from = new Date(year, month, 1, 0, 0, 0);
 		var to = new Date(year, month + 1, 0, 23, 59, 59);
 		if (app.params.exists("recompute")) {
 			switch (key) {
 				case "basket":
 					for (d in 1...to.getDate()) {
@@ -124,12 +112,8 @@ class Admin extends Controller {
 						var value = db.Basket.manager.count($cdate >= _from && $cdate <= _to);
 						var g = db.Graph.record(key, value, _from);
 						// trace(value,_from,g);
 					}
 			}
 		}
 		var data = db.Graph.getRange(key, from, to);
@@ -140,18 +124,14 @@ class Admin extends Controller {
 		var averageValue = 0.0;
 		var total = 0.0;
-		for( d in data) total += d.value;
+		for (d in data)
 			total += d.value;
 		averageValue = total / data.length;
 		view.total = total;
 		view.averageValue = averageValue;
 	}
 	function doFixDistribValidation() {
 		Sys.println("===== Liste des distributions ayant été re-validées ====<br>");
 		// Get the current group
@@ -161,18 +141,14 @@ class Admin extends Controller {
 		// Get all the validated distributions for this given group
 		var validatedDistribs = db.Distribution.manager.search(($contractId in contractIds) && $validated == true, {orderBy: date}, false);
 		for (distrib in validatedDistribs) {
 			service.PaymentService.validateDistribution(distrib);
 			Sys.println(distrib.toString() + "<br>");
 		}
 		Sys.println("===== Fin de la liste ====");
 	}
 	function doCheckDistribValidation() {
 		Sys.println("===== Liste des distributions validées ayant des opérations/paiements non validés ====<br>");
 		// Get the current group
@@ -182,11 +158,10 @@ class Admin extends Controller {
 		// Get all the validated distributions for this given group
 		var validatedDistribs = db.Distribution.manager.search(($contractId in contractIds) && $validated == true, {orderBy: date}, false);
 		for (distrib in validatedDistribs) {
 			for (user in distrib.getUsers()) {
 				var basket = db.Basket.get(user, distrib.place, distrib.date);
-				if (basket == null || basket.isValidated()) continue;
+				if (basket == null || basket.isValidated())
 					continue;
 				for (order in basket.getOrders()) {
 					if (!order.paid) {
@@ -197,27 +172,21 @@ class Admin extends Controller {
 				var operation = basket.getOrderOperation(false);
 				if (operation != null) {
 					if (operation.pending) {
 						Sys.println(distrib.toString() + "<br>");
 						Sys.println(operation.toString() + "<br>");
 					}
 					for (payment in basket.getPayments()) {
 						if (payment.pending) {
 							Sys.println(distrib.toString() + "<br>");
 							Sys.println(payment.toString() + "<br>");
 						}
 					}
 				}
 			}
 		}
 		Sys.println("===== Fin de la liste ====");
 	}
 }
@@ -1,9 +1,9 @@
 package sugoi;
 import sugoi.i18n.TemplateTranslator;
 import sugoi.Web;
 class BaseApp {
 	public var cnx:sys.db.Connection;
 	public var template:templo.Loader;
 	public var maintain:Bool;
@@ -16,10 +16,10 @@ class BaseApp {
 	public var uri:String;
 	public static var config:Config;
 	// public static var classPathes = sugoi.tools.Macros.getClassPathes();
 	public function new() {
 		if (config == null) {
 			loadConfig();
 		}
@@ -28,24 +28,32 @@ class BaseApp {
 		cookieDomain = "." + App.config.HOST;
 		#if plugins
-		if( false ) sugoi.plugin.PlugIn.copyTpl();
+		if (false)
 			sugoi.plugin.PlugIn.copyTpl();
 		#end
 		// This macro generates translated templates for each langage
 		#if i18n_generation
-		if( false ) TemplateTranslator.parse("lang/master");
+		if (false)
 			TemplateTranslator.parse("lang/master");
 		#end
 	}
 	public function loadConfig() {
 		App.config = BaseApp.config = new sugoi.Config();
 		var PATH = Web.getCwd() + "../";
 		var json = haxe.Json.parse(sys.io.File.getContent(PATH + "package.json"));
 		App.VERSION = json.version;
 		App.log('configuration has been reloaded, VERSION=${App.VERSION}');
 	}
 	public function loadTemplate(t:String) {
 		templo.Loader.OPTIMIZED = App.config.DEBUG == false;
 		templo.Loader.BASE_DIR = App.config.TPL;
 		templo.Loader.TMP_DIR = App.config.TPL_TMP;
-		if ( t == null ) return null;		
+		if (t == null)
 			return null;
 		#if neko
 		return new templo.Loader(t, App.config.getBool("cachetpl"));
 		#else
@@ -58,8 +66,8 @@ class BaseApp {
 	}
 	public function initLang(lang:String) {
-		
+		if (lang == null || lang == "")
-		if (lang == null || lang == "") lang = config.LANG;
+			lang = config.LANG;
 		// Define template path
 		var path;
@@ -83,8 +91,8 @@ class BaseApp {
 	}
 	function saveAndClose() {
-		
+		if (cnx == null)
-		if( cnx == null ) return;
+			return;
 		if (session.sid != null)
 			session.update();
@@ -97,10 +105,12 @@ class BaseApp {
 	function executeTemplate(?save) {
 		view.init();
 		var result = template.execute(view);
-		if ( save ) saveAndClose();
+		if (save)
 			saveAndClose();
 		#if php
 		// strange bug with templo in PHP
-		if (result.substr(0, 4) == "null") result = result.substr(4);
+		if (result.substr(0, 4) == "null")
 			result = result.substr(4);
 		#end
 		Sys.print(result);
 	}
@@ -137,14 +147,13 @@ class BaseApp {
 		return App.config.LANG;
 	}
 	/**
 	 * Setup current app language
 	 */
 	function setupLang() {
 		// this app is monolingual and doesn't manage i18n
-		if (App.config.LANG == "master") return;
+		if (App.config.LANG == "master")
 			return;
 		// lang is taken from user object or from HTTP headers
 		if (session.lang == null || !Lambda.has(App.config.LANGS, session.lang)) {
@@ -155,7 +164,6 @@ class BaseApp {
 		var lang = params.get("lang");
 		if (lang != null && Lambda.has(App.config.LANGS, lang)) {
 			session.lang = lang;
 		}
 		// init lang
@@ -170,7 +178,8 @@ class BaseApp {
 	}
 	public function rollback() {
-		if( cnx != null ) cnx.rollback();
+		if (cnx != null)
 			cnx.rollback();
 		sys.db.Manager.cleanup();
 		if (user != null && session != null)
 			user = session.user;
@@ -189,8 +198,10 @@ class BaseApp {
 		// Get session
 		var sids = [];
 		var cookieSid = Web.getCookies().get(cookieName);
-		if( params.exists("sid") ) sids.push(params.get("sid"));
+		if (params.exists("sid"))
-		if( cookieSid != null ) sids.push(cookieSid);
+			sids.push(params.get("sid"));
 		if (cookieSid != null)
 			sids.push(cookieSid);
 		session = sugoi.db.Session.init(sids);
 		// Check for maintenance
@@ -200,7 +211,6 @@ class BaseApp {
 		// setup langage
 		setupLang();
 		if (maintain && ((user != null && user.isAdmin())))
 			maintain = false;
@@ -214,9 +224,9 @@ class BaseApp {
 		// dispatching
 		try {
 			uri = Web.getURI();
-			if ( StringTools.endsWith(uri, "/index.n") ) uri = uri.substr(0, -8);
+			if (StringTools.endsWith(uri, "/index.n"))
 				uri = uri.substr(0, -8);
 			// "before dispatch" callback
 			beforeDispatch();
@@ -224,9 +234,7 @@ class BaseApp {
 			var d = new haxe.web.Dispatch(uri, params);
 			d.onMeta = onMeta;
 			d.dispatch(new controller.Main());
 		} catch (e:haxe.web.Dispatch.DispatchError) {
 			// dispatch / routing error
 			if (App.config.DEBUG) {
 				#if neko
@@ -238,9 +246,7 @@ class BaseApp {
 			cnx.rollback();
 			Web.redirect("/");
 			return;
 		} catch (e:sugoi.ControllerAction) {
 			switch (e) {
 				case RedirectAction(url):
 					Web.redirect(url);
@@ -251,8 +257,12 @@ class BaseApp {
 						url = Web.getURI();
 					}
 					Web.redirect(url);
-				var error = switch(e) { case ErrorAction(_): true; default: false; };
+					var error = switch (e) {
-				if( error ) rollback();
+						case ErrorAction(_): true;
 						default: false;
 					};
 					if (error)
 						rollback();
 					if (error) {
 						session.addMessage(text, true);
 					} else {
@@ -274,9 +284,7 @@ class BaseApp {
 	 * Override this function if you want 
 	 * to insert some actions 
 	 */
-	public function beforeDispatch() {
+	public function beforeDispatch() {}
 	}
 	public function logError(e:Dynamic, ?stack:String) {
 		var stack = if (stack != null) stack else haxe.CallStack.toString(haxe.CallStack.exceptionStack());
@@ -316,7 +324,6 @@ class BaseApp {
 			setTemplate("error.mtt");
 			executeTemplate(false);
 		} catch (e:Dynamic) {
 			Sys.print("<pre>");
 			Sys.println("Error : " + try Std.string(e) catch (e:Dynamic) "???");
@@ -380,9 +387,11 @@ class BaseApp {
 	}
 	function run() {
 		// Will close the connection
-		sys.db.Transaction.main(cnx, cloneApp, function(e) { var b : BaseApp = App.current; b.errorHandler(e); });
+		sys.db.Transaction.main(cnx, cloneApp, function(e) {
 			var b:BaseApp = App.current;
 			b.errorHandler(e);
 		});
 		App.current = null;
 	}
@@ -396,13 +405,13 @@ class BaseApp {
 	}
 	static function main() {
 		/**
 		 * this macro will parse the code and generate the allTexts.pot file
 		 * which will be used as a template for translation files (*.po and *.mo)
 		 */
 		#if i18n_parsing
-		if( false ) sugoi.i18n.GetText.parse(["src", "lang/master","js","common"], "www/lang/allTexts.pot");
+		if (false)
 			sugoi.i18n.GetText.parse(["src", "lang/master", "js", "common"], "www/lang/allTexts.pot");
 		#end
 		App.current = new App();
@@ -3,7 +3,6 @@ package sugoi;
 import sugoi.Web;
 class Config {
 	public var PATH:String;
 	// public var json : Dynamic;
 	public var xml:Xml;
@@ -20,16 +19,16 @@ class Config {
 	public function new(?path:String) {
 		PATH = (path != null) ? path : Web.getCwd() + "../";
 		//json = haxe.Json.parse(sys.io.File.getContent(PATH + "config.json"));	
 		xml = Xml.parse(sys.io.File.getContent(PATH + "config.xml")).firstElement();
-		LANG = get("lang");
+		NAME = get("name", "cagettepei");
-		LANGS = get("langs").split(";");
+		LANG = get("lang", "fr");
 		LANGS = get("langs", "fr").split(";");
 		TPL = PATH + "lang/" + LANG + "/tpl/";
 		TPL_TMP = PATH + "lang/" + LANG + "/tmp/";
 		DEBUG = get("debug", "0") == "1";
 		HOST = get("host");
 		NAME = get("name");
 		KEY = get("key");
 		DATA_HOST = get("dataHost", "data." + HOST);
 		SQL_LOG = getBool("sqllog", false);
@@ -42,7 +41,8 @@ class Config {
 	public function getBool(val:String, ?def) {
 		var v = get(val);
-		if( v == null ) return def;
+		if (v == null)
 			return def;
 		return (v == "1" || v == "true");
 	}
@@ -59,5 +59,4 @@ class Config {
 	public function getInt(val:String, ?def:Int):Int {
 		return Std.parseInt(get(val, Std.string(def)));
 	}
 }
@@ -32,8 +32,8 @@ class Mail implements IMail {
 	public function setSender(email, ?name, ?userId) {
 		if (!isValid(email))
 			throw "invalid sender email : \"" + email + "\"";
-
+		var finalName = (name != null) ? thx.text.Diactrics.clean(name) : null;
-		sender = {name: name, email: email, userId: userId};
+		sender = {name: finalName, email: email, userId: userId};
 		return this;
 	}
@@ -1538,7 +1538,7 @@ msgid ""
 "Group and user 'admin' created. Your email is 'admin@cagette.net' and your "
 "password is 'admin'"
 msgstr ""
-"Groupe et utilisateur 'admin' créé. Votre email est 'admin@cagette.net' et "
+"Groupe et utilisateur 'admin' créé. Votre email est 'admin@cagettepei.re' et "
 "votre mot de passe est 'admin'"
 #: src/controller/Install.hx:4677
@@ -2237,7 +2237,7 @@ msgid ""
 "Welcome in the group of ::name::!\n"
 " You can look at the delivery planning or make a new order."
 msgstr ""
-"Bienvenue sur la cagette de ::name:: !\n"
+"Bienvenue sur le CagettePéi de ::name:: !\n"
 " Vous pouvez consulter votre planning de distribution ou faire une nouvelle "
 "commande."
@@ -4551,7 +4551,7 @@ msgstr "Extrait non exhaustif des produits proposés :"
 #: lang/master/tpl/group/view.mtt:5027
 msgid "http://www.cagette.net"
-msgstr "http://www.cagette.net"
+msgstr "https://git.artcode.re/cagetters/cagettepei"
 #: lang/master/tpl/group/view.mtt:5060
 msgid "Cagette.net, the free software of food direct-selling"
@@ -4618,7 +4618,7 @@ msgid ""
 "Cagette.net is made by <a href='https://www.alilo.fr' target='_blank'><img "
 "src='/img/alilo-trans-black.png' /></a>"
 msgstr ""
-"CagettePéi est une fourche du logiciel Cagette.net réalisé par <a href='https://www.alilo.fr' "
+"CagettePéi est un logiciel libre, fourche du logiciel Cagette "
 "target='_blank'><img src='/img/alilo-trans-black.png' /></a>"
 #: lang/master/tpl/validate/user.mtt:2124
Author	SHA1	Message	Date
pvincent	bb50c92230	tagged as 1.11.2	2021-08-30 22:49:49 +04:00
pvincent	98dffaebed	fix config missing key	2021-08-30 22:49:34 +04:00
pvincent	ca6aceffbc	tagged as 1.11.1	2021-08-30 21:48:13 +04:00
pvincent	c4ea83cca9	better README	2021-08-30 21:47:25 +04:00
pvincent	6c4aa6d9ea	tagged as 1.11.0	2021-08-30 21:10:58 +04:00
pvincent	cdfe52715f	simpler config + new logo	2021-08-30 21:10:33 +04:00
pvincent	8bd119a818	maintain	2021-08-30 18:30:00 +04:00
pvincent	0854d556fe	cagettepéi	2021-08-30 17:44:14 +04:00
pvincent	278f69e7d9	tagged as 1.10.2	2021-08-29 21:31:33 +04:00
pvincent	8699728593	version cagettepei	2021-08-29 21:31:16 +04:00