tagged as 1.10.2

.semver_git_tag

@@ -1 +1 @@
-1.10.0
+1.10.2

Makefile

@@ -41,7 +41,7 @@ install_dev:
 #compile backend to Neko
 compile:
 	@if [ $(PLUGINS) = 1 ]; then \
-	echo "compile Cagette.net with plugins"; \
+	echo "compile CagettePéi plugins"; \
 	haxe cagetteAllPlugins.hxml; \
 	else \
 	echo "compile CagettePéi core"; \
@@ -74,7 +74,7 @@ templates:
 	@make LANG=fr ctemplates
 	msgfmt www/lang/texts_fr.po -o www/lang/texts_fr.mo 
 	chown www-data:www-data -R www
-	chown www-data:www-data -R lang
+	chown www-data:www-data -R lang/fr
 
 ctemplates:
 	(cd lang/$(LANG)/tpl; temploc2 -macros macros.mtt -output ../tmp/ *.mtt */*.mtt */*/*.mtt)

cagette.hxml

@@ -21,6 +21,7 @@
 -lib tink_streams:0.2.1
 -lib tink_syntaxhub:0.4.3
 -lib tink_typecrawler:0.7.0
+-lib thx.text:0.2.1
 
 ## GIT
 # -lib sugoi:git:https://git.artcode.re/cagetters/sugoi.git

js/react/user/LoginBox.hx

@@ -1,4 +1,5 @@
 package react.user;
+
 import react.ReactComponent;
 import react.ReactMacro.jsx;
 import Common;
@@ -19,23 +20,21 @@ typedef LoginBoxState = {
  * Login Box
  * @author fbarbut
  */
-class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBoxState>
-{
+class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps, LoginBoxState> {
+	public function new(props:LoginBoxProps) {
+		if (props.redirectUrl == null)
+			props.redirectUrl = "/";
+		if (props.message == "")
+			props.message = null;
+		super(props);
+		this.state = {email: "", password: "", error: null};
+	}
 
-	public function new(props:LoginBoxProps) 
-	{
-		if (props.redirectUrl == null) props.redirectUrl = "/";
-		if (props.message == "") props.message = null;
-		super(props);		
-		this.state = {email:"", password:"", error:null};
+	function setError(err:String) {
+		this.setState(cast {error: err});
 	}
-	
-	function setError(err:String){
-		this.setState(cast {error:err});
-	}
-	
-	override public function render(){
-		
+
+	override public function render() {
 		return jsx('<div onKeyPress=$onKeyPress>
 			<$Error error="${state.error}" />
 			<$Message message="${props.message}" />
@@ -62,78 +61,75 @@ class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBo
 			<!--
 			<hr/>
 			<p className="text-center">
-				<b>C\'est votre première visite sur Cagette.net ?</b>&nbsp;&nbsp;
+				<b>C\'est votre première visite sur CagettePéi ?</b>&nbsp;&nbsp;
 				<a onClick={registerBox} className="btn btn-default"><span className="glyphicon glyphicon-chevron-right"></span> S\'inscrire</a>
 			</p>
 			-->
 		</div>');
 	}
-	
+
 	/**
 	 * @doc https://facebook.github.io/react/docs/forms.html
 	 */
-	function onChange(e:js.html.Event){
+	function onChange(e:js.html.Event) {
 		e.preventDefault();
-		
-		var name :String = untyped e.target.name;
-		var value :String = untyped /*(e.target.value == "") ? null :*/ e.target.value;
+
+		var name:String = untyped e.target.name;
+		var value:String = untyped /*(e.target.value == "") ? null :*/ e.target.value;
 		Reflect.setField(state, name, value);
 		this.setState(this.state);
 	}
-	
+
 	/**
 	 * displays a registerBox
 	 */
-	public function registerBox(){
-		
+	public function registerBox() {
 		var body = js.Browser.document.querySelector('#myModal .modal-body');
-		ReactDOM.unmountComponentAtNode( body );
-	
+		ReactDOM.unmountComponentAtNode(body);
+
 		js.Browser.document.querySelector("#myModal .modal-title").innerHTML = "Inscription";
-		ReactDOM.render(jsx('<$RegisterBox redirectUrl="${props.redirectUrl}" phoneRequired="${props.phoneRequired}"/>'),  body );
+		ReactDOM.render(jsx('<$RegisterBox redirectUrl="${props.redirectUrl}" phoneRequired="${props.phoneRequired}"/>'), body);
 	}
-	
-	public function submit(?e:js.html.Event){
-		
-		if (state.email == ""){
+
+	public function submit(?e:js.html.Event) {
+		if (state.email == "") {
 			setError("Veuillez saisir votre email");
 			return;
 		}
-		if (state.password == ""){
+		if (state.password == "") {
 			setError("Veuillez saisir votre mot de passe");
 			return;
 		}
-		
-		//lock button
-		var el: js.html.Element = null;
-		if(e!=null){
+
+		// lock button
+		var el:js.html.Element = null;
+		if (e != null) {
 			el = cast e.target;
 			el.classList.add("disabled");
 		}
-	
-		
+
 		var req = new haxe.Http("/api/user/login");
 		req.addParameter("email", state.email);
 		req.addParameter("password", state.password);
 		req.addParameter("redirecturl", props.redirectUrl);
-		
-		req.onData = req.onError = function(d){
-			
+
+		req.onData = req.onError = function(d) {
 			var d = req.responseData;
-			
-			if(e!=null) el.classList.remove("disabled");
-			
+
+			if (e != null)
+				el.classList.remove("disabled");
+
 			var d = haxe.Json.parse(d);
-			if (Reflect.hasField(d, "error"))	setError(d.error.message);
-			if (Reflect.hasField(d, "success")) js.Browser.window.location.href = props.redirectUrl;
+			if (Reflect.hasField(d, "error"))
+				setError(d.error.message);
+			if (Reflect.hasField(d, "success"))
+				js.Browser.window.location.href = props.redirectUrl;
 		}
 		req.request(true);
 	}
 
-	function onKeyPress(e:js.html.KeyboardEvent){
-		if(e.key=="Enter") submit();
+	function onKeyPress(e:js.html.KeyboardEvent) {
+		if (e.key == "Enter")
+			submit();
 	}
-	
-	
-	
-}
+}

lang/master/tpl/base.mtt

@@ -11,7 +11,7 @@
 			::end::
 		</title>
 		
-		<!-- Cagette CSS -->
+		<!-- CagettePéi CSS -->
 		<link rel="stylesheet" type="text/css" href="/css/::getVariable('css')::/style.css"/>
 		<!--
 			<link rel="stylesheet" type="text/css" href="/css/::getVariable('css')::/shop.css"/>

lang/master/tpl/design.mtt

@@ -14,7 +14,7 @@
 					<h1>::groupName::</h1>
 				::else::
 					<div style="margin-bottom:22px;" >
-							<a href="https://git.artcode.re/cagetters/cagette" target="_blank">
+							<a href="https://git.artcode.re/cagetters/cagettepei" target="_blank">
 								<img src="/img/logo3.png" alt="::NAME::" />
 							</a>
 					</div>		
@@ -121,7 +121,7 @@
 		<!--<div class="row">
 			<div class="col-md-12 alert-danger text-center" style="border-radius: 8px;margin:8px 0;padding:8px 0;">
 				<span class="glyphicon glyphicon-cog"></span>
-				Attention : Cagette.net sera indisponible le <b>mardi 7 août de 9:00 à 11:00</b>.
+				Attention : CagettePéi sera indisponible le <b>mardi 7 août de 9:00 à 11:00</b>.
 				<br/>
 				Nous déménageons sur un nouveau serveur pour plus de rapidité et de fiabilité.
 			</div>
@@ -199,7 +199,7 @@
 			<!--
 			::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>
+			<span>version cagettepei-<a href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a></span>
 		</div>
 		
 		<div class="row">

lang/master/tpl/messages/default.mtt

@@ -29,7 +29,7 @@
 <div class="col-md-9">
 	<div class="article">
 		<h3>::_("Send an e-mail")::</h3>		
-		
+
 		::raw form::
 	</div>
 </div>

package.json

@@ -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.0"
+  "version": "1.10.2"
 }

src/App.hx

@@ -16,7 +16,8 @@ class App extends sugoi.BaseApp {
 	 */
 	// 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 static var VERSION = "cagette-péi " + MyMacros.getGitCommitDate();
+	public static var VERSION = "cagette-pei"; // empty yet, cf.BaseApp.loadConfig
 
 	public function new() {
 		super();
@@ -287,7 +288,7 @@ class App extends sugoi.BaseApp {
 		var e = new sugoi.mail.Mail();
 		e.setSubject(subject);
 		e.setRecipient(to);
-		e.setSender(App.config.get("default_email"), "Cagette.net");
+		e.setSender(App.config.get("default_email"), t._("Cagette.net"));
 		var html = App.current.processTemplate("mail/message.mtt", {text: html, group: group});
 		e.setHtmlBody(html);
 		App.sendMail(e);

src/controller/Cron.hx

@@ -77,7 +77,7 @@ class Cron extends Controller {
 			}
 
 			var m = new Mail();
-			m.setSender(App.config.get("default_email"), "Cagette.net");
+			m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 			m.addRecipient(App.config.get("webmaster_email"));
 			m.setSubject(App.config.NAME + " Errors");
 			m.setHtmlBody(app.processTemplate("mail/message.mtt", {text: report.toString()}));
@@ -306,7 +306,7 @@ class Cron extends Controller {
 
 					try {
 						var m = new Mail();
-						m.setSender(App.config.get("default_email"), "Cagette.net");
+						m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 						if (group.contact != null)
 							m.setReplyTo(group.contact.email, group.name);
 						m.addRecipient(u.user.email, u.user.getName());

src/controller/Messages.hx

@@ -41,11 +41,6 @@ class Messages extends Controller {
 			var subject = form.getValueOf("subject");
 
 			App.log('about to send email <$subject> to listId=<$listId> to ${dest.length} recipient(s)');
-			// Sys.command("sh", [
-			// 	"-c",
-			// 	"sendemail -f no-reply@comptoirduvrac.re -s mail1.zourit.net:587 -t pvincent@comptoirduvrac.re -bcc 'pvincent974@gmail.com, pvincent974@laposte.net' -u TEST -m coucou -xu postmaster@comptoirduvrac.re -xp QqQeAPT6EpoK"
-			// ]);
-
 			var mails = [];
 			for (d in dest) {
 				if (d.email != null)
@@ -56,7 +51,7 @@ class Messages extends Controller {
 
 			// send mail confirmation link
 			var e = new sugoi.mail.Mail();
-			e.setSender(App.config.get("default_email"));
+			e.setSender(App.config.get("default_email"), t._("Cagette.net"));
 			e.setSubject(subject);
 
 			var replyTo = form.getValueOf("senderMail");
@@ -64,20 +59,9 @@ class Messages extends Controller {
 			if (replyTo != null)
 				e.setReplyTo(replyTo, replyToName);
 
-			if (mails.length > 1) {
-				var cc = mails.join(",");
-				App.log('add header Cc: $cc');
-				e.setHeader("CC:", cc);
-				// for (x in mails)
-				// 	e.addRecipient(x);
-				e.addRecipient(e.getSender().email);
-			} else {
-				App.log('no header');
-				e.addRecipient(mails[0]);
-			}
+			for (x in mails)
+				e.addRecipient(x);
 
-			// sender : default email ( explicitly tells that the server send an email on behalf of the user )
-			// e.setHeader("Sender", App.config.get("default_email"));
 			var text:String = form.getValueOf("text");
 			var html = app.processTemplate("mail/message.mtt", {text: text, group: app.user.amap, list: getListName(listId)});
 			e.setHtmlBody(html);
@@ -98,6 +82,8 @@ 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;

src/service/OrderService.hx

@@ -1,4 +1,5 @@
 package service;
+
 import Common;
 import tink.core.Error;
 
@@ -6,10 +7,8 @@ import tink.core.Error;
  * Order Service
  * @author web-wizard,fbarbut
  */
-class OrderService
-{
-
-	static function canHaveFloatQt(product:db.Product):Bool{
+class OrderService {
+	static function canHaveFloatQt(product:db.Product):Bool {
 		return product.hasFloatQt || product.wholesale || product.variablePrice;
 	}
 
@@ -20,42 +19,45 @@ class OrderService
 	 * @param	productId
 	 */
 	public static function make(user:db.User, quantity:Float, product:db.Product, ?distribId:Int, ?paid:Bool, ?user2:db.User, ?invert:Bool):db.UserContract {
-		
 		var t = sugoi.i18n.Locale.texts;
 
-		if(product.contract.type==db.Contract.TYPE_VARORDER && distribId==null) throw "You have to provide a distribId";
-		if(quantity==null) throw "Quantity is null";
+		if (product.contract.type == db.Contract.TYPE_VARORDER && distribId == null)
+			throw "You have to provide a distribId";
+		if (quantity == null)
+			throw "Quantity is null";
 
-		//quantity
-		if ( !canHaveFloatQt(product) ){
-			if( !tools.FloatTool.isInt(quantity)  ) {
-				throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer",{product:product.name}));
+		// quantity
+		if (!canHaveFloatQt(product)) {
+			if (!tools.FloatTool.isInt(quantity)) {
+				throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer", {product: product.name}));
 			}
 		}
-		
-		//multiweight : make one row per product
-		if (product.multiWeight && quantity > 1.0){
-			if (product.multiWeight && quantity != Math.abs(quantity)) throw t._("multi-weighing products should be ordered only with integer quantities");
-			
+
+		// multiweight : make one row per product
+		if (product.multiWeight && quantity > 1.0) {
+			if (product.multiWeight && quantity != Math.abs(quantity))
+				throw t._("multi-weighing products should be ordered only with integer quantities");
+
 			var o = null;
-			for ( i in 0...Math.round(quantity)){
+			for (i in 0...Math.round(quantity)) {
 				o = make(user, 1, product, distribId, paid, user2, invert);
-			}			
+			}
 			return o;
 		}
-		
-		//checks
-		if (quantity <= 0) return null;
-		
-		//check for previous orders on the same distrib
+
+		// checks
+		if (quantity <= 0)
+			return null;
+
+		// check for previous orders on the same distrib
 		var prevOrders = new List<db.UserContract>();
 		if (distribId == null) {
-			prevOrders = db.UserContract.manager.search($product==product && $user==user, true);
-		}else {
-			prevOrders = db.UserContract.manager.search($product==product && $user==user && $distributionId==distribId, true);
+			prevOrders = db.UserContract.manager.search($product == product && $user == user, true);
+		} else {
+			prevOrders = db.UserContract.manager.search($product == product && $user == user && $distributionId == distribId, true);
 		}
-		
-		//Create order object
+
+		// Create order object
 		var o = new db.UserContract();
 		o.product = product;
 		o.quantity = quantity;
@@ -66,214 +68,214 @@ class OrderService
 		o.user = user;
 		if (user2 != null) {
 			o.user2 = user2;
-			if (invert != null) o.flags.set(InvertSharedOrder);
+			if (invert != null)
+				o.flags.set(InvertSharedOrder);
 		}
-		if (paid != null) o.paid = paid;
-		if (distribId != null) o.distribution = db.Distribution.manager.get(distribId);
-		
-		//cumulate quantities if there is a similar previous order
+		if (paid != null)
+			o.paid = paid;
+		if (distribId != null)
+			o.distribution = db.Distribution.manager.get(distribId);
+
+		// cumulate quantities if there is a similar previous order
 		if (prevOrders.length > 0 && !product.multiWeight) {
 			for (prevOrder in prevOrders) {
-				//if (!prevOrder.paid) {
-					o.quantity += prevOrder.quantity;
-					prevOrder.delete();
-				//}
+				// if (!prevOrder.paid) {
+				o.quantity += prevOrder.quantity;
+				prevOrder.delete();
+				// }
 			}
 		}
-		
-		//create a basket object
-		if (distribId != null){
+
+		// create a basket object
+		if (distribId != null) {
 			var dist = o.distribution;
-			var basket = db.Basket.getOrCreate(user, dist.place, dist.date);			
-			o.basket = basket;			
+			var basket = db.Basket.getOrCreate(user, dist.place, dist.date);
+			o.basket = basket;
 		}
-		
+
 		o.insert();
-		
-		//Stocks
+
+		// Stocks
 		if (o.product.stock != null) {
 			var c = o.product.contract;
 			if (c.hasStockManagement()) {
-				//trace("stock for "+quantity+" x "+product.name);
+				// trace("stock for "+quantity+" x "+product.name);
 				if (o.product.stock == 0) {
 					if (App.current.session != null) {
-						App.current.session.addMessage(t._("There is no more '::productName::' in stock, we removed it from your order", {productName:o.product.name}), true);
+						App.current.session.addMessage(t._("There is no more '::productName::' in stock, we removed it from your order",
+							{productName: o.product.name}), true);
 					}
 					o.quantity -= quantity;
-					if ( o.quantity <= 0 ) {
+					if (o.quantity <= 0) {
 						o.delete();
-						return null;	
+						return null;
 					}
-				}else if (o.product.stock - quantity < 0) {
+				} else if (o.product.stock - quantity < 0) {
 					var canceled = quantity - o.product.stock;
 					o.quantity -= canceled;
 					o.update();
-					
+
 					if (App.current.session != null) {
-						var msg = t._("We reduced your order of '::productName::' to quantity ::oQuantity:: because there is no available products anymore", {productName:o.product.name, oQuantity:o.quantity});
+						var msg = t._("We reduced your order of '::productName::' to quantity ::oQuantity:: because there is no available products anymore",
+							{productName: o.product.name, oQuantity: o.quantity});
 						App.current.session.addMessage(msg, true);
 					}
 					o.product.lock();
 					o.product.stock = 0;
 					o.product.update();
-					App.current.event(StockMove({product:o.product, move:0 - (quantity - canceled) }));
-					
-				}else {
+					App.current.event(StockMove({product: o.product, move: 0 - (quantity - canceled)}));
+				} else {
 					o.product.lock();
 					o.product.stock -= quantity;
-					o.product.update();	
-					App.current.event(StockMove({product:o.product, move:0 - quantity}));
+					o.product.update();
+					App.current.event(StockMove({product: o.product, move: 0 - quantity}));
 				}
-			}	
+			}
 		}
 		return o;
 	}
 
-
 	/**
 	 * Edit an existing order (quantity)
 	 */
-	public static function edit(order:db.UserContract, newquantity:Float, ?paid:Bool , ?user2:db.User,?invert:Bool) {
-		
+	public static function edit(order:db.UserContract, newquantity:Float, ?paid:Bool, ?user2:db.User, ?invert:Bool) {
 		var t = sugoi.i18n.Locale.texts;
-		
+
 		order.lock();
-		
-		//quantity
-		if (newquantity == null) newquantity = 0;
-		if ( !canHaveFloatQt(order.product) ){
-			if( !tools.FloatTool.isInt(newquantity)  ) {
-				throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer",{product:order.product.name}));
+
+		// quantity
+		if (newquantity == null)
+			newquantity = 0;
+		if (!canHaveFloatQt(order.product)) {
+			if (!tools.FloatTool.isInt(newquantity)) {
+				throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer", {product: order.product.name}));
 			}
 		}
-		
-		//paid
+
+		// paid
 		if (paid != null) {
 			order.paid = paid;
-		}else {
-			if (order.quantity < newquantity) order.paid = false;	
+		} else {
+			if (order.quantity < newquantity)
+				order.paid = false;
 		}
-		
-		//shared order
-		if (user2 != null){
-			order.user2 = user2;	
-			if (invert == true) order.flags.set(InvertSharedOrder);
-			if (invert == false) order.flags.unset(InvertSharedOrder);
-		}else{
+
+		// shared order
+		if (user2 != null) {
+			order.user2 = user2;
+			if (invert == true)
+				order.flags.set(InvertSharedOrder);
+			if (invert == false)
+				order.flags.unset(InvertSharedOrder);
+		} else {
 			order.user2 = null;
 			order.flags.unset(InvertSharedOrder);
 		}
 
-		//stocks
-		var e : Event = null;
+		// stocks
+		var e:Event = null;
 		if (order.product.stock != null) {
 			var c = order.product.contract;
-			
-			if (c.hasStockManagement()) {
-				
-				if (newquantity < order.quantity) {
 
-					//on commande moins que prévu : incrément de stock						
+			if (c.hasStockManagement()) {
+				if (newquantity < order.quantity) {
+					// on commande moins que prévu : incrément de stock
 					order.product.lock();
-					order.product.stock +=  (order.quantity-newquantity);
-					e = StockMove({product:order.product, move:0 - (order.quantity-newquantity) });
-					
-				}else {
-				
-					//on commande plus que prévu : décrément de stock
+					order.product.stock += (order.quantity - newquantity);
+					e = StockMove({product: order.product, move: 0 - (order.quantity - newquantity)});
+				} else {
+					// on commande plus que prévu : décrément de stock
 					var addedquantity = newquantity - order.quantity;
-					
+
 					if (order.product.stock - addedquantity < 0) {
-						
-						//stock is not enough, reduce order
+						// stock is not enough, reduce order
 						newquantity = order.quantity + order.product.stock;
-						if( App.current.session!=null) App.current.session.addMessage(t._("We reduced your order of '::productName::' to quantity ::oQuantity:: because there is no available products anymore", {productName:order.product.name, oQuantity:newquantity}), true);
-						
-						e = StockMove({product:order.product, move: 0 - order.product.stock });
-						
+						if (App.current.session != null)
+							App.current.session.addMessage(t._("We reduced your order of '::productName::' to quantity ::oQuantity:: because there is no available products anymore",
+								{
+								productName: order.product.name,
+								oQuantity: newquantity
+							}), true);
+
+						e = StockMove({product: order.product, move: 0 - order.product.stock});
+
 						order.product.lock();
 						order.product.stock = 0;
-						
-					}else{
-						
-						//stock is big enough
+					} else {
+						// stock is big enough
 						order.product.lock();
 						order.product.stock -= addedquantity;
-						
-						e = StockMove({ product:order.product, move: 0 - addedquantity });
-					}					
-				}				
-				order.product.update();					
-			}	
+
+						e = StockMove({product: order.product, move: 0 - addedquantity});
+					}
+				}
+				order.product.update();
+			}
 		}
-		
-		//update order
+
+		// update order
 		if (newquantity == 0) {
-			order.quantity = 0;			
+			order.quantity = 0;
 			order.paid = true;
 			order.update();
-		}else {
+		} else {
 			order.quantity = newquantity;
-			order.update();				
-		}	
+			order.update();
+		}
 
-		App.current.event(e);	
+		App.current.event(e);
 
 		return order;
 	}
 
-
 	/**
 	 *  Delete an order
 	 */
 	public static function delete(order:db.UserContract) {
 		var t = sugoi.i18n.Locale.texts;
 
-		if(order==null) throw new Error(t._("This order has already been deleted."));
-		
-		order.lock();
-		
-		if (order.quantity == 0) {
+		if (order == null)
+			throw new Error(t._("This order has already been deleted."));
 
+		order.lock();
+
+		if (order.quantity == 0) {
 			var contract = order.product.contract;
 			var user = order.user;
 
-			//Amap Contract
-			if ( contract.type == db.Contract.TYPE_CONSTORDERS ) {
-
+			// Amap Contract
+			if (contract.type == db.Contract.TYPE_CONSTORDERS) {
 				order.delete();
 
-				if( contract.amap.hasPayments() ){
+				if (contract.amap.hasPayments()) {
 					var orders = contract.getUserOrders(user);
-					if( orders.length == 0 ){
+					if (orders.length == 0) {
 						var operation = db.Operation.findCOrderTransactionFor(contract, user);
-						if(operation!=null) operation.delete();
+						if (operation != null)
+							operation.delete();
 					}
 				}
-			}
-			else { //Variable orders contract
-				
-				//Get the basket for this user
+			} else { // Variable orders contract
+
+				// Get the basket for this user
 				var place = order.distribution.place;
 				var basket = db.Basket.get(user, place, order.distribution.date);
-				
-				if( contract.amap.hasPayments() ){
-					var orders = basket.getOrders();
-					//Check if it is the last order, if yes then delete the related operation
-					if( orders.length == 1 && orders.first().id==order.id ){
-						var operation = db.Operation.findVOrderTransactionFor(order.distribution.getKey(), user, place.amap);
-						if(operation!=null) operation.delete();
-					}
 
+				if (contract.amap.hasPayments()) {
+					var orders = basket.getOrders();
+					// Check if it is the last order, if yes then delete the related operation
+					if (orders.length == 1 && orders.first().id == order.id) {
+						var operation = db.Operation.findVOrderTransactionFor(order.distribution.getKey(), user, place.amap);
+						if (operation != null)
+							operation.delete();
+					}
 				}
 
 				order.delete();
 			}
-		}
-		else {
+		} else {
 			throw new Error(t._("Deletion not possible: quantity is not zero."));
 		}
-
 	}
 
 	/**
@@ -285,21 +287,20 @@ class OrderService
 		var view = App.current.view;
 		var t = sugoi.i18n.Locale.texts;
 		for (o in orders) {
-		
-			var x : UserOrder = cast { };
+			var x:UserOrder = cast {};
 			x.id = o.id;
 			x.userId = o.user.id;
 			x.userName = o.user.getCoupleName();
 			x.userEmail = o.user.email;
-			
-			//shared order
-			if (o.user2 != null){
+
+			// shared order
+			if (o.user2 != null) {
 				x.userId2 = o.user2.id;
 				x.userName2 = o.user2.getCoupleName();
 				x.userEmail2 = o.user2.email;
 			}
-			
-			//deprecated
+
+			// deprecated
 			x.productId = o.product.id;
 			x.productRef = o.product.ref;
 			x.productQt = o.product.qt;
@@ -308,161 +309,160 @@ class OrderService
 			x.productImage = o.product.getImage();
 			x.productHasFloatQt = o.product.hasFloatQt;
 			x.productHasVariablePrice = o.product.variablePrice;
-			//new way
+			// new way
 			x.product = o.product.infos();
-			x.product.price = o.productPrice;//do not use current price, but price of the order
+			x.product.price = o.productPrice; // do not use current price, but price of the order
 
-			
 			x.quantity = o.quantity;
-			
-			//smartQt
-			if (x.quantity == 0.0){
+
+			// smartQt
+			if (x.quantity == 0.0) {
 				x.smartQt = t._("Canceled");
-			}else if(x.productHasFloatQt || x.productHasVariablePrice || o.product.wholesale){
+			} else if (x.productHasFloatQt || x.productHasVariablePrice || o.product.wholesale) {
 				x.smartQt = view.smartQt(x.quantity, x.productQt, x.productUnit);
-			}else{
+			} else {
 				x.smartQt = Std.string(x.quantity);
 			}
 
-			//product name.
-			if ( x.productHasVariablePrice || x.productQt==null || x.productUnit==null ){
-				x.productName = o.product.name;	
-			}else{
-				x.productName = o.product.name + " " + view.formatNum(x.productQt) +" "+ view.unit(x.productUnit,x.productQt>1);	
+			// product name.
+			if (x.productHasVariablePrice || x.productQt == null || x.productUnit == null) {
+				x.productName = o.product.name;
+			} else {
+				x.productName = o.product.name + " " + view.formatNum(x.productQt) + " " + view.unit(x.productUnit, x.productQt > 1);
 			}
-			
+
 			x.subTotal = o.quantity * o.productPrice;
 
 			var c = o.product.contract;
-			
-			if ( o.feesRate!=0 ) {
-				
-				x.fees = x.subTotal * (o.feesRate/100);
+
+			if (o.feesRate != 0) {
+				x.fees = x.subTotal * (o.feesRate / 100);
 				x.percentageName = c.percentageName;
 				x.percentageValue = o.feesRate;
 				x.total = x.subTotal + x.fees;
-				
-			}else {
+			} else {
 				x.total = x.subTotal;
 			}
-			
-			//flags
+
+			// flags
 			x.paid = o.paid;
 			x.invertSharedOrder = o.flags.has(InvertSharedOrder);
 			x.contractId = c.id;
 			x.contractName = c.name;
-			x.canModify = o.canModify(); 
-			
+			x.canModify = o.canModify();
+
 			out.push(x);
 		}
-		
+
 		return sort(out);
 	}
-	
+
 	/**
 	 * Confirms an order : create real orders from tmp orders in session
 	 * @param	order
 	 */
-	public static function confirmSessionOrder(tmpOrder:OrderInSession){
+	public static function confirmSessionOrder(tmpOrder:OrderInSession) {
 		var orders = [];
 		var user = db.User.manager.get(tmpOrder.userId);
-		for (o in tmpOrder.products){
+		for (o in tmpOrder.products) {
 			o.product = db.Product.manager.get(o.productId);
-			orders.push( make(user, o.quantity, o.product, o.distributionId) );
+			orders.push(make(user, o.quantity, o.product, o.distributionId));
 		}
-		
+
 		App.current.event(MakeOrder(orders));
-		App.current.session.data.order = null;	
-		
+		App.current.session.data.order = null;
+
 		return orders;
 	}
 
-
 	/**
 	 *  Send an order-by-products report to the coordinator
 	 */
-	public static function sendOrdersByProductReport(d:db.Distribution){
-		
+	public static function sendOrdersByProductReport(d:db.Distribution) {
+		var t = sugoi.i18n.Locale.texts;
+
 		var m = new sugoi.mail.Mail();
-		m.addRecipient(d.contract.contact.email , d.contract.contact.getName());
-		m.setSender(App.config.get("default_email"),"Cagette.net");
+		m.addRecipient(d.contract.contact.email, d.contract.contact.getName());
+		m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 		m.setSubject('[${d.contract.amap.name}] Distribution du ${App.current.view.dDate(d.date)} (${d.contract.name})');
 		var orders = service.ReportService.getOrdersByProduct(d);
 
-		var html = App.current.processTemplate("mail/ordersByProduct.mtt", { 
-			contract:d.contract,
-			distribution:d,
-			orders:orders,
-			formatNum:App.current.view.formatNum,
-			currency:App.current.view.currency,
-			dDate:App.current.view.dDate,
-			hHour:App.current.view.hHour,
-			group:d.contract.amap
-		} );
-		
+		var html = App.current.processTemplate("mail/ordersByProduct.mtt", {
+			contract: d.contract,
+			distribution: d,
+			orders: orders,
+			formatNum: App.current.view.formatNum,
+			currency: App.current.view.currency,
+			dDate: App.current.view.dDate,
+			hHour: App.current.view.hHour,
+			group: d.contract.amap
+		});
+
 		m.setHtmlBody(html);
-		App.sendMail(m);					
-
+		App.sendMail(m);
 	}
 
-
 	/**
 	 *  Order summary for a member
 	 *  WARNING : its for one distrib, not for a whole basket !
 	 */
-	public static function sendOrderSummaryToMembers(d:db.Distribution){
-
+	public static function sendOrderSummaryToMembers(d:db.Distribution) {
+		var t = sugoi.i18n.Locale.texts;
 		var title = '[${d.contract.amap.name}] Votre commande pour le ${App.current.view.dDate(d.date)} (${d.contract.name})';
 
-		for( user in d.getUsers() ){
-
+		for (user in d.getUsers()) {
 			var m = new sugoi.mail.Mail();
-			m.addRecipient(user.email , user.getName(),user.id);
-			if(user.email2!=null) m.addRecipient(user.email2 , user.getName(),user.id);
-			m.setSender(App.config.get("default_email"),"Cagette.net");
+			m.addRecipient(user.email, user.getName(), user.id);
+			if (user.email2 != null)
+				m.addRecipient(user.email2, user.getName(), user.id);
+			m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 			m.setSubject(title);
-			var orders = prepare(d.contract.getUserOrders(user,d));
+			var orders = prepare(d.contract.getUserOrders(user, d));
+
+			var html = App.current.processTemplate("mail/orderSummaryForMember.mtt", {
+				contract: d.contract,
+				distribution: d,
+				orders: orders,
+				formatNum: App.current.view.formatNum,
+				currency: App.current.view.currency,
+				dDate: App.current.view.dDate,
+				hHour: App.current.view.hHour,
+				group: d.contract.amap
+			});
 
-			var html = App.current.processTemplate("mail/orderSummaryForMember.mtt", { 
-				contract:d.contract,
-				distribution:d,
-				orders:orders,
-				formatNum:App.current.view.formatNum,
-				currency:App.current.view.currency,
-				dDate:App.current.view.dDate,
-				hHour:App.current.view.hHour,
-				group:d.contract.amap
-			} );
-			
 			m.setHtmlBody(html);
 			App.sendMail(m);
 		}
-		
 	}
 
-	
-
-	public static function sort(orders:Array<UserOrder>){
-		
-		//order by lastname (+lastname2 if exists), then contract
+	public static function sort(orders:Array<UserOrder>) {
+		// order by lastname (+lastname2 if exists), then contract
 		orders.sort(function(a, b) {
-			
-			if (a.userName + a.userId + a.userName2 + a.userId2 + a.contractId > b.userName + b.userId + b.userName2 + b.userId2 + b.contractId ) {
-				
+			if (a.userName
+				+ a.userId
+				+ a.userName2
+				+ a.userId2
+				+ a.contractId > b.userName
+					+ b.userId
+					+ b.userName2
+					+ b.userId2
+					+ b.contractId) {
 				return 1;
 			}
-			if (a.userName + a.userId + a.userName2 + a.userId2 + a.contractId < b.userName + b.userId + b.userName2 + b.userId2 + b.contractId ) {
-				 
+			if (a.userName
+				+ a.userId
+				+ a.userName2
+				+ a.userId2
+				+ a.contractId < b.userName
+					+ b.userId
+					+ b.userName2
+					+ b.userId2
+					+ b.contractId) {
 				return -1;
 			}
 			return 0;
 		});
-		
+
 		return orders;
 	}
-	
-	
-
-
-	
-}
+}

src/sugoi/BaseApp.hx

@@ -1,121 +1,132 @@
 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;
+	public var session:sugoi.db.Session;
+	public var view:View;
+	public var user:db.User;
+	public var params:Map<String, String>;
+	public var cookieName:String;
+	public var cookieDomain:String;
+	public var uri:String;
 
-	public var cnx			: sys.db.Connection;
-	public var template		: templo.Loader;
-	public var maintain		: Bool;
-	public var session		: sugoi.db.Session;
-	public var view 		: View;
-	public var user    		: db.User;
-	public var params 		: Map<String,String>;
-	public var cookieName	: String;
-	public var cookieDomain	: String;
-	public var uri 			: String;
-	
-	public static var config: Config;
-	//public static var classPathes = sugoi.tools.Macros.getClassPathes();
+	public static var config:Config;
+
+	// public static var classPathes = sugoi.tools.Macros.getClassPathes();
 
 	public function new() {
-		
 		if (config == null) {
 			loadConfig();
 		}
-		
+
 		cookieName = "sid";
 		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();	
+		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 ) {
+	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"));		
+		return new templo.Loader(t, App.config.getBool("cachetpl"));
 		#else
-		return new templo.Loader(t);		
+		return new templo.Loader(t);
 		#end
 	}
 
-	public function setTemplate( t : String ) {
+	public function setTemplate(t:String) {
 		template = t == null ? null : loadTemplate(t);
 	}
 
-	public function initLang( lang : String ) {
-		
-		if (lang == null || lang == "") lang = config.LANG;
-		
-		//Define template path
+	public function initLang(lang:String) {
+		if (lang == null || lang == "")
+			lang = config.LANG;
+
+		// Define template path
 		var path;
-		if (!App.config.DEBUG){
+		if (!App.config.DEBUG) {
 			path = Web.getCwd() + "../lang/" + lang + "/";
-		}else{
+		} else {
 			path = Web.getCwd() + "../lang/master/";
 		}
 		App.config.TPL = path + "tpl/";
 		App.config.TPL_TMP = path + "tmp/";
-		
-		//init system locale
-		if ( !Sys.setTimeLocale("en_US.UTF-8") ) {			
+
+		// init system locale
+		if (!Sys.setTimeLocale("en_US.UTF-8")) {
 			Sys.setTimeLocale("en");
 		}
-		
-		//init gettext translator
+
+		// init gettext translator
 		sugoi.i18n.Locale.init(lang);
-		
+
 		return true;
 	}
 
 	function saveAndClose() {
-		
-		if( cnx == null ) return;
-		if( session.sid != null )
+		if (cnx == null)
+			return;
+		if (session.sid != null)
 			session.update();
-		
+
 		cnx.commit();
 		cnx.close();
 		untyped cnx.close = function() {}
 		untyped cnx.request = function(s) return null;
 	}
 
-	function executeTemplate( ?save ) {
+	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);
+		// strange bug with templo in PHP
+		if (result.substr(0, 4) == "null")
+			result = result.substr(4);
 		#end
 		Sys.print(result);
 	}
 
-	function onMeta( m : String, args : Array<Dynamic> ) {
-		switch( m ) {
-		case "tpl":
-			setTemplate(args[0]);
-		case "logged":
-			if ( user == null )				
-				throw sugoi.ControllerAction.RedirectAction("/?__redirect="+Web.getURI());
-		case "admin":
-			if( user == null || !user.isAdmin() )
-				throw sugoi.ControllerAction.RedirectAction("/");
-		default:
+	function onMeta(m:String, args:Array<Dynamic>) {
+		switch (m) {
+			case "tpl":
+				setTemplate(args[0]);
+			case "logged":
+				if (user == null)
+					throw sugoi.ControllerAction.RedirectAction("/?__redirect=" + Web.getURI());
+			case "admin":
+				if (user == null || !user.isAdmin())
+					throw sugoi.ControllerAction.RedirectAction("/");
+			default:
 		}
 	}
 
@@ -124,111 +135,109 @@ class BaseApp {
 	 */
 	function detectLang() {
 		var l = Web.getClientHeader("Accept-Language");
-		if( l != null )
-			for( l in l.split(",") ) {
+		if (l != null)
+			for (l in l.split(",")) {
 				l = l.split(";")[0];
 				l = l.split("-")[0];
 				l = StringTools.trim(l);
-				for( a in App.config.LANGS )
-					if( a == l )
+				for (a in App.config.LANGS)
+					if (a == l)
 						return a;
 			}
-			
+
 		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;
-		
-		//lang is taken from user object or from HTTP headers
-		if ( session.lang == null || !Lambda.has(App.config.LANGS, session.lang) ){			
+		// this app is monolingual and doesn't manage i18n
+		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)) {
 			session.lang = (user == null) ? detectLang() : user.lang;
 		}
-		
-		//override if param is given
+
+		// override if param is given
 		var lang = params.get("lang");
-		if ( lang != null && Lambda.has(App.config.LANGS, lang) ){
+		if (lang != null && Lambda.has(App.config.LANGS, lang)) {
 			session.lang = lang;
-			
 		}
-			
-		//init lang			
+
+		// init lang
 		initLang(session.lang);
 	}
-	
+
 	/**
 	 * Get current application langage (2 letters lowercase)
 	 */
-	public function getLang(){
+	public function getLang() {
 		return (session != null && session.lang != null && session.lang != "") ? session.lang : App.config.LANG;
 	}
 
 	public function rollback() {
-		if( cnx != null ) cnx.rollback();
+		if (cnx != null)
+			cnx.rollback();
 		sys.db.Manager.cleanup();
-		if( user != null && session != null )
+		if (user != null && session != null)
 			user = session.user;
 		// does not reset session
 	}
 
-	public function setCookie( oldCookie : String ){
-		if( session != null && session.sid != null && session.sid != oldCookie ) {
-			Web.setHeader("Set-Cookie", cookieName+"=" + session.sid + "; path=/;");
+	public function setCookie(oldCookie:String) {
+		if (session != null && session.sid != null && session.sid != oldCookie) {
+			Web.setHeader("Set-Cookie", cookieName + "=" + session.sid + "; path=/;");
 		}
 	}
 
 	function mainLoop() {
 		params = Web.getParams();
-		
-		//Get session
+
+		// Get session
 		var sids = [];
 		var cookieSid = Web.getCookies().get(cookieName);
-		if( params.exists("sid") ) sids.push(params.get("sid"));
-		if( cookieSid != null ) sids.push(cookieSid);
+		if (params.exists("sid"))
+			sids.push(params.get("sid"));
+		if (cookieSid != null)
+			sids.push(cookieSid);
 		session = sugoi.db.Session.init(sids);
-		
-		//Check for maintenance
+
+		// Check for maintenance
 		maintain = sugoi.db.Variable.getInt("maintain") != 0;
 		user = session.user;
-		
-		//setup langage
+
+		// setup langage
 		setupLang();
-		
-		
-		if( maintain && ((user != null && user.isAdmin()) ) )
+
+		if (maintain && ((user != null && user.isAdmin())))
 			maintain = false;
-		
+
 		setCookie(cookieSid);
-		
-		if( maintain ) {
+
+		if (maintain) {
 			setTemplate("maintain.mtt");
 			executeTemplate();
 			return;
 		}
-		
-		//dispatching
+
+		// dispatching
 		try {
-			
 			uri = Web.getURI();
-			if ( StringTools.endsWith(uri, "/index.n") ) uri = uri.substr(0, -8);
-			
-			//"before dispatch" callback
+			if (StringTools.endsWith(uri, "/index.n"))
+				uri = uri.substr(0, -8);
+
+			// "before dispatch" callback
 			beforeDispatch();
-			
+
 			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 )	{
+		} catch (e:haxe.web.Dispatch.DispatchError) {
+			// dispatch / routing error
+			if (App.config.DEBUG) {
 				#if neko
 				neko.Lib.rethrow(e);
 				#else
@@ -238,48 +247,48 @@ class BaseApp {
 			cnx.rollback();
 			Web.redirect("/");
 			return;
-			
-		} catch ( e : sugoi.ControllerAction) {
-			
-			switch( e ) {
-			case RedirectAction(url):
-				Web.redirect(url);
-				template = null;
-			case ErrorAction(url, text), OkAction(url,text):
-				if( text == null ) {
-					text = url;
-					url = Web.getURI();
-				}
-				Web.redirect(url);
-				var error = switch(e) { case ErrorAction(_): true; default: false; };
-				if( error ) rollback();
-				if ( error ) {					
-					session.addMessage(text,true);
-				}else {					
-					session.addMessage(text);
-				}
-				template = null;
+		} catch (e:sugoi.ControllerAction) {
+			switch (e) {
+				case RedirectAction(url):
+					Web.redirect(url);
+					template = null;
+				case ErrorAction(url, text), OkAction(url, text):
+					if (text == null) {
+						text = url;
+						url = Web.getURI();
+					}
+					Web.redirect(url);
+					var error = switch (e) {
+						case ErrorAction(_): true;
+						default: false;
+					};
+					if (error)
+						rollback();
+					if (error) {
+						session.addMessage(text, true);
+					} else {
+						session.addMessage(text);
+					}
+					template = null;
 			}
 		}
-		
-		//Render template
-		if ( template == null ) {			
+
+		// Render template
+		if (template == null) {
 			saveAndClose();
-		} else {			
+		} else {
 			executeTemplate(true); // will saveAndClose
 		}
 	}
-	
+
 	/**
 	 * 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());
+	public function logError(e:Dynamic, ?stack:String) {
+		var stack = if (stack != null) stack else haxe.CallStack.toString(haxe.CallStack.exceptionStack());
 		var message = new StringBuf();
 		message.add(Std.string(e));
 		message.add("\n");
@@ -288,43 +297,42 @@ class BaseApp {
 		var e = new sugoi.db.Error();
 		e.url = Web.getURI();
 		e.ip = Web.getClientIP();
-		e.user = if( user != null ) user else null;
+		e.user = if (user != null) user else null;
 		e.date = Date.now();
 		e.userAgent = Web.getClientHeader("User-Agent");
 		e.error = message.toString();
 		e.insert();
 	}
 
-	function errorHandler( e:Dynamic ) {
+	function errorHandler(e:Dynamic) {
 		try {
 			var stack = haxe.CallStack.toString(haxe.CallStack.exceptionStack());
 			// ROLLBACK and LOG
-			if ( cnx != null ) {
+			if (cnx != null) {
 				cnx.rollback();
-				logError(e,stack);
+				logError(e, stack);
 			}
-			
-			//log also in a file, in case we don't have a valid connexion to DB
-			Web.logMessage(e+"\n" + stack);
-			
+
+			// log also in a file, in case we don't have a valid connexion to DB
+			Web.logMessage(e + "\n" + stack);
+
 			maintain = true;
 			view = new View();
 			view.message = Std.string(e);
-			if ( App.config.DEBUG || (user != null && user.isAdmin()) ) {				
+			if (App.config.DEBUG || (user != null && user.isAdmin())) {
 				view.stack = stack;
 			}
-				
+
 			setTemplate("error.mtt");
 			executeTemplate(false);
-			
-		} catch( e : Dynamic ) {
+		} catch (e:Dynamic) {
 			Sys.print("<pre>");
-			Sys.println("Error : "+try Std.string(e) catch( e : Dynamic ) "???");
+			Sys.println("Error : " + try Std.string(e) catch (e:Dynamic) "???");
 			Sys.println(haxe.CallStack.toString(haxe.CallStack.exceptionStack()));
 			try {
-				if( cnx != null )
-					sugoi.db.Error.manager.get(0,false);
-			} catch( e : Dynamic ) {
+				if (cnx != null)
+					sugoi.db.Error.manager.get(0, false);
+			} catch (e:Dynamic) {
 				Sys.println("Initializing Database...");
 				sys.db.Admin.initializeDatabase();
 				Sys.println("Done");
@@ -339,7 +347,7 @@ class BaseApp {
 	 */
 	function init() {
 		maintain = App.config.getBool("maintain");
-		if( maintain ) {
+		if (maintain) {
 			view = new View();
 			setTemplate("maintain.mtt");
 			executeTemplate(false);
@@ -348,23 +356,23 @@ class BaseApp {
 		try {
 			var dbstr = App.config.get("database");
 			var dbreg = ~/([^:]+):\/\/([^:]+):([^@]*?)@([^:]+)(:[0-9]+)?\/(.*?)$/;
-			if( !dbreg.match(dbstr) )
+			if (!dbreg.match(dbstr))
 				throw "Configuration requires a valid database attribute, format is : mysql://user:password@host:port/dbname";
 			var port = dbreg.matched(5);
 			var dbparams = {
-				user:dbreg.matched(2),
-				pass:dbreg.matched(3),
-				host:dbreg.matched(4),
-				port:port == null ? 3306 : Std.parseInt(port.substr(1)),
-				database:dbreg.matched(6),
-				socket:null
+				user: dbreg.matched(2),
+				pass: dbreg.matched(3),
+				host: dbreg.matched(4),
+				port: port == null ? 3306 : Std.parseInt(port.substr(1)),
+				database: dbreg.matched(6),
+				socket: null
 			};
 			cnx = sys.db.Mysql.connect(dbparams);
-		} catch( e : Dynamic ) {
+		} catch (e:Dynamic) {
 			errorHandler(e);
 			return false;
 		}
-		if( App.config.SQL_LOG )
+		if (App.config.SQL_LOG)
 			cnx = new sugoi.tools.DebugConnection(cnx);
 		return true;
 	}
@@ -372,7 +380,7 @@ class BaseApp {
 	function cloneApp() {
 		// ensure that we have no variable initialized in app loop
 		var app = new App();
-		var bapp : BaseApp = app;
+		var bapp:BaseApp = app;
 		bapp.cnx = cnx;
 		bapp.view = new View();
 		App.current = app;
@@ -380,13 +388,15 @@ 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;
 	}
 
-	function sendHeaders(){
+	function sendHeaders() {
 		Web.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
 		Web.setHeader("Pragma", "no-cache");
 		Web.setHeader("Expires", "-1");
@@ -396,28 +406,28 @@ 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();
-		var a : BaseApp = App.current;
-		
+		var a:BaseApp = App.current;
+
 		a.sendHeaders();
 
-		if( !a.init() ) {
+		if (!a.init()) {
 			a = null;
 			return;
 		}
 		a.run();
 		a = null;
 		#if neko
-		if ( App.config.getInt("cache", 0) == 1 ) {			
+		if (App.config.getInt("cache", 0) == 1) {
 			neko.Web.cacheModule(App.main);
 		}
 		#end

src/sugoi/mail/Mail.hx

@@ -1,45 +1,53 @@
 package sugoi.mail;
+
 using Lambda;
 
-class Mail implements IMail
-{
-	
-	public var title : String;
-	public var htmlBody : String;
-	public var textBody : String;
-	var headers : Map<String,String>;
-	var sender : {name:String,email:String,?userId:Int};
-	var recipients : Array<{name:String,email:String,?userId:Int}>;
-	
-	
-	
+class Mail implements IMail {
+	public var title:String;
+	public var htmlBody:String;
+	public var textBody:String;
+
+	var headers:Map<String, String>;
+	var sender:{name:String, email:String, ?userId:Int};
+	var recipients:Array<{name:String, email:String, ?userId:Int}>;
+
+	static public function fromString(name:String, email:String) {
+		if (name == null)
+			return email;
+		else {
+			var finalName = thx.text.Diactrics.clean(name);
+			return '${finalName} <${email}>';
+		}
+	}
+
 	public function new() {
 		recipients = [];
 		headers = new Map();
 	}
-	
-	public function getRecipients(){
+
+	public function getRecipients() {
 		return recipients;
 	}
-	
-	public function setSender(email, ?name,?userId) {
-		if(!isValid(email)) throw "invalid sender email : \""+email+"\"";
-		
-		sender = {name:name,email:email,userId:userId};		
+
+	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: finalName, email: email, userId: userId};
 		return this;
 	}
-	
+
 	public function setReplyTo(email, ?name) {
-		if(!isValid(email)) throw "invalid reply-to email : \""+email+"\"";
-		
-		setHeader("Reply-To","<"+email+">"+(name==null?"":name));
+		if (!isValid(email))
+			throw "invalid reply-to email : \"" + email + "\"";
+		setHeader("Reply-To", fromString(name, email));
 	}
-	
+
 	public function setSubject(s:String) {
 		title = s;
 		return this;
 	}
-	
+
 	/**
 	 * can add one or more recipient
 	 * @param	email
@@ -47,11 +55,12 @@ class Mail implements IMail
 	 * @param	?userId
 	 */
 	public function addRecipient(email:String, ?name:String, ?userId:Int) {
-		if(!isValid(email)) throw "invalid recipient \""+email+"\"";
-		recipients.push( {email:email, name:name, userId:userId } );
+		if (!isValid(email))
+			throw "invalid recipient \"" + email + "\"";
+		recipients.push({email: email, name: name, userId: userId});
 		return this;
 	}
-	
+
 	/**
 	 * alias to addRecipient()
 	 * @param	email
@@ -62,24 +71,24 @@ class Mail implements IMail
 		addRecipient(email, name, userId);
 		return this;
 	}
-	
-	public static function isValid( addr : String ){
+
+	public static function isValid(addr:String) {
 		var reg = ~/^[^()<>@,;:\\"\[\]\s[:cntrl:]]+@[A-Z0-9][A-Z0-9-]*(\.[A-Z0-9][A-Z0-9-]*)*\.(xn--[A-Z0-9]+|[A-Z]{2,8})$/i;
 		return addr != null && reg.match(addr);
 	}
-	
+
 	public function setHeader(k:String, v:String) {
 		headers.set(k, v);
 		return this;
 	}
-	
+
 	/**
 	 * generate a custom key for transactionnal emails, valid during the current day
 	 */
 	public function getKey() {
-		return haxe.crypto.Md5.encode(App.config.get("key")+recipients[0].email+(Date.now().getDate())).substr(0,12);
+		return haxe.crypto.Md5.encode(App.config.get("key") + recipients[0].email + (Date.now().getDate())).substr(0, 12);
 	}
-	
+
 	/**
 	 * render html from a template + vars
 	 * @param	tpl		A Template path
@@ -88,7 +97,8 @@ class Mail implements IMail
 	public function setHtmlBodyWithTemplate(tpl, ctx:Dynamic) {
 		var app = App.current;
 		var tpl = app.loadTemplate(tpl);
-		if( ctx == null ) ctx = { };
+		if (ctx == null)
+			ctx = {};
 		ctx.HOST = App.config.HOST;
 		ctx.key = getKey();
 		ctx.senderName = sender.name;
@@ -98,28 +108,27 @@ class Mail implements IMail
 		ctx.recipients = recipients;
 		CSSInlining(ctx);
 		htmlBody = tpl.execute(ctx);
-		
 	}
-	
+
 	public function setHtmlBody(s) {
 		htmlBody = s;
 		return this;
 	}
-	
-	public function setTextBodyWithTemplate(tpl, ctx:Dynamic) {		
+
+	public function setTextBodyWithTemplate(tpl, ctx:Dynamic) {
 		var app = App.current;
 		var tpl = app.loadTemplate(tpl);
-		if( ctx == null ) ctx = { };
+		if (ctx == null)
+			ctx = {};
 		ctx.HOST = App.config.HOST;
 		ctx.key = getKey();
 		textBody = tpl.execute(ctx);
 		return this;
 	}
-	
 
 	function CSSInlining(ctx) {
 		// CSS inlining
-		var css : Map<String,Array<String>> = new Map();
+		var css:Map<String, Array<String>> = new Map();
 		ctx.addStyle = function(sel:String, style:String) {
 			sel = sel.toLowerCase();
 			if (css.exists(sel))
@@ -130,11 +139,11 @@ class Mail implements IMail
 		}
 		var applyStyleRec = null;
 		applyStyleRec = function(x:Xml) {
-			if (x.nodeType==Xml.Element) {
+			if (x.nodeType == Xml.Element) {
 				var name = x.nodeName.toLowerCase();
-				if( css.exists(name) )
-					if (x.get("style")!=null)
-						x.set("style", x.get("style")+";"+css.get(name).join(";"));
+				if (css.exists(name))
+					if (x.get("style") != null)
+						x.set("style", x.get("style") + ";" + css.get(name).join(";"));
 					else
 						x.set("style", css.get(name).join(";"));
 				for (n in x)
@@ -143,40 +152,38 @@ class Mail implements IMail
 		}
 		ctx.applyStyle = function(raw:String) {
 			var x = Xml.parse(raw);
-			for(n in x)
+			for (n in x)
 				applyStyleRec(n);
 			return x.toString();
 		}
 	}
-	
-	
-	public function getSubject(){
+
+	public function getSubject() {
 		return title;
 	}
 
-	public function getTitle(){
+	public function getTitle() {
 		return getSubject();
 	}
-	
-	public function getHtmlBody(){
+
+	public function getHtmlBody() {
 		return htmlBody;
 	}
-	
-	public function getTextBody(){
+
+	public function getTextBody() {
 		return textBody;
 	}
-	
-	public function setTextBody(t){
+
+	public function setTextBody(t) {
 		textBody = t;
 		return this;
 	}
-	
-	public function getHeaders(){
+
+	public function getHeaders() {
 		return headers;
 	}
-	
-	public function getSender(){
+
+	public function getSender() {
 		return sender;
 	}
-	
-}
+}

src/sugoi/mail/SendEmailMailer.hx

@@ -41,52 +41,66 @@ class SendEmailMailer implements IMailer {
 	}
 
 	public function send(e:sugoi.mail.IMail, ?params:Dynamic, ?callback:MailerResult->Void) {
-		var mailServer = "mail1.zourit.net";
-		var mailPort = 587;
+		var to:String;
+		var bcc:String;
 
-		var fromName = "John Doe";
-		var fromEmail = "no-reply@comptoirduvrac.re";
+		var recipientCounts = e.getRecipients().length;
+		if (recipientCounts > 1) {
+			to = sugoi.mail.Mail.fromString(e.getSender().name, e.getSender().email);
+			bcc = [for (i in e.getRecipients()) i.email].join(",");
+			App.log('recipients has been transformed to ${recipientCounts} bcc');
+			App.log(bcc);
+		} else {
+			to = e.getRecipients()[0].email;
+			bcc = "";
+		}
 
 		var args = [
-			"-f",
-			'${fromName} <${fromEmail}>',
+			// arguments
 			"-s",
-			"mail1.zourit.net:587",
+			'${this.m.host}:${this.m.port}',
+			"-xu",
+			${this.m.auth.username},
+			"-xp",
+			${this.m.auth.password},
+			"-o",
+			"message-charset=utf-8",
+			"-o",
+			"message-format=html",
+			"-o",
+			"message-header=X-Mailer: CagettePei",
+			"-f",
+			sugoi.mail.Mail.fromString(e.getSender().name, e.getSender().email),
 			"-t",
-			"pvincent@comptoirduvrac.re",
-			// "-bcc",		"pvincent974@gmail.com,pvincent974@laposte.net",
+			to,
+			"-bcc",
+			bcc,
 			"-u",
 			e.getSubject(),
-			"-m",
-			"alors tout va bien",
-			"-xu",
-			"postmaster@comptoirduvrac.re",
-			"-xp",
-			"QqQeAPT6EpoK"
 		];
 
-		App.log('args=${args.join(" ")}');
+		// FIME: deal with replyTo
+		if (e.getHeaders().exists("Reply-To")) {
+			var replyTo = e.getHeaders()["Reply-To"];
+			App.log('replyTo "$replyTo" detected');
+			args.push("-o");
+			args.push('message-header=Reply-To: ${replyTo}');
+		}
+
+		args.push("-m");
+		args.push('<html>${e.getHtmlBody()}</html>');
+
+		// if (App.config.DEBUG)
+		// 	App.log('args=${args.join(" ")}');
 
 		var exitCode = Sys.command("sendemail", args);
 		// var exitCode = 0;
 
+		var summary = 'email from="${sugoi.mail.Mail.fromString(e.getSender().name, e.getSender().email)}" subject=<${e.getSubject()}>';
 		if (exitCode == 0)
-			App.log('email from="${e.getSender().name} <${e.getSender().email}"> subject=<${e.getSubject()}> successfully sent');
+			App.log('$summary successfully sent');
 		else
-			App.log('ERROR: email from="${e.getSender().name} <${e.getSender().email}"> subject=<${e.getSubject()}> cannot be sent');
-
-		// sys.io.File.saveContent('/tmp/my_file.json', "CONTENT");
-
-		// var surprise = m.send({
-		// 	subject: e.getSubject(),
-		// 	from: new Address({address: e.getSender().email}),
-		// 	to: Lambda.array(Lambda.map(e.getRecipients(), function(x) return new Address({address: x.email}))),
-		// 	headers: e.getHeaders(),
-		// 	content: {
-		// 		text: e.getTextBody(),
-		// 		html: e.getHtmlBody()
-		// 	}
-		// });
+			App.log('ERROR: $summary cannot be sent, please review logs');
 
 		if (callback != null) {
 			var map = new MailerResult();

src/sugoi/mail/SmtpMailer.hx

@@ -1,68 +0,0 @@
-package sugoi.mail;
-import tink.core.Future;
-import tink.core.Noise;
-import sugoi.mail.IMailer;
-import smtpmailer.Address;
-
-/**
- * Send emails thru SMTP by using ben merckx's library 
- * @ref https://github.com/benmerckx/smtpmailer
- */
-class SmtpMailer implements IMailer
-{
-	var m : smtpmailer.SmtpMailer;
-	
-	public function new(){}
-	
-	public function init(?conf:{smtp_host:String,smtp_port:Int,smtp_user:String,smtp_pass:String}) :IMailer
-	{
-		m = new smtpmailer.SmtpMailer({
-			host: conf.smtp_host,
-			port: conf.smtp_port,
-			auth: {
-				username: conf.smtp_user,
-				password: conf.smtp_pass
-			}
-		});
-		
-		return this;
-	}
-	
-	public function send(e:sugoi.mail.IMail,?params:Dynamic,?callback:MailerResult->Void) 
-	{
-		var surprise = m.send({
-			subject: e.getSubject(),
-			/*from: e.getSender().email,
-			to: Lambda.array(Lambda.map(e.getRecipients(), function(x) return smtpmailer.Address.ofString(x.email) )),
-			//headers : e.getHeaders(),*/
-			from: new Address({address:e.getSender().email}),
-			to: Lambda.array(Lambda.map(e.getRecipients(), function(x) return new Address({address:x.email}) )),
-			headers : e.getHeaders(),
-			content: {
-				text: e.getTextBody(),
-				html: e.getHtmlBody()
-			}/*,
-			attachments: []*/
-		});
-		
-			
-		if (callback != null){
-			
-			surprise.handle(function(s){
-				
-				var map = new MailerResult();
-				
-				switch(s){
-					case Success(_):
-						map.set("*",Success(Sent));
-						
-					case Failure(e):
-						map.set("*",Failure(GenericError(e)));
-				}
-				
-				callback(map);
-			});
-		}
-	}
-	
-}

www/lang/texts_fr.po

@@ -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
@@ -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