tagged as 1.11.4

.semver_git_tag

@@ -1 +1 @@
-1.10.0
+1.11.4

Makefile

@@ -7,9 +7,9 @@ ENV?="dev"
 
 install:
 	#copy config file from template first time only
-	@if [ ! -f config.xml ]; then \
+	# @if [ ! -f config.xml ]; then \
-	cp config.xml.dist config.xml; \
+	# cp config.xml.dist config.xml; \
-	fi
+	# fi
 
 	@if [ $(ENV) = "dev" ]; then \
 	make install_dev; \
@@ -20,7 +20,7 @@ install_dev:
 	#set config file to debug=1
 	#@sed -e 's?debug=.*?debug="1"?g' --in-place config.xml
 	#install haxe dependencies in .haxelib
-	haxelib newrepo 
+	haxelib newrepo
 	haxelib -always install cagette.hxml
 	haxelib -always install cagetteJs.hxml
 	#template tools
@@ -41,13 +41,13 @@ 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"; \
 	haxe cagette.hxml; \
 	fi
-	
+
 
 #compile SASS files to CSS
 css:
@@ -64,17 +64,17 @@ frontend:
 	chown www-data:www-data tmp
 
 #update POT file from source
-i18n:	
+i18n:
 	haxe potGeneration.hxml
 
 #compile templates in each language, required for production env.
-templates:	
+templates:
 	mkdir -p lang/master/tmp
 	haxe cagette.hxml -D i18n_generation
 	@make LANG=fr ctemplates
-	msgfmt www/lang/texts_fr.po -o www/lang/texts_fr.mo 
+	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)

README.md

@@ -1,69 +1,82 @@
 CAGETTE PEI
 ===========
 
-Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018
+Cagette Péi est un logiciel libre qui favorise les circuits courts.
+Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.
 
-Certaines portions du code source de Cagette.net n'étant plus disponibles en téléchargement, 
+> <french>
-j'ai repris sur la base d'un existant pour adapter au marché local réunionnais et leurs AMAPéi.
+> Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018. Certaines portions de code n'étant plus disponibles en téléchargement à partir de cette date, le logiciel a été repris, adapté puis réactualisé. Pour plus d'information, contact@artcode.re
+> </french>
 
-## INSTALL FROM SCRATCH (debian-buster)
+![Screenshot](www/img/screenshot.png)
 
-* apt install -y curl 
+## PREREQUISITE MARIADB
-* curl -L https://deb.nodesource.com/setup_8.x | bash -
+
-* apt install -y nodejs=8.17.0-1nodesource1
+```bash
-* apt install -y sudo haxe apache2 make git imagemagick gettext libapache2-mod-neko mariadb-server
+apt install -y mariadb-server
-* mysql -u root <<EOF
+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
+DocumentRoot /var/www/cagettepei/www
-  DirectoryIndex index.n
+DirectoryIndex index.n
-  DocumentRoot /var/www/cagettepei/www/
+CustomLog ${APACHE_LOG_DIR}/cagettepei/access.log combined
-
-  
 </VirtualHost>
 ```
-* sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
+
-* a2dissite 000-default.conf
+
-* a2ensite cagettepei.conf
+```bash
-* a2enmod neko rewrite
+sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
-* systemctl restart apache2
+a2dissite 000-default.conf
+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>"
+host = "<DOMAIN.TLD>"
-key="<SECRET_PHRASE>"
+database = "mysql://cagettepei:cagettepei@localhost/cagettepei"
-name = "CagettePéi"
+key = "<SECRET_PHRASE>"
 default_email = "<EMAIL>"
 webmaster_email = "<EMAIL>"
-database="mysql://cagettepei:cagettepei@localhost/cagettepei"
 
-smtp_host="localhost"
+debug = "0"
-smtp_port="25"
+sqllog = "0"
-smtp_user=""
+maintain = "0"
-smtp_pass=""
 
-lang="fr"
+cache = "1"
-langs="fr"
+cachetpl = "0"
-langnames="Français"
-maintain="0"
-debug="0"
-sqllog="0"
-cache="1"
-cachetpl="0"
 />
 ```
 
@@ -72,16 +85,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 +114,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"

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

config.xml.dist

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

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) 
+	function setError(err:String) {
-	{
+		this.setState(cast {error: err});
-		if (props.redirectUrl == null) props.redirectUrl = "/";
-		if (props.message == "") props.message = null;
-		super(props);		
-		this.state = {email:"", password:"", error:null};
 	}
-	
+
-	function setError(err:String){
+	override public function render() {
-		this.setState(cast {error:err});
-	}
-	
-	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 name:String = untyped e.target.name;
-		var value :String = untyped /*(e.target.value == "") ? null :*/ e.target.value;
+		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){
+	public function submit(?e:js.html.Event) {
-		
+		if (state.email == "") {
-		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
+		// lock button
-		var el: js.html.Element = null;
+		var el:js.html.Element = null;
-		if(e!=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, "error"))
-			if (Reflect.hasField(d, "success")) js.Browser.window.location.href = props.redirectUrl;
+				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){
+	function onKeyPress(e:js.html.KeyboardEvent) {
-		if(e.key=="Enter") submit();
+		if (e.key == "Enter")
+			submit();
 	}
-	
+}
-	
-	
-}

lang/master/tpl/admin/default.mtt

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

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

@@ -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/cagette" target="_blank">
-								<img src="/img/logo3.png" alt="::NAME::" />
-							</a>
-					</div>		
 				::end::
 			</div>
 			
@@ -121,7 +117,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>
@@ -129,12 +125,15 @@
 
 		<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")::"/>
-					</a>  
 				</div>
 
+				<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" >
 					::_("HELP")::
 					<ul>
@@ -147,59 +146,14 @@
 						<li>
 							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Soumettre une anomalie</a>
 						</li>
-					</ul>
+					</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::

lang/master/tpl/maintain.mtt

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

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.11.3"
 }

src/App.hx

@@ -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();
@@ -287,7 +280,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/Contract.hx

@@ -1,4 +1,5 @@
 package controller;
+
 import db.UserContract;
 import sugoi.form.elements.DateDropdowns;
 import sugoi.form.elements.Input;
@@ -7,145 +8,139 @@ 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();
 	}
-	
+
 	@tpl("contract/view.mtt")
 	public function doView(c:db.Contract) {
 		view.category = 'amap';
 		view.c = c;
 	}
-	
+
 	/**
 	 * "my account" page
 	 */
 	@tpl("contract/default.mtt")
 	function doDefault() {
-		
+		// Create the list of links to change the language
-		//Create the list of links to change the language
+		var langs = App.config.get("langs", "fr").split(";");
-		var langs = App.config.get("langs").split(";");
+		var langNames = App.config.get("langnames", "Français").split(";");
-		var langNames = App.config.get("langnames").split(";");
+		var i = 0;
-		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++;
 		}
 		view.langLinks = langLinks;
 		view.langText = langNames[langs.indexOf(app.session.lang)];
 
-		//change account lang
+		// change account lang
-		if (app.params.exists("lang") && app.user!=null){
+		if (app.params.exists("lang") && app.user != null) {
 			app.user.lock();
 			app.user.lang = app.params.get("lang");
 			app.user.update();
 		}
-		
+
 		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>>();
+		var varOrders = new Map<String, Array<db.UserContract>>();
-		
+
-		var a = App.current.user.amap;		
+		var a = App.current.user.amap;
 		var oneMonthAgo = DateTools.delta(Date.now(), -1000.0 * 60 * 60 * 24 * 30);
-		
+
-		//constant orders
+		// constant orders
-		var contracts = db.Contract.manager.search($type == db.Contract.TYPE_CONSTORDERS && $amap == a && $endDate > oneMonthAgo, false);		
+		var contracts = db.Contract.manager.search($type == db.Contract.TYPE_CONSTORDERS && $amap == a && $endDate > oneMonthAgo, false);
 		constOrders = [];
-		for ( c in contracts){
+		for (c in contracts) {
 			var orders = app.user.getOrdersFromContracts([c]);
-			if (orders.length == 0) continue;
+			if (orders.length == 0)
-			constOrders.push({contract:c, orders:service.OrderService.prepare(orders) });
+				continue;
+			constOrders.push({contract: c, orders: service.OrderService.prepare(orders)});
 		}
-				
+
-		//variable orders, grouped by date
+		// variable orders, grouped by date
 		var contracts = db.Contract.manager.search($type == db.Contract.TYPE_VARORDER && $amap == a && $endDate > oneMonthAgo, false);
-		
+
 		for (c in contracts) {
 			var ds = c.getDistribs(false);
 			for (d in ds) {
-				//store orders in a stringmap like "2015-01-01" => [order1,order2,...]
+				// store orders in a stringmap like "2015-01-01" => [order1,order2,...]
 				var k = d.date.toString().substr(0, 10);
 				var orders = app.user.getOrdersFromDistrib(d);
 				if (orders.length > 0) {
 					if (!varOrders.exists(k)) {
 						varOrders.set(k, Lambda.array(orders));
-					}else {
+					} else {
 						var z = varOrders.get(k).concat(Lambda.array(orders));
 						varOrders.set(k, z);
-					}	
+					}
 				}
 			}
 		}
-		
-		//final structure
-		var varOrders2 = new Array<{date:Date,orders:Array<UserOrder>}>();
-		for ( k in varOrders.keys()) {
 
+		// 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]) );
+			var orders = service.OrderService.prepare(Lambda.list(varOrders[k]));
-			
+
-			varOrders2.push({date:d,orders:orders});
+			varOrders2.push({date: d, orders: orders});
 		}
-		
+
-		//sort by date desc
+		// sort by date desc
 		varOrders2.sort(function(b, a) {
-			return Math.round(a.date.getTime()/1000)-Math.round(b.date.getTime()/1000);
+			return Math.round(a.date.getTime() / 1000) - Math.round(b.date.getTime() / 1000);
 		});
-		
+
 		view.varOrders = varOrders2;
 		view.constOrders = constOrders;
-		
+
-		
 		// tutorials
 		if (app.user.isAmapManager()) {
-			
+			// actions
-			
+			if (app.params.exists('startTuto')) {
-			//actions
+				// start a tuto
-			if (app.params.exists('startTuto') ) {
-				
-				//start a tuto
 				app.user.lock();
-				var t = app.params.get('startTuto'); 
+				var t = app.params.get('startTuto');
-				app.user.tutoState = {name:t,step:0};
+				app.user.tutoState = {name: t, step: 0};
 				app.user.update();
 			}
-			
+
-		
+			// tuto state
-			//tuto state
+			var tutos = new Array<{name:String, completion:Float, key:String}>();
-			var tutos = new Array<{name:String,completion:Float,key:String}>();
+
-			
+			for (k in Tutorial.all().keys()) {
-			for ( k in Tutorial.all().keys() ) {	
 				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 } );
+
+				tutos.push({name: t.name, completion: completion, key: k});
 			}
-			
+
 			view.tutos = tutos;
 		}
-		
+
-		//should be able to stop tuto in any case
+		// should be able to stop tuto in any case
 		if (app.params.exists('stopTuto')) {
-			//stopped tuto from a tuto window
+			// stopped tuto from a tuto window
 			app.user.lock();
 			app.user.tutoState = null;
-			app.user.update();	
+			app.user.update();
 			view.stopTuto = true;
 		}
-		
+
 		checkToken();
 		view.userAmap = ua;
 	}
@@ -155,29 +150,30 @@ 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});
+		view.title = t._("Edit contract ::contractName::", {contractName: c.name});
 
 		var group = c.amap;
 		var currentContact = c.contact;
-		
+
 		var form = Form.fromSpod(c);
-		form.removeElement( form.getElement("amapId") );
+		form.removeElement(form.getElement("amapId"));
 		form.removeElement(form.getElement("type"));
 		form.getElement("userId").required = true;
 
-		app.event(EditContract(c,form));
+		app.event(EditContract(c, form));
-		
+
 		if (form.checkToken()) {
 			form.toSpod(c);
 			c.amap = group;
-			
+
-			//checks & warnings
+			// 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()) {
 					if (p.stock == null) {
@@ -186,73 +182,72 @@ class Contract extends Controller
 					}
 				}
 			}
-			
+
-			//no stock mgmt for constant orders
+			// no stock mgmt for constant orders
-			if (c.hasStockManagement() && c.type==db.Contract.TYPE_CONSTORDERS) {
+			if (c.hasStockManagement() && c.type == db.Contract.TYPE_CONSTORDERS) {
 				c.flags.unset(ContractFlags.StockManagement);
 				app.session.addMessage(t._("Managing stock is not available for CSA contracts"), true);
 			}
-			
+
-			
 			c.update();
-			
+
-			//update rights
+			// update rights
-			if ( c.contact != null && (currentContact==null || c.contact.id!=currentContact.id) ) {
+			if (c.contact != null && (currentContact == null || c.contact.id != currentContact.id)) {
 				var ua = db.UserAmap.get(c.contact, app.user.amap, true);
 				ua.giveRight(ContractAdmin(c.id));
 				ua.giveRight(Messages);
 				ua.giveRight(Membership);
 				ua.update();
-				
+
-				//remove rights to old contact
+				// remove rights to old contact
 				if (currentContact != null) {
 					var x = db.UserAmap.get(currentContact, c.amap, true);
 					if (x != null) {
 						x.removeRight(ContractAdmin(c.id));
-						x.update();						
+						x.update();
 					}
 				}
-				
 			}
-			
+
-			throw Ok("/contractAdmin/view/"+c.id, t._("Contract updated"));
+			throw Ok("/contractAdmin/view/" + c.id, t._("Contract updated"));
 		}
-		
+
 		view.form = form;
 	}
-	
+
 	@tpl("contract/insertChoose.mtt")
 	function doInsertChoose() {
-		//checkToken();
+		// checkToken();
-		
 	}
-	
+
 	/**
 	 * Créé un nouveau contrat
 	 */
 	@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)
-		view.title = if (type == db.Contract.TYPE_CONSTORDERS)t._("Create a contract with fixed orders") else t._("Create a contract with variable orders");
+			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");
+
 		var c = new db.Contract();
-		
+
 		var form = Form.fromSpod(c);
-		form.removeElement( form.getElement("amapId") );
+		form.removeElement(form.getElement("amapId"));
 		form.removeElement(form.getElement("type"));
 		form.getElement("userId").required = true;
-			
+
 		if (form.checkToken()) {
 			form.toSpod(c);
 			c.amap = app.user.amap;
-			//trace(app.user.amap);
+			// trace(app.user.amap);
-			//trace(c.amap);
+			// trace(c.amap);
 			c.type = type;
 			c.insert();
-			
+
-			//right
+			// right
 			if (c.contact != null) {
 				var ua = db.UserAmap.get(c.contact, app.user.amap, true);
 				ua.giveRight(ContractAdmin(c.id));
@@ -260,51 +255,52 @@ class Contract extends Controller
 				ua.giveRight(Membership);
 				ua.update();
 			}
-			
+
-			throw Ok("/contractAdmin/view/"+c.id, t._("New contract created"));
+			throw Ok("/contractAdmin/view/" + c.id, t._("New contract created"));
 		}
-		
+
 		view.form = form;
 	}
-	
+
 	/**
 	 * 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();
-			
+
-			//check if there is orders in this contract
+			// check if there is orders in this contract
 			var products = c.getProducts();
 
 			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."));
 			}
-			
+
-			//remove admin rights and delete contract	
+			// remove admin rights and delete contract
-			if(c.contact!=null){
+			if (c.contact != null) {
 				var ua = db.UserAmap.get(c.contact, c.amap, true);
 				if (ua != null) {
 					ua.removeRight(ContractAdmin(c.id));
-					ua.update();	
+					ua.update();
-				}			
+				}
 			}
-			
+
 			app.event(DeleteContract(c));
-			
+
 			c.delete();
 			throw Ok("/contractAdmin", t._("Contract deleted"));
 		}
-		
+
 		throw Error("/contractAdmin", t._("Token error"));
 	}
-	
+
 	/**
 	 * Make an order by contract ( standard mode )
 	 * The form is prepopulated if orders have already been made.
@@ -314,305 +310,301 @@ class Contract extends Controller
 	 * 
 	 */
 	@tpl("contract/order.mtt")
-	function doOrder(c:db.Contract ) {
+	function doOrder(c:db.Contract) {
-		
+		// checks
-		//checks
+		if (app.user.amap.hasPayments())
-		if (app.user.amap.hasPayments()) throw Redirect("/contract/orderAndPay/" + c.id);
+			throw Redirect("/contract/orderAndPay/" + c.id);
-		if (app.user.amap.hasShopMode()) throw Redirect("/shop");
+		if (app.user.amap.hasShopMode())
-		if (!c.isUserOrderAvailable()) throw Error("/", t._("This contract is not opened for orders"));
+			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
 		if (c.type == db.Contract.TYPE_VARORDER) {
 			distributions = db.Distribution.getOpenToOrdersDeliveries(c);
-		}else{
+		} else {
 			distributions = [null];
 		}
-		
+
-		//list of distribs with a list of product and optionnaly an order
+		// 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 userOrders = new Array<{distrib:db.Distribution, datas:Array<{order:db.UserContract, product:db.Product}>}>();
 		var products = c.getProducts();
-		
+
-		if ( c.type == db.Contract.TYPE_VARORDER ){
+		if (c.type == db.Contract.TYPE_VARORDER) {
-			
+			for (d in distributions) {
-			for ( d in distributions){
 				var datas = [];
-				for ( p in products) {
+				for (p in products) {
-					var ua = { order:null, product:p };
+					var ua = {order: null, product: p};
-					
+
-					var order = db.UserContract.manager.select($user == app.user && $productId == p.id && $distributionId==d.id, true);	
+					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});
+				userOrders.push({distrib: d, datas: datas});
 			}
-			
+		} else {
-		}else{
-			
 			var datas = [];
-			for ( p in products) {
+			for (p in products) {
-				var ua = { order:null, product:p };
+				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});
+			userOrders.push({distrib: null, datas: datas});
-			
 		}
 
-		
+		// form check
-		//form check
 		if (checkToken()) {
-			
+			// get dsitrib if needed
-			//get dsitrib if needed
+			// var distrib : db.Distribution = null;
-			//var distrib : db.Distribution = null;
+			// if (c.type == db.Contract.TYPE_VARORDER) {
-			//if (c.type == db.Contract.TYPE_VARORDER) {
+			// distrib = db.Distribution.manager.get(Std.parseInt(app.params.get("distribution")), false);
-				//distrib = db.Distribution.manager.get(Std.parseInt(app.params.get("distribution")), false);
+			// }
-			//}
+
-			
 			for (k in app.params.keys()) {
-				
+				if (k.substr(0, 1) != "d")
-				if (k.substr(0, 1) != "d") continue;
+					continue;
 				var qt = app.params.get(k);
-				if (qt == "") continue;
+				if (qt == "")
-				
+					continue;
+
 				var pid = null;
 				var did = null;
-				try{
+				try {
-				pid = Std.parseInt(k.split("-")[1].substr(1));
+					pid = Std.parseInt(k.split("-")[1].substr(1));
-				did = Std.parseInt(k.split("-")[0].substr(1));
+					did = Std.parseInt(k.split("-")[0].substr(1));
-				}catch (e:Dynamic){trace("unable to parse key "+k); }
+				} catch (e:Dynamic) {
-				
+					trace("unable to parse key " + k);
-				//find related element in userOrders
+				}
+
+				// find related element in userOrders
 				var uo = null;
-				for ( x in userOrders){
+				for (x in userOrders) {
-					if (x.distrib!=null && x.distrib.id != did) {
+					if (x.distrib != null && x.distrib.id != did) {
 						continue;
-					}else{
+					} else {
-						for (a in x.datas){
+						for (a in x.datas) {
-							if (a.product.id == pid){
+							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});
+				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 ) {
+				if (uo.product.hasFloatQt) {
 					var param = StringTools.replace(qt, ",", ".");
 					q = Std.parseFloat(param);
-				}else {
+				} else {
 					q = Std.parseInt(qt);
 				}
-				
+
-				
+				if (uo.order != null) {
-				if (uo.order != null) {	
 					OrderService.edit(uo.order, q);
-				}else {
+				} else {
 					OrderService.make(app.user, q, uo.product, did);
 				}
-				
 			}
-			throw Ok("/contract/order/"+c.id, t._("Your order has been updated"));
+			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 ) {
+	function doOrderAndPay(c:db.Contract) {
-		
+		// checks
-		//checks
+		if (!app.user.amap.hasPayments())
-		if (!app.user.amap.hasPayments()) throw Redirect("/contract/order/" + c.id);
+			throw Redirect("/contract/order/" + c.id);
-		if (app.user.amap.hasShopMode()) throw Redirect("/");
+		if (app.user.amap.hasShopMode())
-		if (!c.isUserOrderAvailable()) throw Error("/", t._("This contract is not opened for orders"));
+			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
+		// 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 userOrders = new Array<{distrib:db.Distribution, datas:Array<{order:db.UserContract, product:db.Product}>}>();
 		var products = c.getProducts();
-		
+
-		for ( d in distributions){
+		for (d in distributions) {
 			var datas = [];
-			for ( p in products) {
+			for (p in products) {
-				var ua = { order:null, product:p };
+				var ua = {order: null, product: p};
-				
+
-				var order : db.UserContract = null;
+				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);	
+					order = db.UserContract.manager.select($user == app.user && $productId == p.id && $distributionId == d.id, true);
-				}else {
+				} else {
 					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:d,datas:datas});
+			userOrders.push({distrib: d, datas: datas});
 		}
-		
+
-		
+		// form check
-		//form check
 		if (checkToken()) {
-			
+			// get distrib if needed
-			//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};
+			var orders:OrderInSession = {products: [], userId: app.user.id, total: 0};
-			
+
 			for (k in app.params.keys()) {
-				
+				if (k.substr(0, 1) != "d")
-				if (k.substr(0, 1) != "d") continue;
+					continue;
 				var qt = app.params.get(k);
-				if (qt == "") continue;
+				if (qt == "")
-				
+					continue;
+
 				var pid = null;
 				var did = null;
-				try{
+				try {
 					pid = Std.parseInt(k.split("-")[1].substr(1));
 					did = Std.parseInt(k.split("-")[0].substr(1));
-				}catch (e:Dynamic){
+				} catch (e:Dynamic) {
-					trace("unable to parse key "+k);					
+					trace("unable to parse key " + k);
 				}
-				
+
-				//find related element in userOrders
+				// find related element in userOrders
 				var uo = null;
-				for ( x in userOrders){
+				for (x in userOrders) {
-					if (x.distrib!=null && x.distrib.id != did) {
+					if (x.distrib != null && x.distrib.id != did) {
 						continue;
-					}else{
+					} else {
-						for (a in x.datas){
+						for (a in x.datas) {
-							if (a.product.id == pid){
+							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});
+				if (uo == null)
-					
+					throw t._("Could not find the product ::produ:: and delivery ::deliv::", {produ: pid, deliv: did});
-				//quantity
+
-				var q = 0.0;				
+				// quantity
-				if (uo.product.hasFloatQt ) {
+				var q = 0.0;
+				if (uo.product.hasFloatQt) {
 					var param = StringTools.replace(qt, ",", ".");
 					q = Std.parseFloat(param);
-				}else {
+				} else {
 					q = Std.parseInt(qt);
 				}
-				
+
-				orders.products.push({productId:pid, quantity:q, distributionId:did});
+				orders.products.push({productId: pid, quantity: q, distributionId: did});
-				
+
 				var p = db.Product.manager.get(pid, false);
 				orders.total += p.getPrice() * q;
-				
 			}
-			
+
 			App.current.session.data.order = orders;
-			
+
-			//Go to payments page			
+			// Go to payments page
 			if (c.type == db.Contract.TYPE_CONSTORDERS) {
-				throw Ok("/contract/order/"+c.id, t._("Your CSA order has been saved"));
+				throw Ok("/contract/order/" + c.id, t._("Your CSA order has been saved"));
-			}else{
+			} 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;		
+		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
+			// when payments are active, the user cannot modify his order
 			throw Redirect("/");
 		}
-		
+
 		// 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);
 		}
-		
+
-		// Il faut regarder le contrat de chaque produit et verifier si le contrat est toujours ouvert à la commande.		
+		// Il faut regarder le contrat de chaque produit et verifier si le contrat est toujours ouvert à la commande.
 		var d1 = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
 		var d2 = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
 
 		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 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
+		// 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
-					//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 ) {
+					if (order.product.hasFloatQt) {
 						param = StringTools.replace(param, ",", ".");
 						q = Std.parseFloat(param);
-					}else {
+					} else {
 						q = Std.parseInt(param);
 					}
-					
-					var quantity = Math.abs( q==null?0:q );
 
-					if ( order.distribution.canOrderNow() ) {
+					var quantity = Math.abs(q == null ? 0 : q);
-						//met a jour la commande
+
+					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);
+					}
 				}
 			}
-			
+
 			app.event(MakeOrder(orders_out));
-			
+
 			throw Ok("/contract", t._("Your order has been updated"));
 		}
 	}

src/controller/ContractAdmin.hx

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

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

@@ -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()) {
@@ -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,32 +51,25 @@ 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);
+			e.setSubject('[cagettepei] $subject');
 
 			var replyTo = form.getValueOf("senderMail");
 			var replyToName = form.getValueOf("senderName");
 			if (replyTo != null)
 				e.setReplyTo(replyTo, replyToName);
 
-			if (mails.length > 1) {
+			for (x in mails)
-				var cc = mails.join(",");
+				e.addRecipient(x);
-				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]);
-			}
 
-			// 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");
+			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

src/controller/User.hx

@@ -1,4 +1,5 @@
 package controller;
+
 import haxe.crypto.Md5;
 import sugoi.form.elements.Input;
 import sugoi.form.Form;
@@ -7,200 +8,192 @@ 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('/');
 		}
-		
+
-		//if its needed to redirect after login
+		// if its needed to redirect after login
-		if (app.params.exists("redirect")){
+		if (app.params.exists("redirect")) {
 			view.redirect = app.params.exists("redirect");
-		}else{
+		} else {
 			view.redirect = "/";
 		}
 	}
-	
+
-	
 	/**
 	 * Choose which group to connect to.
 	 */
 	@logged
 	@tpl("user/choose.mtt")
-	function doChoose(?args: { amap:db.Amap } ) {
+	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);
-		
+
 		if (amaps.length == 1 && !app.params.exists("show")) {
-			//qu'une amap
+			// qu'une amap
 			app.session.data.amapId = amaps.first().amap.id;
 			throw Redirect('/');
-		}else{
+		} else {
-			view.noGroup = true; //force template to not display current group
+			view.noGroup = true; // force template to not display current group
 		}
-		
+
-		if (args!=null && args.amap!=null) {
+		if (args != null && args.amap != null) {
-			//select a group
+			// select a group
-			var which = app.session.data==null ? 0 : app.session.data.whichUser ;
+			var which = app.session.data == null ? 0 : app.session.data.whichUser;
 			app.session.data.order = null;
 			app.session.data.newGroup = null;
 			app.session.data.amapId = args.amap.id;
 			app.session.data.whichUser = which;
 			throw Redirect('/');
 		}
-		
+
 		view.amaps = amaps;
 		view.wl = db.WaitingList.manager.search($user == app.user, false);
 
-		
 		#if plugins
 		view.pros = pro.db.PUserCompany.getCompanies(app.user);
 		#end
 	}
-	
+
 	function doLogout() {
 		App.current.session.delete();
 		throw Redirect('/');
 	}
-	
+
 	/**
 	 * Ask for password renewal by mail
 	 * when password is forgotten
 	 */
 	@tpl("user/forgottenPassword.mtt")
-	function doForgottenPassword(?key:String, ?u:db.User){
+	function doForgottenPassword(?key:String, ?u:db.User) {
-		
+		// STEP 1
-		//STEP 1
 		var step = 1;
-		var error : String = null;
+		var error:String = null;
 		var url = "/user/forgottenPassword";
-		
+
-		//ask for mail
+		// ask for mail
 		var askmailform = new Form("askemail");
-		askmailform.addElement(new StringInput("email", t._("Please key-in your E-Mail address"),null,true));
+		askmailform.addElement(new StringInput("email", t._("Please key-in your E-Mail address"), null, true));
-	
+
-		//change pass form
+		// change pass form
 		var chpassform = new Form("chpass");
-		
+
-		var pass1 = new StringInput("pass1", t._("Your new password"),null,true);
+		var pass1 = new StringInput("pass1", t._("Your new password"), null, true);
 		pass1.password = true;
 		chpassform.addElement(pass1);
-		
+
-		var pass2 = new StringInput("pass2", t._("Again your new password"),null,true);
+		var pass2 = new StringInput("pass2", t._("Again your new password"), null, true);
 		pass2.password = true;
 		chpassform.addElement(pass2);
-		
+
-		var uid = new IntInput("uid","uid", u == null?null:u.id);
+		var uid = new IntInput("uid", "uid", u == null ? null : u.id);
 		uid.inputType = ITHidden;
 		chpassform.addElement(uid);
-		
+
 		if (askmailform.isValid()) {
-			//STEP 2
+			// STEP 2
-			//send password renewal email
+			// send password renewal email
 			step = 2;
-			
+
-			var email :String = askmailform.getValueOf("email");
+			var email:String = askmailform.getValueOf("email");
 			var user = db.User.manager.select(email == $email, false);
-			//could be user 2
+			// 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"));
+			// user not found
-			
+			if (user == null)
-			//create token
+				throw Error(url, t._("This E-mail is not linked to a known account"));
-			var token = haxe.crypto.Md5.encode("chp"+Std.random(1000000000));
+
+			// create token
+			var token = haxe.crypto.Md5.encode("chp" + Std.random(1000000000));
 			sugoi.db.Cache.set(token, user.id, 60 * 60 * 24 * 30);
-			
+
 			var m = new sugoi.mail.Mail();
-			m.setSender(App.config.get("default_email"), t._("Cagette.net"));					
+			m.setSender(App.config.get("default_email"), t._("Cagette.net"));
-			m.setRecipient(email, user.name);					
+			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',
-			App.sendMail(m);	
+				{user: user, link: 'http://' + App.config.HOST + '/user/forgottenPassword/' + token + "/" + user.id}));
+			App.sendMail(m);
 		}
-		
+
-		if (key != null && u!=null) {
+		if (key != null && u != null) {
-			//check key and propose to change pass
+			// check key and propose to change pass
 			step = 3;
-			
+
-			if ( u.id == sugoi.db.Cache.get(key) ) {
+			if (u.id == sugoi.db.Cache.get(key)) {
 				view.form = chpassform;
-			}else {
+			} else {
 				error = t._("Invalid request");
 			}
 		}
-		
+
 		if (chpassform.isValid()) {
-			//change pass
+			// change pass
 			step = 4;
-						
+
-			if ( chpassform.getValueOf("pass1") == chpassform.getValueOf("pass2")) {
+			if (chpassform.getValueOf("pass1") == chpassform.getValueOf("pass2")) {
-				
+				var uid = Std.parseInt(chpassform.getValueOf("uid"));
-				var uid = Std.parseInt( chpassform.getValueOf("uid") );
 				var user = db.User.manager.get(uid, true);
 				var pass = chpassform.getValueOf("pass1");
 				user.setPass(pass);
 				user.update();
 
 				var m = new sugoi.mail.Mail();
-				m.setSender(App.config.get("default_email"), t._("Cagette.net"));					
+				m.setSender(App.config.get("default_email"), t._("Cagette.net"));
-				m.setRecipient(user.email, user.name);					
+				m.setRecipient(user.email, user.name);
-				if(user.email2!=null) m.setRecipient(user.email2, user.name);					
+				if (user.email2 != null)
-				m.setSubject( "["+App.config.NAME+"] : "+t._("New password confirmed"));
+					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,
+					user: user,
-					emails:emails.join(", "),
+					emails: emails.join(", "),
-					password:pass,
+					password: pass,
-					NAME:App.config.NAME
+					NAME: App.config.NAME
 				}
-				m.setHtmlBody( app.processTemplate('mail/newPasswordConfirmed.mtt', params) );
+				m.setHtmlBody(app.processTemplate('mail/newPasswordConfirmed.mtt', params));
-				App.sendMail(m);	
+				App.sendMail(m);
-				
+			} else {
-			}else {
 				error = t._("You must key-in two times the same password");
 			}
 		}
-			
+
 		if (step == 1) {
 			view.form = askmailform;
 		}
-		
+
 		view.step = step;
 		view.error = error;
 	}
-	
+
-	
 	/**
 	 * generate a custom key for transactionnal emails, valid during the current day
 	 */
-	//function getKey(m:db.User) {
+	// function getKey(m:db.User) {
-		//return haxe.crypto.Md5.encode(App.config.get("key")+m.email+(Date.now().getDate())).substr(0,12);
+	// 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){
+	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"));
@@ -209,47 +202,39 @@ class User extends Controller
 		pass2.password = true;
 		form.addElement(pass1);
 		form.addElement(pass2);
-		
+
 		if (form.isValid()) {
-			
+			if (form.getValueOf("pass1") == form.getValueOf("pass2")) {
-			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 {
-			}else {
+				form.addError(t._("You must key-in two times the same password"));
-				form.addError( t._("You must key-in two times the same password"));
 			}
 		}
 		view.form = form;
 		view.title = t._("Create a password for your account");
 	}
-	
+
 	/**
 	 * landing page when coming from an invitation
 	 * @param	k
 	 */
-	public function doValidate(k:String ) {
+	public function doValidate(k:String) {
-		
+		var uid = Std.parseInt(sugoi.db.Cache.get("validation" + k));
-		var uid = Std.parseInt(sugoi.db.Cache.get("validation" + k));		
+		if (uid == null || uid == 0)
-		if (uid == null || uid==0) throw Error('/user/login', t._("Your invitation is invalid or expired ($k)"));
+			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()}));
+		throw Ok("/user/definePassword", t._("Congratulations ::userName::, your account is validated!", {userName: user.getName()}));
-		
-		
-		
 	}
-	
+}
-	
-	
-}

src/controller/admin/Admin.hx

@@ -1,138 +1,122 @@
 package controller.admin;
+
 import haxe.web.Dispatch;
 import Common;
 
 class Admin extends Controller {
-	
 	public function new() {
 		super();
 		view.category = 'admin';
-		
+
-		//trigger a "Nav" event
+		// trigger a "Nav" event
 		var nav = new Array<Link>();
-		var e = Nav(nav,"admin");
+		var e = Nav(nav, "admin");
 		app.event(e);
 		view.nav = e.getParameters()[0];
-		
 	}
 
 	@tpl("admin/default.mtt")
 	function doDefault() {
 		view.now = Date.now();
 	}
-	
+
 	@tpl("admin/emails.mtt")
 	function doEmails() {
 		var browse = function(index:Int, limit:Int) {
-			return sugoi.db.BufferedMail.manager.search($sdate==null,{limit:[index,limit],orderBy:-cdate},false);
+			return sugoi.db.BufferedMail.manager.search($sdate == null, {limit: [index, limit], orderBy: -cdate}, false);
 		}
 
-		var count = sugoi.db.BufferedMail.manager.count($sdate==null);
+		var count = sugoi.db.BufferedMail.manager.count($sdate == null);
-		view.browser = new sugoi.tools.ResultsBrowser(count,10,browse);
+		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 ? "<SMTP_SERVER>" : sugoi.db.Variable.get("smtp_host");
-		
+		var port = sugoi.db.Variable.get("smtp_port") == null ? "587" : sugoi.db.Variable.get("smtp_port");
-		var mailer = sugoi.db.Variable.get("mailer")==null ? "smtp" : sugoi.db.Variable.get("mailer");
+		var user = sugoi.db.Variable.get("smtp_user") == null ? "" : sugoi.db.Variable.get("smtp_user");
-		var host = sugoi.db.Variable.get("smtp_host")==null ? App.config.get("smtp_host") : sugoi.db.Variable.get("smtp_host");
+		var pass = sugoi.db.Variable.get("smtp_pass") == null ? "" : sugoi.db.Variable.get("smtp_pass");
-		var port = sugoi.db.Variable.get("smtp_port")==null ? App.config.get("smtp_port") : 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");
+		f.addElement(new sugoi.form.elements.StringSelect("mailer", "Mailer", data, mailer));
-		var pass = sugoi.db.Variable.get("smtp_pass")==null ? App.config.get("smtp_pass") : 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));
 		f.addElement(new sugoi.form.elements.StringInput("smtp_port", "port", port));
 		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()) {
-		if (f.isValid()){
+			for (k in ["mailer", "smtp_host", "smtp_port", "smtp_user", "smtp_pass"]) {
-			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") );
+			throw Ok("/admin/emails", t._("Configuration updated"));
-			
 		}
-		
+
 		view.title = t._("Email service configuration");
 		view.form = f;
 	}
-	
+
 	function doPlugins(d:Dispatch) {
 		d.dispatch(new controller.admin.Plugins());
 	}
-	
+
-	
 	@tpl("admin/taxo.mtt")
-	function doTaxo(){
+	function doTaxo() {
-		
 		view.categ = db.TxpCategory.manager.all();
-		
 	}
-	
+
 	/**
 	 *  Display errors logged in DB
 	 */
 	@tpl("admin/errors.mtt")
-	function doErrors( args:{?user: Int, ?like: String, ?empty:Bool} ) {
+	function doErrors(args:{?user:Int, ?like:String, ?empty:Bool}) {
 		view.now = Date.now();
 
-		view.u = args.user!=null ? db.User.manager.get(args.user,false) : null;
+		view.u = args.user != null ? db.User.manager.get(args.user, false) : null;
-		view.like = args.like!=null ? args.like : "";
+		view.like = args.like != null ? args.like : "";
 
 		var sql = "";
-		if( args.user!=null ) sql += " AND uid="+args.user;
+		if (args.user != null)
-		//if( args.like!=null && args.like != "" ) sql += " AND error like "+sys.db.Manager.cnx.quote("%"+args.like+"%");
+			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){
+	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")) {
-		var from = new Date(year,month,1,0,0,0);
+			switch (key) {
-		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()){
+					for (d in 1...to.getDate()) {
-						var _from = new Date(year,month,d,0,0,0);
+						var _from = new Date(year, month, d, 0, 0, 0);
-						var _to = new Date(year,month,d,23,59,59);
+						var _to = new Date(year, month, d, 23, 59, 59);
-						var value = db.Basket.manager.count($cdate>=_from && $cdate<=_to);
+						var value = db.Basket.manager.count($cdate >= _from && $cdate <= _to);
-						var g = db.Graph.record(key,value, _from );
+						var g = db.Graph.record(key, value, _from);
 						// trace(value,_from,g);
-						
 					}
-
-
 			}
-
 		}
 
-		var data = db.Graph.getRange(key,from,to);
+		var data = db.Graph.getRange(key, from, to);
 		view.data = data;
 		view.from = from;
 		view.to = to;
@@ -140,84 +124,69 @@ class Admin extends Controller {
 
 		var averageValue = 0.0;
 		var total = 0.0;
-		for( d in data) total += d.value;
+		for (d in data)
-		averageValue = total/data.length;
+			total += d.value;
+		averageValue = total / data.length;
 		view.total = total;
 		view.averageValue = averageValue;
-
-
-
-
 	}
-	
-	function doFixDistribValidation() {
 
+	function doFixDistribValidation() {
 		Sys.println("===== Liste des distributions ayant été re-validées ====<br>");
 
-		//Get the current group
+		// Get the current group
 		var group = app.user.amap;
-		//Get all the contracts for this given group
+		// Get all the contracts for this given group
-		var contractIds = Lambda.map(group.getContracts(),function(x) return x.id);
+		var contractIds = Lambda.map(group.getContracts(), function(x) return x.id);
-		//Get all the validated distributions for this given group
+		// Get all the validated distributions for this given group
-		var validatedDistribs = db.Distribution.manager.search( ($contractId in contractIds) && $validated == true, {orderBy:date}, false);
+		var validatedDistribs = db.Distribution.manager.search(($contractId in contractIds) && $validated == true, {orderBy: date}, false);
-		for (distrib in validatedDistribs){
+		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
+		// Get the current group
 		var group = app.user.amap;
-		//Get all the contracts for this given group
+		// Get all the contracts for this given group
-		var contractIds = Lambda.map(group.getContracts(),function(x) return x.id);
+		var contractIds = Lambda.map(group.getContracts(), function(x) return x.id);
-		//Get all the validated distributions for this given group
+		// Get all the validated distributions for this given group
-		var validatedDistribs = db.Distribution.manager.search( ($contractId in contractIds) && $validated == true, {orderBy:date}, false);
+		var validatedDistribs = db.Distribution.manager.search(($contractId in contractIds) && $validated == true, {orderBy: date}, false);
-		for (distrib in validatedDistribs){
+		for (distrib in validatedDistribs) {
-
+			for (user in distrib.getUsers()) {
-			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()){
+
+				for (order in basket.getOrders()) {
 					if (!order.paid) {
 						Sys.println(order.distribution.toString() + "<br>");
 						Sys.println(order.toString() + "<br>");
-					}		
+					}
 				}
 
 				var operation = basket.getOrderOperation(false);
-				if (operation != null){
+				if (operation != null) {
-					
 					if (operation.pending) {
 						Sys.println(distrib.toString() + "<br>");
 						Sys.println(operation.toString() + "<br>");
 					}
-				
-					for ( payment in basket.getPayments()){
 
-						if (payment.pending){
+					for (payment in basket.getPayments()) {
+						if (payment.pending) {
 							Sys.println(distrib.toString() + "<br>");
 							Sys.println(payment.toString() + "<br>");
 						}
-					}	
+					}
 				}
-
 			}
 		}
 
 		Sys.println("===== Fin de la liste ====");
-
 	}
-
 }
-

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
+class OrderService {
-{
+	static function canHaveFloatQt(product:db.Product):Bool {
-
-	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 (product.contract.type == db.Contract.TYPE_VARORDER && distribId == null)
-		if(quantity==null) throw "Quantity is null";
+			throw "You have to provide a distribId";
+		if (quantity == null)
+			throw "Quantity is null";
 
-		//quantity
+		// quantity
-		if ( !canHaveFloatQt(product) ){
+		if (!canHaveFloatQt(product)) {
-			if( !tools.FloatTool.isInt(quantity)  ) {
+			if (!tools.FloatTool.isInt(quantity)) {
-				throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer",{product:product.name}));
+				throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer", {product: product.name}));
 			}
 		}
-		
+
-		//multiweight : make one row per product
+		// multiweight : make one row per product
-		if (product.multiWeight && quantity > 1.0){
+		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");
+			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
+		// checks
-		if (quantity <= 0) return null;
+		if (quantity <= 0)
-		
+			return null;
-		//check for previous orders on the same distrib
+
+		// 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);
+			prevOrders = db.UserContract.manager.search($product == product && $user == user, true);
-		}else {
+		} else {
-			prevOrders = db.UserContract.manager.search($product==product && $user==user && $distributionId==distribId, true);
+			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 (paid != null)
-		if (distribId != null) o.distribution = db.Distribution.manager.get(distribId);
+			o.paid = paid;
-		
+		if (distribId != null)
-		//cumulate quantities if there is a similar previous order
+			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) {
+				// if (!prevOrder.paid) {
-					o.quantity += prevOrder.quantity;
+				o.quantity += prevOrder.quantity;
-					prevOrder.delete();
+				prevOrder.delete();
-				//}
+				// }
 			}
 		}
-		
+
-		//create a basket object
+		// create a basket object
-		if (distribId != null){
+		if (distribId != null) {
 			var dist = o.distribution;
-			var basket = db.Basket.getOrCreate(user, dist.place, dist.date);			
+			var basket = db.Basket.getOrCreate(user, dist.place, dist.date);
-			o.basket = basket;			
+			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) }));
+					App.current.event(StockMove({product: o.product, move: 0 - (quantity - canceled)}));
-					
+				} else {
-				}else {
 					o.product.lock();
 					o.product.stock -= quantity;
-					o.product.update();	
+					o.product.update();
-					App.current.event(StockMove({product:o.product, move:0 - quantity}));
+					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
+		// quantity
-		if (newquantity == null) newquantity = 0;
+		if (newquantity == null)
-		if ( !canHaveFloatQt(order.product) ){
+			newquantity = 0;
-			if( !tools.FloatTool.isInt(newquantity)  ) {
+		if (!canHaveFloatQt(order.product)) {
-				throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer",{product:order.product.name}));
+			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 {
+		} else {
-			if (order.quantity < newquantity) order.paid = false;	
+			if (order.quantity < newquantity)
+				order.paid = false;
 		}
-		
+
-		//shared order
+		// shared order
-		if (user2 != null){
+		if (user2 != null) {
-			order.user2 = user2;	
+			order.user2 = user2;
-			if (invert == true) order.flags.set(InvertSharedOrder);
+			if (invert == true)
-			if (invert == false) order.flags.unset(InvertSharedOrder);
+				order.flags.set(InvertSharedOrder);
-		}else{
+			if (invert == false)
+				order.flags.unset(InvertSharedOrder);
+		} else {
 			order.user2 = null;
 			order.flags.unset(InvertSharedOrder);
 		}
 
-		//stocks
+		// stocks
-		var e : Event = null;
+		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);
+					order.product.stock += (order.quantity - newquantity);
-					e = StockMove({product:order.product, move:0 - (order.quantity-newquantity) });
+					e = StockMove({product: order.product, move: 0 - (order.quantity - newquantity)});
-					
+				} else {
-				}else {
+					// on commande plus que prévu : décrément de stock
-				
-					//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);
+						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",
-						e = StockMove({product:order.product, move: 0 - order.product.stock });
+								{
-						
+								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 {
-					}else{
+						// stock is big enough
-						
-						//stock is big enough
 						order.product.lock();
 						order.product.stock -= addedquantity;
-						
+
-						e = StockMove({ product:order.product, move: 0 - addedquantity });
+						e = StockMove({product: order.product, move: 0 - addedquantity});
-					}					
+					}
-				}				
+				}
-				order.product.update();					
+				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."));
+		if (order == null)
-		
+			throw new Error(t._("This order has already been deleted."));
-		order.lock();
-		
-		if (order.quantity == 0) {
 
+		order.lock();
+
+		if (order.quantity == 0) {
 			var contract = order.product.contract;
 			var user = order.user;
 
-			//Amap Contract
+			// Amap Contract
-			if ( contract.type == db.Contract.TYPE_CONSTORDERS ) {
+			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
-			else { //Variable orders contract
+
-				
+				// Get the basket for this user
-				//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
+			// shared order
-			if (o.user2 != null){
+			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
+			// smartQt
-			if (x.quantity == 0.0){
+			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.
+			// product name.
-			if ( x.productHasVariablePrice || x.productQt==null || x.productUnit==null ){
+			if (x.productHasVariablePrice || x.productQt == null || x.productUnit == null) {
-				x.productName = o.product.name;	
+				x.productName = o.product.name;
-			}else{
+			} else {
-				x.productName = o.product.name + " " + view.formatNum(x.productQt) +" "+ view.unit(x.productUnit,x.productQt>1);	
+				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 ) {
+			if (o.feesRate != 0) {
-				
+				x.fees = x.subTotal * (o.feesRate / 100);
-				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.addRecipient(d.contract.contact.email, d.contract.contact.getName());
-		m.setSender(App.config.get("default_email"),"Cagette.net");
+		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", { 
+		var html = App.current.processTemplate("mail/ordersByProduct.mtt", {
-			contract:d.contract,
+			contract: d.contract,
-			distribution:d,
+			distribution: d,
-			orders:orders,
+			orders: orders,
-			formatNum:App.current.view.formatNum,
+			formatNum: App.current.view.formatNum,
-			currency:App.current.view.currency,
+			currency: App.current.view.currency,
-			dDate:App.current.view.dDate,
+			dDate: App.current.view.dDate,
-			hHour:App.current.view.hHour,
+			hHour: App.current.view.hHour,
-			group:d.contract.amap
+			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);
+			m.addRecipient(user.email, user.getName(), user.id);
-			if(user.email2!=null) m.addRecipient(user.email2 , user.getName(),user.id);
+			if (user.email2 != null)
-			m.setSender(App.config.get("default_email"),"Cagette.net");
+				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
-			if (a.userName + a.userId + a.userName2 + a.userId2 + a.contractId > b.userName + b.userId + b.userName2 + b.userId2 + b.contractId ) {
+				+ 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,131 @@
 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 static var config:Config;
-	public var template		: templo.Loader;
+
-	public var maintain		: Bool;
+	// public static var classPathes = sugoi.tools.Macros.getClassPathes();
-	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 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 ) {
+	public function initLang(lang:String) {
-		
+		if (lang == null || lang == "")
-		if (lang == null || lang == "") lang = config.LANG;
+			lang = config.LANG;
-		
+
-		//Define template path
+		// 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
+		// init system locale
-		if ( !Sys.setTimeLocale("en_US.UTF-8") ) {			
+		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)
-		if( cnx == null ) return;
+			return;
-		if( session.sid != null )
+		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
+		// 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);
 	}
 
-	function onMeta( m : String, args : Array<Dynamic> ) {
+	function onMeta(m:String, args:Array<Dynamic>) {
-		switch( m ) {
+		switch (m) {
-		case "tpl":
+			case "tpl":
-			setTemplate(args[0]);
+				setTemplate(args[0]);
-		case "logged":
+			case "logged":
-			if ( user == null )				
+				if (user == null)
-				throw sugoi.ControllerAction.RedirectAction("/?__redirect="+Web.getURI());
+					throw sugoi.ControllerAction.RedirectAction("/?__redirect=" + Web.getURI());
-		case "admin":
+			case "admin":
-			if( user == null || !user.isAdmin() )
+				if (user == null || !user.isAdmin())
-				throw sugoi.ControllerAction.RedirectAction("/");
+					throw sugoi.ControllerAction.RedirectAction("/");
-		default:
+			default:
 		}
 	}
 
@@ -124,111 +134,109 @@ class BaseApp {
 	 */
 	function detectLang() {
 		var l = Web.getClientHeader("Accept-Language");
-		if( l != null )
+		if (l != null)
-			for( l in l.split(",") ) {
+			for (l in l.split(",")) {
 				l = l.split(";")[0];
 				l = l.split("-")[0];
 				l = StringTools.trim(l);
-				for( a in App.config.LANGS )
+				for (a in App.config.LANGS)
-					if( a == l )
+					if (a == l)
 						return a;
 			}
-			
+
 		return App.config.LANG;
 	}
-	
+
-	
 	/**
 	 * Setup current app language
 	 */
 	function setupLang() {
-		
+		// this app is monolingual and doesn't manage i18n
-		//this app is monolingual and doesn't manage i18n
+		if (App.config.LANG == "master")
-		if (App.config.LANG == "master") return;
+			return;
-		
+
-		//lang is taken from user object or from HTTP headers
+		// lang is taken from user object or from HTTP headers
-		if ( session.lang == null || !Lambda.has(App.config.LANGS, session.lang) ){			
+		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 ){
+	public function setCookie(oldCookie:String) {
-		if( session != null && session.sid != null && session.sid != oldCookie ) {
+		if (session != null && session.sid != null && session.sid != oldCookie) {
-			Web.setHeader("Set-Cookie", cookieName+"=" + session.sid + "; path=/;");
+			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 (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
+		// 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);
+			if (StringTools.endsWith(uri, "/index.n"))
-			
+				uri = uri.substr(0, -8);
-			//"before dispatch" callback
+
+			// "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) {
-		} catch ( e : haxe.web.Dispatch.DispatchError ) {
+			// dispatch / routing error
-			
+			if (App.config.DEBUG) {
-			//dispatch / routing error
-			if ( App.config.DEBUG )	{
 				#if neko
 				neko.Lib.rethrow(e);
 				#else
@@ -238,48 +246,48 @@ class BaseApp {
 			cnx.rollback();
 			Web.redirect("/");
 			return;
-			
+		} catch (e:sugoi.ControllerAction) {
-		} catch ( e : sugoi.ControllerAction) {
+			switch (e) {
-			
+				case RedirectAction(url):
-			switch( e ) {
+					Web.redirect(url);
-			case RedirectAction(url):
+					template = null;
-				Web.redirect(url);
+				case ErrorAction(url, text), OkAction(url, text):
-				template = null;
+					if (text == null) {
-			case ErrorAction(url, text), OkAction(url,text):
+						text = url;
-				if( text == null ) {
+						url = Web.getURI();
-					text = url;
+					}
-					url = Web.getURI();
+					Web.redirect(url);
-				}
+					var error = switch (e) {
-				Web.redirect(url);
+						case ErrorAction(_): true;
-				var error = switch(e) { case ErrorAction(_): true; default: false; };
+						default: false;
-				if( error ) rollback();
+					};
-				if ( error ) {					
+					if (error)
-					session.addMessage(text,true);
+						rollback();
-				}else {					
+					if (error) {
-					session.addMessage(text);
+						session.addMessage(text, true);
-				}
+					} else {
-				template = null;
+						session.addMessage(text);
+					}
+					template = null;
 			}
 		}
-		
+
-		//Render template
+		// Render template
-		if ( template == null ) {			
+		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 ) {
+	public function logError(e:Dynamic, ?stack:String) {
-		var stack = if( stack != null ) stack else haxe.CallStack.toString(haxe.CallStack.exceptionStack());
+		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 +296,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
+			// log also in a file, in case we don't have a valid connexion to DB
-			Web.logMessage(e+"\n" + stack);
+			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 )
+				if (cnx != null)
-					sugoi.db.Error.manager.get(0,false);
+					sugoi.db.Error.manager.get(0, false);
-			} catch( e : Dynamic ) {
+			} catch (e:Dynamic) {
 				Sys.println("Initializing Database...");
 				sys.db.Admin.initializeDatabase();
 				Sys.println("Done");
@@ -339,7 +346,7 @@ class BaseApp {
 	 */
 	function init() {
 		maintain = App.config.getBool("maintain");
-		if( maintain ) {
+		if (maintain) {
 			view = new View();
 			setTemplate("maintain.mtt");
 			executeTemplate(false);
@@ -348,23 +355,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),
+				user: dbreg.matched(2),
-				pass:dbreg.matched(3),
+				pass: dbreg.matched(3),
-				host:dbreg.matched(4),
+				host: dbreg.matched(4),
-				port:port == null ? 3306 : Std.parseInt(port.substr(1)),
+				port: port == null ? 3306 : Std.parseInt(port.substr(1)),
-				database:dbreg.matched(6),
+				database: dbreg.matched(6),
-				socket:null
+				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 +379,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 +387,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 +405,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/Config.hx

@@ -3,61 +3,60 @@ package sugoi;
 import sugoi.Web;
 
 class Config {
-
+	public var PATH:String;
-	public var PATH :String;
+	// public var json : Dynamic;
-	//public var json : Dynamic;	
+	public var xml:Xml;
-	public var xml : Xml;
+	public var LANG:String;
-	public var LANG 		:String;
+	public var LANGS:Array<String>;
-	public var LANGS 		:Array<String>;
+	public var TPL:String;
-	public var TPL 			:String;
+	public var TPL_TMP:String;
-	public var TPL_TMP 		:String;
+	public var DEBUG:Bool;
-	public var DEBUG 		:Bool;
+	public var HOST:String;
-	public var HOST 		:String;
+	public var NAME:String;
-	public var NAME 		:String;
+	public var KEY:String;
-	public var KEY 			:String;
+	public var DATA_HOST:String;
-	public var DATA_HOST 	:String;
+	public var SQL_LOG:Bool;
-	public var SQL_LOG 		:Bool;
 
 	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";
+		DEBUG = get("debug", "0") == "1";
 		HOST = get("host");
-		NAME = get("name");
 		KEY = get("key");
-		DATA_HOST = get("dataHost","data."+HOST);
+		DATA_HOST = get("dataHost", "data." + HOST);
 		SQL_LOG = getBool("sqllog", false);
 	}
-	
+
-	public function defined( val : String ) {
+	public function defined(val:String) {
-		//return Reflect.field(xml,val) != null;
+		// return Reflect.field(xml,val) != null;
 		return xml.get(val) != null;
 	}
 
-	public function getBool( val : String, ?def ) {
+	public function getBool(val:String, ?def) {
 		var v = get(val);
-		if( v == null ) return def;
+		if (v == null)
-		return( v == "1" || v == "true" );
+			return def;
+		return (v == "1" || v == "true");
 	}
 
-	public function get( val : String, ?def : String ) : String {
+	public function get(val:String, ?def:String):String {
-		//var v = Reflect.field(xml,val);
+		// var v = Reflect.field(xml,val);
 		var v = xml.get(val);
-		if( v == null )
+		if (v == null)
 			v = def;
-		if( v == null )
+		if (v == null)
-			throw "Missing config attribute : '"+val+"'";
+			throw "Missing config attribute : '" + val + "'";
 		return v;
 	}
 
-	public function getInt( val : String, ?def : Int ) : Int {
+	public function getInt(val:String, ?def:Int):Int {
-		return Std.parseInt(get(val,Std.string(def)));
+		return Std.parseInt(get(val, Std.string(def)));
 	}
-
 }

src/sugoi/mail/Mail.hx

@@ -1,45 +1,53 @@
 package sugoi.mail;
+
 using Lambda;
 
-class Mail implements IMail
+class Mail implements IMail {
-{
+	public var title:String;
-	
+	public var htmlBody:String;
-	public var title : String;
+	public var textBody:String;
-	public var htmlBody : String;
+
-	public var textBody : String;
+	var headers:Map<String, String>;
-	var headers : Map<String,String>;
+	var sender:{name:String, email:String, ?userId:Int};
-	var sender : {name:String,email:String,?userId:Int};
+	var recipients:Array<{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) {
+	public function setSender(email, ?name, ?userId) {
-		if(!isValid(email)) throw "invalid sender email : \""+email+"\"";
+		if (!isValid(email))
-		
+			throw "invalid sender email : \"" + email + "\"";
-		sender = {name:name,email:email,userId:userId};		
+		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+"\"";
+		if (!isValid(email))
-		
+			throw "invalid reply-to email : \"" + email + "\"";
-		setHeader("Reply-To","<"+email+">"+(name==null?"":name));
+		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+"\"";
+		if (!isValid(email))
-		recipients.push( {email:email, name:name, userId:userId } );
+			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 (css.exists(name))
-					if (x.get("style")!=null)
+					if (x.get("style") != null)
-						x.set("style", x.get("style")+";"+css.get(name).join(";"));
+						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 to:String;
-		var mailPort = 587;
+		var bcc:String;
 
-		var fromName = "John Doe";
+		var recipientCounts = e.getRecipients().length;
-		var fromEmail = "no-reply@comptoirduvrac.re";
+		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",
+			// arguments
-			'${fromName} <${fromEmail}>',
 			"-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",
+			to,
-			// "-bcc",		"pvincent974@gmail.com,pvincent974@laposte.net",
+			"-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');
+			App.log('ERROR: $summary cannot be sent, please review logs');
-
-		// 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()
-		// 	}
-		// });
 
 		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
@@ -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