tagged as 1.13.6

.gitignore

@@ -25,11 +25,11 @@ lang/es/tmp/*.n
 
 www/lang/*.mo
 
-www/file/*
-
 www/js/app.js
 www/js/libs.js
 
+www/file/*
+
 www/css/.sass-cache
 www/css/*.css
 !www/css/bootstrap.min.css

.semver_git_tag

@@ -1 +1 @@
-1.10.2
+1.13.6

Makefile

@@ -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
@@ -47,7 +47,7 @@ compile:
 	echo "compile CagettePéi core"; \
 	haxe cagette.hxml; \
 	fi
-	
+
 
 #compile SASS files to CSS
 css:
@@ -64,17 +64,18 @@ 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/fr
+	chown www-data:www-data -R lang
 
 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"

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

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/design.mtt

@@ -1,5 +1,5 @@
 ::use 'base.mtt'::
-		
+
 		::if getParam('__redirect')!=null::
 		<!-- need to login to go to this page-->
 		<script>$(function(){
@@ -13,18 +13,14 @@
 				::if groupName!=null && noGroup!=true::
 					<h1>::groupName::</h1>
 				::else::
-					<div style="margin-bottom:22px;" >
+					<h1>::_("Cagette.net")::</h1>
-							<a href="https://git.artcode.re/cagetters/cagettepei" target="_blank">
-								<img src="/img/logo3.png" alt="::NAME::" />
-							</a>
-					</div>		
 				::end::
 			</div>
-			
+
-			<div class="col-md-4 accountBlock">					
+			<div class="col-md-4 accountBlock">
-			::if user != null::			
+			::if user != null::
 				<div class="dropdown pull-right text-right userName" style="margin-top:16px;">
-					
+
 					<a class="" style="margin-right:16px;" href="/user/choose?show=1">
 						<span class="glyphicon glyphicon-chevron-left"></span>::_("Change group")::
 					</a>
@@ -33,46 +29,46 @@
 						<span class="glyphicon glyphicon-user"></span>
 						::user.getName()::
 						::if user.firstName2!=null::
-							::_("et"):: ::user.lastName2:: ::user.firstName2::  						
+							::_("et"):: ::user.lastName2:: ::user.firstName2::
 						::end::
 					</a>
 
 					<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1">
 						<li><a href="/user/logout"><span class="glyphicon glyphicon-log-out"></span> ::_("Log out")::</a></li>
 					</ul>
-					
+
-				</div>			
+				</div>
 			::else::
 				<div class="pull-right text-right">
 					<a href="/user/login" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-user"></span> ::_("Log in")::</a>
-					<a class="btn btn-default btn-sm" href="/group/map"><span class="glyphicon glyphicon-search"></span> ::_("Look for another group")::</a>	
+					<a class="btn btn-default btn-sm" href="/group/map"><span class="glyphicon glyphicon-search"></span> ::_("Look for another group")::</a>
 				</div>
 			::end::
-			</div>				
+			</div>
 		</div>
-		
+
-		
+
 			::if user != null && noGroup!=true::
 
 			<nav class="navbar navbar-default" ::cond user.getAmap()!=null::>
 					<div class="navbar-header">
 					  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#cagette-navbar">
-						<span class="sr-only">Toggle navigation</span>						
+						<span class="sr-only">Toggle navigation</span>
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
-					  </button>				  
+					  </button>
-					</div>	
+					</div>
-				
+
 					<div class="collapse navbar-collapse" id="cagette-navbar">
-						
+
 						<ul class="nav navbar-nav navbar-left">
 							<li ::attr class if(category=="home") 		'active' ::><a href="/">::_("Home")::</a></li>
 							<li ::attr class if(category=="contract" ) 	'active' ::><a href="/contract">::_("My account")::</a></li>
 							<li ::attr class if(category=="amap") 		'active' ::><a href="/amap">::_("Farmers")::</a></li>
-							
+
 						</ul>
-						
+
 						<ul class="nav navbar-nav navbar-right">
 							<li id="member" ::attr class if(category=="members") 	'active' ::>
 								<a href="/member" ::cond user.canAccessMembership()::>::_("Members")::</a></li>
@@ -85,13 +81,13 @@
 							<li ::cond user.isAdmin():: ::attr class if(category=="admin") 	'active' ::>
 								<a href="/admin" >::_("Admin")::</a></li>
 						</ul>
-						
+
 					</div>
-				
+
 			</nav>
-			
+
 		::end::
-		
+
 		<!-- Notifications -->
 		<div class="row">
 			<div id="content" class="col-md-12">
@@ -102,22 +98,22 @@
 					::else::
 					<span class="glyphicon glyphicon-ok"></span>
 					::end::
-					
+
-					::raw notification.text::					
+					::raw notification.text::
 				</div>
 				::end::
-			</div>	
+			</div>
 		</div>
-		
+
 		<!-- extra notification block for plugins -->
 		::if extraNotifBlock!=null::
 			::raw extraNotifBlock::
 		::end::
-		
+
 		<div class="row">
 			::raw __content__::
-		</div>	
+		</div>
-		
+
 		<!--<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>
@@ -128,18 +124,21 @@
 		</div>-->
 
 		<div class="row" id="footer">
-			
+
-				<div class="col-md-9" >
+				<div class="col-md-2" >
-					<a href="https://git.artcode.re/cagetters/cagette" target="_blank">
+					<img width="120" style="border: white 5px solid;" src="/img/logo-mini.jpg" alt="::_("Cagette.net")::" title="Logo ::_("Cagette.net")::"/>
-						<img src="/img/logo.png" alt="::_("Cagette.net")::"/>
+				</div>
-					</a>  
+
+				<div class="col-md-7" style="padding-top:1em">
+					Cagette Péi est un logiciel libre qui favorise les circuits courts.<br/>
+					Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.<br/>
 				</div>
 
 				<div class="col-md-3" >
 					::_("HELP")::
 					<ul>
-						<li> 
+						<li>
-							<a href="http://www.cagette.net/wiki" target="_blank">::_("Documentation")::</a> 
+							<a href="https://wiki.cagette.net/doku.php" target="_blank">::_("Documentation")::</a>
 						</li>
 						<li>
 							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Proposer une amélioration</a>
@@ -148,62 +147,23 @@
 							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Soumettre une anomalie</a>
 						</li>
 					</ul>
-					
-					<!--<p style="position: absolute;display: block;top: 96px;width: 700px;">
-						<b>::raw _("Vous êtes producteur ?")::</b>
-						::raw _("Découvrez nos formations gratuites pour utiliser <b>Cagette Pro</b> "):: 
-						&nbsp;&nbsp;<a href="http://alilo.fr/formations-producteurs" target="_blank" class="btn btn-xs btn-info">C'est parti !</a>
-					</p>-->
-					
-				</div>
-				
-				<!--
-				<div class="col-md-3" >
-					::_("FOLLOW US")::
-					<ul class="cagsocialmedia">
-						<li class="cagfb">
-							<a title="Facebook" href="https://www.facebook.com/cagette" target="_blank"> <i class="fa fa-facebook"></i></a>	
-						</li>
-						<li class="cagtwitter">
-							<a title="Twitter" href="https://twitter.com/Cagettenet" target="_blank"> <i class="fa fa-twitter"></i></a> 
-						</li>
-						<li class="cagyoutube">
-							<a title="Youtube" href="https://www.youtube.com/channel/UC3cvGxAUrbN9oSZmr1oZEaw" target="_blank"> <i class="fa fa-youtube"></i></a> 						
-						</li>
-						<li style="background-color:#333;">
-							<a title="Github" href="https://github.com/bablukid/cagette" target="_blank"> <i class="fa fa-github"></i></a> 						
-						</li>
-					</ul>
-				</div>
-				-->
 
-				<!--				
-				<div class="col-md-3">
-					::_("CONTACT US")::
-					<ul>
-						<li>
-							<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-							<input type="hidden" name="cmd" value="_s-xclick"/>
-							<input type="hidden" name="hosted_button_id" value="S9KT7FQS7P622"/>
-							<input type="image" src="https://www.paypalobjects.com/fr_FR/FR/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal, le réflexe sécurité pour payer en ligne"/>
-							<img alt="" border="0" src="https://www.paypalobjects.com/fr_FR/i/scr/pixel.gif" width="1" height="1"/>
-							</form>
-						</li>
-					</ul>
 				</div>
-				-->
+
-			
 		</div>
-		
+
 		<div class="row" id="subfooter">
-			<!--
+			<p>
-			::raw _("Cagette.net is made by <a href='https://www.alilo.fr' target='_blank'><img src='/img/alilo-trans-black.png' /></a>")::<br/>
+				version cagettepei-<a target="_blank" href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a>
-			-->
+			</p>
-			<span>version cagettepei-<a href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a></span>
+			::if BANDEAU_REGION::
+			<img src='/img/bandeau_region_france_relance.png' alt='bandeau Région Réunion' width='250'></img>
+			::end::
+
 		</div>
-		
+
 		<div class="row">
-			<div class="col-md-12">			
+			<div class="col-md-12">
 				<!--  SQL LOG -->
 				<table class="sqlLog table table-bordered" ::cond sqlLog::>
 				::foreach r sqlLog::
@@ -218,50 +178,5 @@
 				</table>
 			</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::-->

package.json

@@ -1,51 +1 @@
-{
+{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.13.6"}
-  "name": "cagette-pei",
-  "description": "le logiciel libre du circuit court",
-  "license": "AGPL-3.0",
-  "dependencies": {
-    "bootstrap": "^3.3.4",
-    "eonasdan-bootstrap-datetimepicker": "^4.7.14",
-    "geolib": "^2.0.24",
-    "haxe-modular": "^0.7.0",
-    "jquery": "^2.2.4",
-    "leaflet": "^1.3.1",
-    "react": "^15.6.1",
-    "react-bootstrap-typeahead": "1.4.2",
-    "react-datetime": "^2.9.0",
-    "react-dom": "^15.6.1",
-    "react-leaflet": "^1.8.0",
-    "react-places-autocomplete": "^6.0.2",
-    "react-router": "^4.2.0",
-    "react-router-dom": "^4.2.2"
-  },
-  "devDependencies": {
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "babelify": "^7.3.0",
-    "browserify": "^14.4.0",
-    "cross-env": "^5.1.1",
-    "node-sass": "^4.5.3",
-    "npm-run-all": "^4.1.2",
-    "uglify-js": "^3.1.9",
-    "watchify": "^3.9.0"
-  },
-  "scripts": {
-    "build": "npm-run-all --parallel build:*",
-    "build:js": "haxe cagetteJs.hxml",
-    "build:sass": "node-sass www/css -o www/css",
-    "watch:sass": "npm run build:sass -- --watch",
-    "build2": "babel src -d lib",
-    "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d",
-    "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js",
-    "test": "haxe testsJS.hxml && node js/test/tests.js",
-    "prepush": "npm test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/bablukid/cagette.git"
-  },
-  "bugs": {
-    "url": "https://github.com/bablukid/cagette/issues"
-  },
-  "version": "1.10.2"
-}

src/App.hx

@@ -1,5 +1,4 @@
 import db.User;
-import thx.semver.Version;
 import Common;
 
 class App extends sugoi.BaseApp {
@@ -10,13 +9,6 @@ class App extends sugoi.BaseApp {
 	public var eventDispatcher:hxevents.Dispatcher<Event>;
 	public var plugins:Array<sugoi.plugin.IPlugIn>;
 
-	/**
-	 * 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 static var VERSION = "cagette-pei"; // empty yet, cf.BaseApp.loadConfig
 
 	public function new() {
@@ -211,7 +203,7 @@ class App extends sugoi.BaseApp {
 		out.set("percent", "Pourcentage");
 		out.set("pinned", "Mets en avant les produits");
 
-		out.set("CagetteNetwork", "Me lister dans l'annuaire des groupes Cagette.net");
+		out.set("CagetteNetwork", "Me lister dans l'annuaire des groupes");
 		out.set("unitType", "Unité");
 		out.set("qt", "Quantité");
 		out.set("Unit", "Pièce");
@@ -288,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"), t._("Cagette.net"));
+		e.setSender(App.config.get("default_email"), t._("CagettePéi"));
 		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/Group.hx

@@ -14,66 +14,66 @@ class Group extends controller.Controller
 	 */
 	@tpl('group/view.mtt')
 	function doDefault(group:db.Amap){
-		
+
 		if (group.regOption == db.Amap.RegOption.Open) {
 			app.session.data.amapId = group.id;
 			throw Redirect("/");
 		}
-		
+
 		view.group = group;
 		view.contracts = group.getActiveContracts();
 		view.pageTitle = group.name;
 		group.getMainPlace(); //just to update cache
 		if (app.user != null){
-			
+
 			view.isMember = Lambda.has(app.user.getAmaps(), group);
 		}
 	}
-	
+
 	/**
 	 * Register to a waiting list.
 	 * the user can be logged or not !
 	 */
 	@tpl('form.mtt')
 	function doList(group:db.Amap){
-		
+
 		//checks
 		if (group.regOption != db.Amap.RegOption.WaitingList) throw Redirect("/group/" + group.id);
 		if (app.user != null) {
 			try{
 				WaitingListService.canRegister(app.user,group);
-			}catch(e:tink.core.Error){				
+			}catch(e:tink.core.Error){
 				throw Error("/group/" + group.id,e.message);
 			}
 		}
-		
+
 		//build form
-		var form = new sugoi.form.Form("reg");				
+		var form = new sugoi.form.Form("reg");
 		if (app.user == null){
 			form.addElement(new StringInput("userFirstName", t._("Your firstname"),"",true));
 			form.addElement(new StringInput("userLastName", t._("Your lastname") ,"",true));
-			form.addElement(new StringInput("userEmail", t._("Your e-mail"), "", true));		
+			form.addElement(new StringInput("userEmail", t._("Your e-mail"), "", true));
 		}
-		form.addElement(new sugoi.form.elements.TextArea("msg", t._("Leave a message")));
+		form.addElement(new sugoi.form.elements.TextArea("msg", t._("Leave a message"),"",false));
-		
+
 		if (form.isValid()){
 			try{
 				if (app.user == null){
 					var f = form;
 					var user = service.UserService.softRegistration(f.getValueOf("userFirstName"),f.getValueOf("userLastName"), f.getValueOf("userEmail") );
-					db.User.login(user, user.email);				
+					db.User.login(user, user.email);
-				}			
+				}
-				
+
 				WaitingListService.registerToWl(app.user,group,form.getValueOf("msg"));
 				throw Ok("/group/" + group.id,t._("Your subscription to the waiting list has been recorded. You will receive an e-mail as soon as your request is processed.") );
 			}catch(e:tink.core.Error){
 				throw Error("/group/list/" + group.id,e.message);
 			}
-			
+
 		}
-		
+
 		view.title = t._("Subscription to \"::groupeName::\" waiting list", {groupeName:group.name});
-		view.form = form;		
+		view.form = form;
 	}
 
 	/**
@@ -82,27 +82,27 @@ class Group extends controller.Controller
 	function doListCancel(group:db.Amap){
 		try{
 			WaitingListService.removeFromWl(app.user,group);
-		}catch(e:tink.core.Error){				
+		}catch(e:tink.core.Error){
 			throw Error("/group/" + group.id,e.message);
 		}
 		throw Ok("/group/" + group.id,t._("You've been removed from the waiting list"));
 	}
-	
+
-	
+
 	/**
 	 * 	Register direclty in an open group
-	 * 
+	 *
 	 * 	the user can be logged or not !
-	
+
 	@tpl('form.mtt')
 	function doRegister(group:db.Amap){
-		
+
 		if (group.regOption != db.Amap.RegOption.Open) throw Redirect("/group/" + group.id);
-		if (app.user != null){			
+		if (app.user != null){
-			if ( db.UserAmap.manager.select($amapId == group.id && $user == app.user) != null) throw Error("/group/" + group.id, t._("You are already member of this group."));			
+			if ( db.UserAmap.manager.select($amapId == group.id && $user == app.user) != null) throw Error("/group/" + group.id, t._("You are already member of this group."));
 		}
-		
+
-		var form = new sugoi.form.Form("reg");	
+		var form = new sugoi.form.Form("reg");
 		form.submitButtonLabel = t._("Join the group");
 		form.addElement(new sugoi.form.elements.Html("html",t._("Confirm your subscription to \"::groupName::\"", {groupName:group.name})));
 		if (app.user == null){
@@ -110,15 +110,15 @@ class Group extends controller.Controller
 			form.addElement(new StringInput("userLastName", t._("Your lastname"), "", true));
 			var em = new StringInput("userEmail", t._("Your e-mail"), "", true);
 			em.addValidator(new EmailValidator());
-			form.addElement(em);		
+			form.addElement(em);
-			form.addElement(new StringInput("address", t._("Address"), "", true));					
+			form.addElement(new StringInput("address", t._("Address"), "", true));
-			form.addElement(new StringInput("zipCode", t._("Zip code"), "", true));		
+			form.addElement(new StringInput("zipCode", t._("Zip code"), "", true));
-			form.addElement(new StringInput("city", t._("City"), "", true));		
+			form.addElement(new StringInput("city", t._("City"), "", true));
-			form.addElement(new StringInput("phone", t._("Phone"), "", true));		
+			form.addElement(new StringInput("phone", t._("Phone"), "", true));
 		}
-		
+
 		if (form.isValid()){
-			
+
 			if (app.user == null){
 				var f = form;
 				var user = new db.User();
@@ -129,92 +129,92 @@ class Group extends controller.Controller
 				user.zipCode = f.getValueOf("zipCode");
 				user.city = f.getValueOf("city");
 				user.phone = f.getValueOf("phone");
-				
+
 				if ( db.User.getSameEmail(user.email).length > 0 ) {
 					throw Ok("/user/login",t._("You already subscribed to Cagette.net, please log in on this page"));
 				}
-				
+
-				user.insert();				
+				user.insert();
 				app.session.setUser(user);
-				
+
-			}			
+			}
-			
+
 			var w = new db.UserAmap();
 			w.user = app.user;
 			w.amap = group;
 			w.insert();
-			
+
 			throw Ok("/user/choose", t._("Your subscription has been taken into account"));
 		}
-		
+
 		view.title = t._("Subscription to \"::groupName::\"", {groupName:group.name});
 		view.form = form;
-		
+
 	}*/
-	
+
 	/**
 	 * create a new group
 	 */
 	@tpl("form.mtt")
 	function doCreate() {
-		
+
 		view.title = t._("Create a new Cagette Group");
 
 		var f = new sugoi.form.Form("c");
 		f.addElement(new StringInput("name", t._("Name of your group"), "", true));
-		
+
 		//group type
 		var data = [
 			{label:t._("CSA"),value:"0"},
 			{label:t._("Grouped orders"),value:"1"},
 			{label:t._("Farmers collective"),value:"2"},
 			{label:t._("Farm shop"),value:"3"},
-		];	
+		];
 		var gt = new sugoi.form.elements.RadioGroup("type", t._("Group type"), data ,"1","1",true,true,true);
 		f.addElement(gt);
-		
+
 		if (f.checkToken()) {
-			
+
 			var user = app.user;
-			
+
 			var g = new db.Amap();
 			g.name = f.getValueOf("name");
 			g.contact = user;
-			
+
 			var type:db.Amap.GroupType = Type.createEnumIndex(db.Amap.GroupType, Std.parseInt(f.getValueOf("type")) );
-			
+
 			switch(type){
-			case null : 
+			case null :
 				throw "unknown group type";
-			case db.Amap.GroupType.Amap : 
+			case db.Amap.GroupType.Amap :
 				g.flags.set(db.Amap.AmapFlags.HasMembership);
 				g.regOption = db.Amap.RegOption.WaitingList;
-				
+
 			case db.Amap.GroupType.GroupedOrders :
 				g.flags.set(db.Amap.AmapFlags.ShopMode);
 				g.flags.set(db.Amap.AmapFlags.HasMembership);
 				g.regOption = db.Amap.RegOption.WaitingList;
-				
+
-			case db.Amap.GroupType.ProducerDrive : 
+			case db.Amap.GroupType.ProducerDrive :
 				g.flags.set(db.Amap.AmapFlags.ShopMode);
 				g.regOption = db.Amap.RegOption.Open;
 				g.flags.set(db.Amap.AmapFlags.PhoneRequired);
-				
+
-			case db.Amap.GroupType.FarmShop : 
+			case db.Amap.GroupType.FarmShop :
 				g.flags.set(db.Amap.AmapFlags.ShopMode);
 				g.regOption = db.Amap.RegOption.Open;
 				g.flags.set(db.Amap.AmapFlags.PhoneRequired);
 			}
-			
+
 			g.groupType = type;
 			g.insert();
-			
+
 			var ua = new db.UserAmap();
 			ua.user = user;
 			ua.amap = g;
 			ua.rights = [db.UserAmap.Right.GroupAdmin,db.UserAmap.Right.Membership,db.UserAmap.Right.Messages,db.UserAmap.Right.ContractAdmin(null)];
 			ua.insert();
-			
+
 			//example datas
 			var place = new db.Place();
 			place.name = t._("Market square");
@@ -222,7 +222,7 @@ class Group extends controller.Controller
 			place.city = "St Martin de la Cagette";
 			place.amap = g;
 			place.insert();
-			
+
 			//contrat AMAP
 			var vendor = new db.Vendor();
 			vendor.amap = g;
@@ -230,8 +230,8 @@ class Group extends controller.Controller
 			vendor.zipCode = "000";
 			vendor.city = "Langon";
 			vendor.email = "jean@cagette.net";
-			vendor.insert();			
+			vendor.insert();
-			
+
 			if (type == Amap){
 				var contract = new db.Contract();
 				contract.name = t._("CSA contract Vegetables - Example");
@@ -244,32 +244,32 @@ class Group extends controller.Controller
 				contract.contact = user;
 				contract.distributorNum = 2;
 				contract.insert();
-				
+
 				var p = new db.Product();
 				p.name = t._("Big basket of vegetables");
 				p.price = 15;
 				p.organic = true;
 				p.contract = contract;
 				p.insert();
-				
+
 				var p = new db.Product();
 				p.name = t._("Small basket of vegetables");
 				p.price = 10;
 				p.organic = true;
 				p.contract = contract;
 				p.insert();
-			
+
 				OrderService.make(user, 1, p, null, true);
-				
+
 				var d = new db.Distribution();
 				d.contract = contract;
 				d.date = DateTools.delta(Date.now(), 1000.0 * 60 * 60 * 24 * 14);
 				d.end = DateTools.delta(d.date, 1000.0 * 60 * 90);
 				d.place = place;
 				d.insert();
-				
+
 			}
-			
+
 			//contrat variable
 			var vendor = new db.Vendor();
 			vendor.amap = g;
@@ -277,8 +277,8 @@ class Group extends controller.Controller
 			vendor.zipCode = "000";
 			vendor.city = t._("Bazas");
 			vendor.email = "galinette@cagette.net";
-			vendor.insert();			
+			vendor.insert();
-			
+
 			var contract = new db.Contract();
 			contract.name = t._("Chicken Contract - Example");
 			contract.description = t._("Example of contract with variable orders. It is allowed to order something else at every delivery.");
@@ -291,7 +291,7 @@ class Group extends controller.Controller
 			contract.distributorNum = 2;
 			contract.flags.set(db.Contract.ContractFlags.UsersCanOrder);
 			contract.insert();
-			
+
 			var egg = new db.Product();
 			egg.name = t._("12 eggs");
 			egg.price = 5;
@@ -299,7 +299,7 @@ class Group extends controller.Controller
 			egg.organic = true;
 			egg.contract = contract;
 			egg.insert();
-			
+
 			var p = new db.Product();
 			p.name = t._("Chicken");
 			//p.type = 2;
@@ -307,7 +307,7 @@ class Group extends controller.Controller
 			p.organic = true;
 			p.contract = contract;
 			p.insert();
-			
+
 			var d = new db.Distribution();
 			d.contract = contract;
 			d.orderStartDate = Date.now();
@@ -316,36 +316,36 @@ class Group extends controller.Controller
 			d.end = DateTools.delta(d.date, 1000.0 * 60 * 90);
 			d.place = place;
 			d.insert();
-			
+
 			OrderService.make(user, 2, egg, d.id);
 			OrderService.make(user, 1, p, d.id);
-			
+
 			App.current.session.data.amapId  = g.id;
 			app.session.data.newGroup = true;
 			throw Redirect("/");
 		}
-		
+
 		view.form= f;
-		
+
 	}
-	
+
 	/**
 		Displays a google map in a popup
 	**/
 	@tpl('group/place.mtt')
 	public function doPlace(place:db.Place){
 		view.place = place;
-		
+
 		//build adress for google maps
 		var addr = "";
 		if (place.address1 != null) addr += place.address1;
 		if (place.address2 != null) addr += ", " + place.address2;
 		if (place.zipCode != null) addr += " " + place.zipCode;
 		if (place.city != null) addr += " " + place.city;
-		
+
 		view.addr = view.escapeJS(addr);
 	}
-	
+
 	/**
 	 * Groups map
 	 */
@@ -353,16 +353,16 @@ class Group extends controller.Controller
 	public function doMap(?args:{?lat:Float,?lng:Float,?address:String}){
 
 		view.container = "container-fluid";
-		
+
 		//if no param is sent, focus on Paris
 		if (args == null || (args.address == null && args.lat == null && args.lng == null)){
 			args = {lat:48.855675, lng:2.3472365};
 		}
-		
+
 		view.lat = args.lat;
 		view.lng = args.lng;
-		view.address = args.address;		
+		view.address = args.address;
 	}
-	
+
-	
+
 }

src/controller/Main.hx

@@ -9,10 +9,10 @@ import Common;
 import tools.ArrayTool;
 
 class Main extends Controller {
-	
+
-	
+
 	/**
-	 * public pages 
+	 * public pages
 	 */
 	function doGroup(d:haxe.web.Dispatch){
 		d.dispatch(new controller.Group());
@@ -24,23 +24,26 @@ class Main extends Controller {
 	@tpl("home.mtt")
 	function doDefault() {
 		view.category = 'home';
-		
+
-		var group = app.getCurrentGroup();		
+		var group = app.getCurrentGroup();
-		if ( app.user!=null && group == null) {			
+		if ( app.user!=null && group == null) {
 			throw Redirect("/user/choose");
 		}else if (app.user == null && (group==null || group.regOption!=db.Amap.RegOption.Open) ) {
-			throw Redirect("/user/login");
+
+			if (db.Amap.manager.get(1, false) != null) throw Redirect("/group/1");
+			else throw Redirect("/user/login");
+
 		}
 
 		view.amap = group;
-		
+
 		//contract with open orders
 		var openContracts = Lambda.filter(group.getActiveContracts(), function(c) return c.isUserOrderAvailable());
 		view.openContracts = openContracts;
-		
+
 		//register to become "distributor"
 		view.contractsWithDistributors = app.user==null ? [] : Lambda.filter(app.user.amap.getActiveContracts(), function(c) return c.distributorNum > 0);
-		
+
 		//freshly created group
 		view.newGroup = app.session.data.newGroup == true;
 
@@ -50,12 +53,12 @@ class Main extends Controller {
 
 		var distribs = MultiDistrib.getFromTimeRange(group,now,in3Month);
 		view.distribs = distribs;
-		
+
 		//view functions
 		view.getWhosTurn = function(orderId:Int, distrib:Distribution) {
 			return db.UserContract.manager.get(orderId, false).getWhosTurn(distrib);
 		}
-		
+
 		//event for additionnal blocks on home page
 		var e = Blocks([], "home");
 		app.event(e);
@@ -67,21 +70,21 @@ class Main extends Controller {
 		}
 
 	}
-	
+
 	//login and stuff
 	function doUser(d:Dispatch) {
 		d.dispatch(new controller.User());
 	}
-	
+
 	function doCron(d:Dispatch) {
 		d.dispatch(new controller.Cron());
 	}
-	
+
 	/**
 	 *  JSON REST API Entry point
 	 */
 	function doApi(d:Dispatch) {
-				
+
 		try {
 
 			d.dispatch(new controller.Api());
@@ -91,38 +94,38 @@ class Main extends Controller {
 			//manage tink Errors (service errors)
 			sugoi.Web.setReturnCode(e.code);
 			Sys.print(Json.stringify( {error:{code:e.code,message:e.message,stack:e.exceptionStack}} ));
-			
+
 		}catch (e:Dynamic){
 
-			//manage other errors			
+			//manage other errors
-			sugoi.Web.setReturnCode(500);			
+			sugoi.Web.setReturnCode(500);
 			var stack = if ( App.config.DEBUG ) haxe.CallStack.toString(haxe.CallStack.exceptionStack()) else "";
 			App.current.logError(e, stack);
 			Sys.print(Json.stringify( {error:{code:500,message : Std.string(e), stack:stack }} ));
 		}
-		
+
 	}
-	
+
 	@tpl("cssDemo.mtt")
 	function doCssdemo() {
 		view.category = 'home';
 	}
-	
+
 	@tpl("form.mtt")
 	function doInstall(d:Dispatch) {
 		d.dispatch(new controller.Install());
 	}
-	
+
 
 	function doP(d:Dispatch) {
-		
+
 		/*
 		 * Invalid array access
 Stack (ADMIN|DEBUG)
 
 Called from C:\HaxeToolkit\haxe\std/haxe/web/Dispatch.hx line 463
 Called from controller/Main.hx line 117
-		 * 
+		 *
 		var plugin = d.parts.shift();
 		for ( p in App.plugins) {
 			var n = Type.getClassName(Type.getClass(p)).toLowerCase();
@@ -132,26 +135,26 @@ Called from controller/Main.hx line 117
 				return;
 			}
 		}
-		
+
 		throw Error("/","Plugin '"+plugin+"' introuvable.");
 		*/
-		
+
 		d.dispatch(new controller.Plugin());
 	}
-	
+
 
 	@logged
 	function doMember(d:Dispatch) {
 		view.category = 'members';
 		d.dispatch(new controller.Member());
 	}
-	
+
 	@logged
 	function doStats(d:Dispatch) {
 		view.category = 'stats';
 		d.dispatch(new Stats());
 	}
-	
+
 	@logged
 	function doAccount(d:Dispatch) {
 		view.category = 'account';
@@ -163,31 +166,31 @@ Called from controller/Main.hx line 117
 		view.category = 'contractadmin';
 		d.dispatch(new controller.Vendor());
 	}
-	
+
 	@logged
 	function doPlace(d:Dispatch) {
 		view.category = 'contractadmin';
 		d.dispatch(new controller.Place());
 	}
-	
+
 	@logged
 	function doTransaction(d:Dispatch) {
 		view.category = 'members';
 		d.dispatch(new controller.Transaction());
 	}
-	
+
 	@logged
 	function doDistribution(d:Dispatch) {
 		view.category = 'contractadmin';
 		d.dispatch(new controller.Distribution());
 	}
-	
+
 	@logged
 	function doMembership(d:Dispatch) {
 		view.category = 'members';
 		d.dispatch(new controller.Membership());
 	}
-	
+
 	function doShop(d:Dispatch) {
 		view.category = 'shop';
 		d.dispatch(new controller.Shop());
@@ -199,63 +202,63 @@ Called from controller/Main.hx line 117
 		view.place = place;
 		view.date = date;
 	}
-	
+
 	@logged
 	function doProduct(d:Dispatch) {
 		view.category = 'contractadmin';
 		d.dispatch(new controller.Product());
 	}
-	
+
 	@logged
 	function doAmap(d:Dispatch) {
 		view.category = 'amap';
 		d.dispatch(new controller.Amap());
 	}
-	
+
 	@logged
 	function doContract(d:Dispatch) {
 		view.category = 'contract';
 		d.dispatch(new Contract());
 	}
-	
+
 	@logged
 	function doContractAdmin(d:Dispatch) {
 		view.category = 'contractadmin';
 		d.dispatch(new ContractAdmin());
 	}
-	
+
 	@logged
 	function doMessages(d:Dispatch) {
 		view.category = 'messages';
 		d.dispatch(new Messages());
 	}
-	
+
 	@logged
 	function doAmapadmin(d:Dispatch) {
 		view.category = 'amapadmin';
 		d.dispatch(new AmapAdmin());
 	}
-	
+
 	@logged
 	function doValidate(date:Date, place:db.Place, user:db.User, d:haxe.web.Dispatch){
-		
+
 		var v = new controller.Validate();
 		v.date = date;
 		v.place = place;
-		v.user = user;		
+		v.user = user;
 		d.dispatch(v);
 	}
-	
+
 	@admin
 	function doAdmin(d:Dispatch) {
 		d.dispatch(new controller.admin.Admin());
 	}
-	
+
 	@admin
 	function doDb(d:Dispatch) {
 		d.parts = []; //disable haxe.web.Dispatch
 		sys.db.Admin.handler();
 	}
-	
+
-	
+
 }

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()) {
@@ -52,7 +52,7 @@ class Messages extends Controller {
 			// send mail confirmation link
 			var e = new sugoi.mail.Mail();
 			e.setSender(App.config.get("default_email"), t._("Cagette.net"));
-			e.setSubject(subject);
+			e.setSubject('[cagettepei] $subject');
 
 			var replyTo = form.getValueOf("senderMail");
 			var replyToName = form.getValueOf("senderName");
@@ -63,9 +63,13 @@ class Messages extends Controller {
 				e.addRecipient(x);
 
 			var text:String = form.getValueOf("text");
+			if (text == null)
+				text = "";
 			var html = app.processTemplate("mail/message.mtt", {text: text, group: app.user.amap, list: getListName(listId)});
 			e.setHtmlBody(html);
 
+			App.log('text=[$text]');
+			App.log('html= ${e.getHtmlBody()}');
 			App.sendMail(e, app.user.getAmap(), listId, app.user);
 
 			// store message
@@ -82,8 +86,6 @@ class Messages extends Controller {
 			lm.insert();
 
 			throw Ok("/messages", t._("The message has been sent"));
-		} else {
-			App.log('Administrator #${app.user.id} <${senderName}> prepares sending an email from choices list');
 		}
 
 		view.form = form;

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/form/ColorRadioGroup.hx

@@ -1,46 +1,39 @@
 package form;
+
 import sugoi.form.elements.RadioGroup;
 import Common;
 
-class ColorRadioGroup extends RadioGroup
+class ColorRadioGroup extends RadioGroup {
-{
+	public function new(name:String, label:String, selected:String) {
-
-	public function new(name:String, label:String,selected:String) 
-	{
 		var data = [];
 		var i = 0;
 		for (c in db.CategoryGroup.COLORS) {
-			data.push( { value:Std.string(c), label:Std.string(i) } );
+			data.push({value: Std.string(c), label: Std.string(i)});
 			i++;
 		}
-		
+
 		super(name, label, data, selected, "1", false, true);
 	}
-	
+
-	override public function render():String
+	override public function render():String {
-	{
 		var s = "";
-		var n = parentForm.name + "_" +name;
+		var n = parentForm.name + "_" + name;
-		
+
 		var c = 0;
-		if (data != null)
+		if (data != null) {
-		{
+			for (row in data) {
-			for (row in data)
+				var radio = "<input type=\"radio\" name=\"" + n + "\" id=\"" + n + c + "\" value=\"" + row.label + "\" "
-			{
+					+ (row.label == Std.string(value) ? "checked" : "") + " />\n";
-			
+				var img = "<div style='margin-right:16px;width:32px;height:32px;background:"
-				var radio = "<input type=\"radio\" name=\""+n+"\" id=\""+n+c+"\" value=\"" + row.label + "\" " + (row.label == Std.string(value) ? "checked":"") +" />\n";
+					+ App.current.view.intToHex(Std.parseInt(row.value))
-				
+					+ ";'></div>";
-				var img = "<div style='margin-right:16px;width:32px;height:32px;background:"+App.current.view.intToHex(Std.parseInt(row.value))+";'></div>";
+
-				
+				s += "<label for=\"" + n + c + "\" class='checkbox' style='display: inline-block;'>" + radio + " " + img + " </label>";
-				s += "<label for=\"" + n+c + "\" class='checkbox' style='display: inline-block;'>"+radio + " "+img+" </label>";
+
-				
 				c++;
-			}	
+			}
 		}
-		
+
 		return s;
 	}
-	
+}
-	
-	
-}

src/service/WaitingListService.hx

@@ -13,6 +13,8 @@ class WaitingListService{
 		var w = new db.WaitingList();
 		w.user = user;
 		w.group = group;
+		if (message == null ) message = "";
+		//message = "souscription = " + message;
 		w.message = message;
 		w.insert();
 
@@ -39,7 +41,7 @@ class WaitingListService{
 
 	public static function canRegister(user:db.User,group:db.Amap){
 		var t  = sugoi.i18n.Locale.texts;
-		
+
 		if ( db.WaitingList.manager.select($amapId == group.id && $user == user) != null) {
 			throw new Error(t._("You are already in the waiting list of this group"));
 		}
@@ -91,7 +93,7 @@ class WaitingListService{
 				group
 			);
 		}
-			
+
 		wl.delete();
 	}
 
@@ -108,9 +110,9 @@ class WaitingListService{
 			var ua = new db.UserAmap();
 			ua.amap = wl.group;
 			ua.user = wl.user;
-			ua.insert();	
+			ua.insert();
 		}
-		
+
 		wl.delete();
 
 		//email the requester
@@ -131,7 +133,7 @@ class WaitingListService{
 				group
 			);
 		}
-			
+
 		wl.delete();
 	}
 

src/sugoi/BaseApp.hx

@@ -45,7 +45,6 @@ class BaseApp {
 		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}');
 	}
 

src/sugoi/BaseView.hx

@@ -13,26 +13,28 @@ class BaseView implements Dynamic {
 
 	public function init() {
 		var app = App.current;
-		
+
 		this.user = app.user;
 		this.session = app.session;
 		this.LANG = App.config.LANG;
 		this.HOST = App.config.HOST;
 		this.DATA_HOST = App.config.DATA_HOST;
 		this.DEBUG = App.config.DEBUG;
+		this.BANDEAU_REGION = App.config.BANDEAU_REGION;
 		this.NAME = App.config.NAME;
 		this.isAdmin = app.user != null && app.user.isAdmin();
-		
+
 		//Access basic functions in views
 		this.Std = Std;
 		this.Math = Math;
-		
+		this.Config = App.config;
-		
+
-		if ( App.config.SQL_LOG  ) {			
+
+		if ( App.config.SQL_LOG  ) {
 			this.sqlLog = untyped app.cnx == null ? null : app.cnx.log;
 		}
 	}
-	
+
 	function getMessage() {
 		var session = App.current.session;
 		if ( session == null ) return null;
@@ -41,14 +43,14 @@ class BaseView implements Dynamic {
 		if( n == null ) return null;
 		return { text : n.text, error : n.error, next : session.messages.length > 0 };
 	}
-	
+
 
 	function getMessages() {
 		var out = [];
 		var session = App.current.session;
 		if ( session == null ) return [];
 		if (session.messages == null) return [];
-		
+
 		for ( m in session.messages) {
 			if( m == null ) continue;
 			out.push( { text : m.text, error : m.error } );
@@ -56,12 +58,12 @@ class BaseView implements Dynamic {
 		session.messages = [];
 		return out;
 	}
-	
+
 
 	function urlEncode(str:String) {
 		return StringTools.urlEncode(str);
 	}
-	
+
 	/**
 	 * To safely print a string in javascript
 	 * @param	str
@@ -70,13 +72,13 @@ class BaseView implements Dynamic {
 		if (str == null) return "";
 		return str.split("\\").join("\\\\").split("'").join("\\'").split("\r").join("\\r").split("\n").join("\\n");
 	}
-	
+
 	/**
 	 * Get a value from the Variable table
 	 * @param	file
 	 */
 	function getVariable( file : String ) {
-		
+
 		var v = _vcache.get(file);
 		if( v != null )
 			return v;
@@ -91,7 +93,7 @@ class BaseView implements Dynamic {
 	function getParam( p : String ) {
 		return App.current.params.get(p);
 	}
-	
+
 	/**
 	 * Return the url of a db.File record
 	 */
@@ -99,7 +101,7 @@ class BaseView implements Dynamic {
 		if (file == null) throw "file is null";
 		return "/file/"+sugoi.db.File.makeSign(file.id)+"."+file.getExtension();
 	}
-	
+
 	/**
 	 * Try to print an HTML table from any kind of object
 	 * @param	data
@@ -107,14 +109,14 @@ class BaseView implements Dynamic {
 	function table(data:Dynamic) {
 		return new sugoi.helper.Table("table table-bordered").toString(data);
 	}
-	
+
 	/**
 	 * newline to <br/>
 	 * @param	txt
 	 */
-	public function nl2br(txt:String):String {	
+	public function nl2br(txt:String):String {
 		if (txt == null) return "";
-		return txt.split("\n").join("<br/>");		
+		return txt.split("\n").join("<br/>");
 	}
 
 
@@ -125,7 +127,7 @@ class BaseView implements Dynamic {
 			return str;
 		}
 	}
-	
+
 	//same function with params ( templo doesnt manage optionnal params in functions )
 	public function __(str:String, params:Dynamic){
 		return sugoi.i18n.Locale.texts.get(str, params);
@@ -136,7 +138,7 @@ class BaseView implements Dynamic {
 		neko.Web.logMessage("_call "+str);
 		return StringTools.rtrim( str.split("||")[0] );
 	}
-	
+
 	//same function with params ( templo doesnt manage optionnal params in functions )
 	public function __(str:String, params:Dynamic):String {
 		neko.Web.logMessage("_call "+str);
@@ -159,5 +161,5 @@ class BaseView implements Dynamic {
 		}
 		return list;
 	}
-	
+
 }

src/sugoi/Config.hx

@@ -3,61 +3,62 @@ 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 BANDEAU_REGION: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";
+		BANDEAU_REGION = get("bandeau_region", "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)));
 	}
-
 }

www/file/.htaccess

@@ -0,0 +1 @@
+ErrorDocument 404 /index.n

www/lang/texts_fr.po

@@ -14,6 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Poedit 2.0.6\n"
 
+
 #: src/payment/Cash.hx:294
 msgid "Cash"
 msgstr "Espèces / Carte Bancaire"
@@ -2237,7 +2238,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."