tagged as 1.8.0

.semver_git_tag

@@ -1 +1 @@
-1.7.3
+1.8.0

Makefile

@@ -74,6 +74,7 @@ templates:
 	@make LANG=fr ctemplates
 	msgfmt www/lang/texts_fr.po -o www/lang/texts_fr.mo 
 	chown www-data:www-data -R www
+	chown www-data:www-data -R lang
 
 ctemplates:
 	(cd lang/$(LANG)/tpl; temploc2 -macros macros.mtt -output ../tmp/ *.mtt */*.mtt */*/*.mtt)

README.md

@@ -28,6 +28,8 @@ EOF
   ServerName cagettepei
   DirectoryIndex index.n
   DocumentRoot /var/www/cagettepei/www/
+
+  
 </VirtualHost>
 ```
 * sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf

package.json

@@ -47,5 +47,5 @@
   "bugs": {
     "url": "https://github.com/bablukid/cagette/issues"
   },
-  "version": "1.7.3"
+  "version": "1.8.0"
 }

src/App.hx

@@ -1,110 +1,109 @@
 import db.User;
 import thx.semver.Version;
 import Common;
- 
-class App extends sugoi.BaseApp {
 
-	public static var current : App = null;
+class App extends sugoi.BaseApp {
-	public static var t : sugoi.i18n.translator.ITranslator;
+	public static var current:App = null;
+	public static var t:sugoi.i18n.translator.ITranslator;
 	public static var config = sugoi.BaseApp.config;
-	
+
-	public var eventDispatcher :hxevents.Dispatcher<Event>;	
+	public var eventDispatcher:hxevents.Dispatcher<Event>;
-	public var plugins : Array<sugoi.plugin.IPlugIn>;
+	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("july");
-	//public static var VERSION = ([0,9,2]  : Version).withPre(MyMacros.getGitShortSHA(), MyMacros.getGitCommitDate());
+	// public static var VERSION = ([0,9,2]  : Version).withPre(MyMacros.getGitShortSHA(), MyMacros.getGitCommitDate());
 	public static var VERSION = "cagette-péi " + MyMacros.getGitCommitDate();
-	
+
-	public function new(){
+	public function new() {
 		super();
 	}
-	
+
 	public static function main() {
-		
 		App.t = sugoi.form.Form.translator = new sugoi.i18n.translator.TMap(getTranslationArray(), "fr");
 		sugoi.BaseApp.main();
 	}
-	
+
 	/**
 	 * Init plugins and event dispatcher just before launching the app
 	 */
 	override public function mainLoop() {
 		eventDispatcher = new hxevents.Dispatcher<Event>();
 		plugins = [];
-		//internal plugins
+		// internal plugins
 		plugins.push(new plugin.Tutorial());
-		
+
-		//optionnal plugins
+		// optionnal plugins
 		#if plugins
-		plugins.push( new hosted.HostedPlugIn() );				
+		plugins.push(new hosted.HostedPlugIn());
-		plugins.push( new pro.ProPlugIn() );		
+		plugins.push(new pro.ProPlugIn());
-		plugins.push( new connector.ConnectorPlugIn() );				
+		plugins.push(new connector.ConnectorPlugIn());
-		plugins.push( new pro.LemonwayEC() );
+		plugins.push(new pro.LemonwayEC());
-		plugins.push( new who.WhoPlugIn() );
+		plugins.push(new who.WhoPlugIn());
 		#end
-	
+
 		super.mainLoop();
 	}
-	
+
-	public function getCurrentGroup(){		
+	public function getCurrentGroup() {
-		if (session == null) return null;
+		if (session == null)
-		if (session.data == null ) return null;
+			return null;
+		if (session.data == null)
+			return null;
 		var a = session.data.amapId;
 		if (a == null) {
 			return null;
-		}else {			
+		} else {
-			return db.Amap.manager.get(a,false);
+			return db.Amap.manager.get(a, false);
 		}
 	}
-	
+
 	override function beforeDispatch() {
-		
+		// send "current page" event
-		//send "current page" event
+		event(Page(this.uri));
-		event( Page(this.uri) );
+
-		
 		super.beforeDispatch();
 	}
-	
+
 	public function getPlugin(name:String):sugoi.plugin.IPlugIn {
 		for (p in plugins) {
-			if (p.getName() == name) return p;
+			if (p.getName() == name)
+				return p;
 		}
 		return null;
 	}
-	
+
-	public static function log(t:Dynamic) {
+	public static function log(t:Dynamic, ?infos:haxe.PosInfos) {
-		if(App.config.DEBUG) {
+		if (App.config.DEBUG) {
-			neko.Web.logMessage(Std.string(t)); //write in Apache error log
+			// neko.Web.logMessage(Std.string(t)); // write in Apache error log
-			#if weblog
+			neko.Web.logMessage('[${infos.fileName}:${infos.lineNumber} ${infos.className}#${infos.methodName}] ' + Std.string(t));
-			Weblog.log(t); //write en Weblog console (https://lib.haxe.org/p/weblog/)
-			#end
 		}
 	}
-	
+
 	public function event(e:Event) {
-		if(e==null) return null;
+		if (e == null)
+			return null;
 		this.eventDispatcher.dispatch(e);
 		return e;
 	}
-	
+
 	/**
 	 * Translate DB objects fields in forms
 	 */
 	public static function getTranslationArray() {
-		//var t = sugoi.i18n.Locale.texts;
+		// var t = sugoi.i18n.Locale.texts;
-		var out = new Map<String,String>();
+		var out = new Map<String, String>();
-		//out.set("firstName", t._("First name") );
+		// out.set("firstName", t._("First name") );
-		//out.set("lastName", t._("Last name"));
+		// out.set("lastName", t._("Last name"));
 		out.set("firstName2", "Prénom du conjoint");
 		out.set("lastName2", "Nom du conjoint");
 		out.set("email2", "e-mail du conjoint");
-		//out.set("pass", t._("Password") );
+		// out.set("pass", t._("Password") );
-		//out.set("address1", t._("address") );
+		// out.set("address1", t._("address") );
-		//out.set("address2", t._("address") );
+		// out.set("address2", t._("address") );
 		out.set("zipCode", "code postal");
 		out.set("city", "commune");
 		out.set("phone", "téléphone");
@@ -123,24 +122,24 @@ class App extends sugoi.BaseApp {
 		out.set("txtHome", "Texte en page d'accueil pour les adhérents connectés");
 		out.set("txtDistrib", "Texte à faire figurer sur les listes d'émargement lors des distributions");
 		out.set("extUrl", "URL du site du groupe.");
-		
+
 		out.set("distributor1", "Distributeur 1");
 		out.set("distributor2", "Distributeur 2");
 		out.set("distributor3", "Distributeur 3");
 		out.set("distributor4", "Distributeur 4");
 		out.set("distributorNum", "Nbre de distributeurs nécessaires (de 0 à 4)");
-		
+
 		out.set("startDate", "Date de début");
 		out.set("endDate", "Date de fin");
-		
+
 		out.set("orderStartDate", "Date ouverture des commandes");
-		out.set("orderEndDate", "Date fermeture des commandes");	
+		out.set("orderEndDate", "Date fermeture des commandes");
-		out.set("openingHour", "Heure d'ouverture");	
+		out.set("openingHour", "Heure d'ouverture");
-		out.set("closingHour", "Heure de fermeture");	
+		out.set("closingHour", "Heure de fermeture");
-		
+
-		out.set("date", "Date de distribution");	
+		out.set("date", "Date de distribution");
-		out.set("active", "actif");	
+		out.set("active", "actif");
-		
+
 		out.set("contact", "Reponsable");
 		out.set("vendor", "Producteur");
 		out.set("text", "Texte");
@@ -170,7 +169,7 @@ class App extends sugoi.BaseApp {
 		out.set("pname", "Produit");
 		out.set("organic", "Agriculture biologique");
 		out.set("hasFloatQt", "Autoriser quantités \"à virgule\"");
-		
+
 		out.set("membershipRenewalDate", "Adhésions : Date de renouvellement");
 		out.set("membershipPrice", "Adhésions : Coût de l'adhésion");
 		out.set("UsersCanOrder", "Les adhérents peuvent saisir leur commande en ligne");
@@ -193,12 +192,12 @@ class App extends sugoi.BaseApp {
 		out.set("ref", "Référence");
 		out.set("linkText", "Intitulé du lien");
 		out.set("linkUrl", "URL du lien");
-		
+
 		out.set("Amap", "AMAP");
 		out.set("GroupedOrders", "Groupement d'achat");
 		out.set("ProducerDrive", "Collectif de producteurs");
 		out.set("FarmShop", "Vente à la ferme");
-		
+
 		out.set("regOption", "Inscription de nouveaux adhérents");
 		out.set("Closed", "Fermé : Le coordinateur ajoute les nouveaux adhérents");
 		out.set("WaitingList", "Liste d'attente");
@@ -206,102 +205,95 @@ class App extends sugoi.BaseApp {
 		out.set("Full", "Complet : Le groupe n'accepte plus de nouveaux adhérents");
 		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("unitType", "Unité");
 		out.set("qt", "Quantité");
 		out.set("Unit", "Pièce");
 		out.set("Kilogram", "Kilogrammes");
 		out.set("Gram", "Grammes");
-		out.set("Litre", "Litres");		
+		out.set("Litre", "Litres");
 		out.set("htPrice", "Prix H.T");
 		out.set("amount", "Montant");
-		
+
 		out.set("HasPayments", "Gestion des paiements");
-		
+
 		out.set("byMember", "Par adhérent");
 		out.set("byProduct", "Par produit");
-				
+
 		out.set("variablePrice", "Variable price based on weight");
 		return out;
 	}
-	
+
-	public function populateAmapMembers() {		
+	public function populateAmapMembers() {
 		return user.amap.getMembersFormElementData();
 	}
-	
-	public static function getMailer():sugoi.mail.IMailer {
-		
-		var mailer : sugoi.mail.IMailer = new sugoi.mail.BufferedMailer();
-		
-		if(App.config.DEBUG){ 
 
-			//Dev env : emails are written to tmp folder
+	public static function getMailer():sugoi.mail.IMailer {
+		var mailer:sugoi.mail.IMailer = new sugoi.mail.BufferedMailer();
+
+		if (App.config.DEBUG) {
+			// Dev env : emails are written to tmp folder
 			mailer = new sugoi.mail.DebugMailer();
-		}else{
+		} else {
-			
+			if (sugoi.db.Variable.get("mailer") == null) {
-			if (sugoi.db.Variable.get("mailer") == null){
 				var msg = sugoi.i18n.Locale.texts._("Please configure the email settings in a <href='/admin/emails'>this section</a>");
-				throw sugoi.ControllerAction.ErrorAction("/",msg);
+				throw sugoi.ControllerAction.ErrorAction("/", msg);
 			}
 
-			if (sugoi.db.Variable.get("mailer") == "mandrill"){		
+			if (sugoi.db.Variable.get("mailer") == "mandrill") {
-				//Buffered emails with Mandrill
+				// Buffered emails with Mandrill
-				untyped mailer.defineFinalMailer("mandrill");		
+				untyped mailer.defineFinalMailer("mandrill");
-			}else{
+			} else {
-				//Buffered emails with SMTP
+				// Buffered emails with SMTP
 				untyped mailer.defineFinalMailer("smtp");
 			}
 		}
 		return mailer;
 	}
-	
+
 	/**
 	 * Send an email
 	 */
-	public static function sendMail(m:sugoi.mail.Mail, ?group:db.Amap, ?listId:String, ?sender:db.User){
+	public static function sendMail(m:sugoi.mail.Mail, ?group:db.Amap, ?listId:String, ?sender:db.User) {
-		
+		if (group == null)
-		if (group == null) group = App.current.user == null ? null:App.current.user.getAmap();
+			group = App.current.user == null ? null : App.current.user.getAmap();
-		
-		current.event(SendEmail(m));
-		
-		var params = group==null ? null : {remoteId:group.id};
 
-		getMailer().send(m,params,function(o){});
+		current.event(SendEmail(m));
-		
+
+		var params = group == null ? null : {remoteId: group.id};
+
+		getMailer().send(m, params, function(o) {});
 	}
-	
+
-	public static function quickMail(to:String, subject:String, html:String,?group:db.Amap){
+	public static function quickMail(to:String, subject:String, html:String, ?group:db.Amap) {
-		var e = new sugoi.mail.Mail();		
+		var e = new sugoi.mail.Mail();
 		e.setSubject(subject);
-		e.setRecipient(to);			
+		e.setRecipient(to);
-		e.setSender(App.config.get("default_email"),"Cagette.net");				
+		e.setSender(App.config.get("default_email"), "Cagette.net");
-		var html = App.current.processTemplate("mail/message.mtt", {text:html,group:group});		
+		var html = App.current.processTemplate("mail/message.mtt", {text: html, group: group});
 		e.setHtmlBody(html);
 		App.sendMail(e);
 	}
-	
+
 	/**
 	 * process a template and returns the generated string
 	 * @param	tpl
 	 * @param	ctx
 	 */
 	public function processTemplate(tpl:String, ctx:Dynamic):String {
-		
 		Reflect.setField(ctx, 'HOST', App.config.HOST);
 		Reflect.setField(ctx, 'hDate', App.current.view.hDate);
-		//i18n functions
+		// i18n functions
 		ctx._ = App.current.view._;
 		ctx.__ = App.current.view.__;
-		
+
 		var tpl = loadTemplate(tpl);
-		var html = tpl.execute(ctx);	
+		var html = tpl.execute(ctx);
 		#if php
-		if ( html.substr(0, 4) == "null") html = html.substr(4);
+		if (html.substr(0, 4) == "null")
+			html = html.substr(4);
 		#end
 		return html;
 	}
-	
-	
-	
 }