From: Ummon Date: Thu, 23 Apr 2020 16:43:19 +0000 (+0200) Subject: Merge branch 'master' of gburri.org:euphorik X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=commitdiff_plain;h=808fb60f6c10dfcaccee94c6a49f768de84dc2ef;hp=a43e9c0197a98e1ae68e7a50eece6b22d55467d5 Merge branch 'master' of gburri.org:euphorik --- diff --git a/.gitignore b/.gitignore index 5b3f348..7c8641d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *.iws *.beam -var/ \ No newline at end of file +var/ +/BD +/data \ No newline at end of file diff --git a/doc/server_architecture.svg b/doc/server_architecture.svg index 8a00377..c6002b4 100644 --- a/doc/server_architecture.svg +++ b/doc/server_architecture.svg @@ -532,7 +532,7 @@ y="359.74429" x="77.082535" id="tspan2541" - sodipodi:role="line">formater + sodipodi:role="line">formatter - + diff --git a/js/chat/commandes.js b/js/chat/commandes.js index 871e22b..cbf522d 100644 --- a/js/chat/commandes.js +++ b/js/chat/commandes.js @@ -27,20 +27,20 @@ * /nick * Modifie le nick courant */ -euphorik.Commandes = function(client, pageMinichat, util, formater) { +euphorik.Commandes = function(client, pageMinichat, util, formatter) { var thisCommandes = this; this.client = client; this.pageMinichat = pageMinichat; this.util = util; - this.formater = formater; + this.formatter = formatter; // construction du texte d'aide (liste des commandes) de manière statique this.texteAide = "

Commandes

    "; objectEach( euphorik.Commandes.liste, function(name, commande) { - thisCommandes.texteAide += "
  • " + thisCommandes.formater.completeProcessing(commande.usage) + " : " + thisCommandes.formater.completeProcessing(commande.description) + "
    • "; + thisCommandes.texteAide += "
  • " + thisCommandes.formatter.completeProcessing(commande.usage) + " : " + thisCommandes.formatter.completeProcessing(commande.description) + "
    • "; } ); this.texteAide += "
"; diff --git a/js/chat/conversation.js b/js/chat/conversation.js index 8c11752..4deb11c 100644 --- a/js/chat/conversation.js +++ b/js/chat/conversation.js @@ -35,7 +35,7 @@ euphorik.Conversation = function(conversations, num) { this.id = Math.floor(Math.random() * 1000000).toString(36); this.util = this.conversations.util; - this.formater = this.conversations.formater; + this.formatter = this.conversations.formatter; this.client = this.conversations.client; this.idDernierMessageAffiche = 0; @@ -107,7 +107,7 @@ euphorik.Conversation.prototype.getMessageReduit = function() { * @racine un message représentant la racine de la conversation, vaut undefined pour la conversation générale */ euphorik.Conversation.prototype.setRacine = function(racineElement) { - this.racine = new euphorik.Message(this.client, this.formater, racineElement); + this.racine = new euphorik.Message(this.client, this.formatter, racineElement); }; /** diff --git a/js/chat/conversations.js b/js/chat/conversations.js index ea7e742..05da80e 100644 --- a/js/chat/conversations.js +++ b/js/chat/conversations.js @@ -21,9 +21,9 @@ /** * Représente l'ensemble des conversations affichés. */ -euphorik.Conversations = function(client, formater, util, communication, fragment) { +euphorik.Conversations = function(client, formatter, util, communication, fragment) { this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; this.fragment = fragment; @@ -247,7 +247,7 @@ euphorik.Conversations.prototype.ajouterMessage = function(element, numConversat var message = new euphorik.Message( this.client, - this.formater, + this.formatter, element ); diff --git a/js/chat/message.js b/js/chat/message.js index b3e5f12..e7439c9 100644 --- a/js/chat/message.js +++ b/js/chat/message.js @@ -25,9 +25,9 @@ euphorik.Reponse = function(id, nick, login) { /** * Représente un message. */ -euphorik.Message = function(client, formater, element) { +euphorik.Message = function(client, formatter, element) { this.client = client; - this.formater = formater; + this.formatter = formatter; this.id = element.id; this.auteurId = element.user_id; @@ -118,9 +118,9 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { // construit l'identifiant de la personne var identifiant = - this.client.nickFormat === "nick" || this.login === "" ? this.formater.completeProcessing(this.nick) : - (this.client.nickFormat === "login" ? this.formater.completeProcessing(this.login) : - this.formater.completeProcessing(this.nick) + "(" + this.formater.completeProcessing(this.login) +")" ); + this.client.nickFormat === "nick" || this.login === "" ? this.formatter.completeProcessing(this.nick) : + (this.client.nickFormat === "login" ? this.formatter.completeProcessing(this.login) : + this.formatter.completeProcessing(this.nick) + "(" + this.formatter.completeProcessing(this.login) +")" ); var XHTMLrepondA = ""; var debut = true; @@ -128,7 +128,7 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { if (!debut) { XHTMLrepondA += ", "; } - XHTMLrepondA += thisMessage.formater.completeProcessing(rep.nick); + XHTMLrepondA += thisMessage.formatter.completeProcessing(rep.nick); debut = false; }); if (XHTMLrepondA) { @@ -148,6 +148,6 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { "" + "" + XHTMLrepondA + - "" + this.formater.completeProcessing(this.contenu, this.nick) + "" + + "" + this.formatter.completeProcessing(this.contenu, this.nick) + "" + ""; }; diff --git a/js/euphorik.js b/js/euphorik.js index 3f45e2d..893a32a 100755 --- a/js/euphorik.js +++ b/js/euphorik.js @@ -25,8 +25,8 @@ var euphorik = {}; $(document).ready( function() { var fragment = new Fragment(); - var formater = new euphorik.Formater(); - var util = new euphorik.Util(formater); + var formatter = new euphorik.Formatter(); + var util = new euphorik.Util(formatter); var communication = new euphorik.Communication( function(data) { util.messageDialog(data.error_message); }, function() { util.showWaitBar(); }, @@ -59,16 +59,16 @@ $(document).ready( $("#menu .register").click(function(){ pages.displayPage("register"); }); $("#menu .about").click(function(){ pages.displayPage("about"); }); - // TODO: simplification : such link[1] should be created and automatically open the right page without + // TODO : simplification : such link[1] should be created and automatically open the right page without // explicitly add a page. // [1] : Terms of use $("#footer .termsOfUse").click(function(){ pages.displayPage("terms_of_use"); }); - pages.addPage(new euphorik.PageMinichat(client, formater, util, communication), true); - pages.addPage(new euphorik.PageAdmin(client, formater, util, communication)); - pages.addPage(new euphorik.PageProfile(client, formater, util)); - pages.addPage(new euphorik.PageRegister(client, formater, util)); - pages.addPage(new euphorik.PageAbout(client, formater, util, communication)); + pages.addPage(new euphorik.PageMinichat(client, formatter, util, communication), true); + pages.addPage(new euphorik.PageAdmin(client, formatter, util, communication)); + pages.addPage(new euphorik.PageProfile(client, formatter, util)); + pages.addPage(new euphorik.PageRegister(client, formatter, util)); + pages.addPage(new euphorik.PageAbout(client, formatter, util, communication)); pages.addPage("terms_of_use"); pages.displayPage(); // display the default page diff --git a/js/formater.js b/js/formater.js deleted file mode 100644 index a4fbc23..0000000 --- a/js/formater.js +++ /dev/null @@ -1,183 +0,0 @@ -// coding: utf-8 -// Copyright 2008 Grégory Burri -// -// This file is part of Euphorik. -// -// Euphorik is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Euphorik is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Euphorik. If not, see . - -/*jslint laxbreak:true */ - -/** - * An object for text formatting like Wiki syntax or smiles substitution. - * TODO : improve the performance of the smiles substitution - */ -euphorik.Formater = function() { - this.smiles = euphorik.conf.smiles; - this.protocols = "http|https|ed2k"; - - this.regexUrl = new RegExp("(?:(?:" + this.protocols + ")://|www\\.)[^ ]*", "gi"); - this.regexImg = new RegExp("^.*?\\.(gif|jpg|png|jpeg|bmp|tiff)$", "i"); - this.regexDomain = new RegExp("^(?:(?:" + this.protocols + ")://)(.*?)(?:$|/).*$", "i"); - this.regexTestIfProtocolExists = new RegExp("^(?:" + this.protocols + ")://.*$", "i"); - this.regexProtocolName = new RegExp("^(.*?)://"); -}; - -/** - * Formats a nick given by the user. - * Trim and remove "{..}". - * @param nick the given nick - * @return the cleaned nick - */ -euphorik.Formater.prototype.formatNick = function(nick) { - return nick.replace(/\{|\}/g, "").trim(); -}; - -euphorik.Formater.prototype.getSmilesHTML = function() { - var XHTML = ""; - objectEach(this.smiles, function(name) { - XHTML += "\"""; - }); - return XHTML; -}; - -/** - * Complete fomratting process applied to a text. - * - Remove HTML markups - * - Substitutes wiki syntax with HTML - * - Replaces URL with 'a' tag - * - Replaces smiles with HTML - * - Replaces the link to a conversation with HTML - * @m the raw message - * @nick optional, attaches the nick and the message to each images like " : " - */ -euphorik.Formater.prototype.completeProcessing = function(m, nick) { - return this.processConversationLinks(this.processSmiles(this.traiterURL(this.traiterWikiSyntaxe(this.remplacerBalisesHTML(m)), nick))); -}; - -/** - * Processes all conversation links. - * The user can click on a conversation link to open it. - * A link is a number in between brackets like that : "{5F}" where '5F' is the id of the root message. - * This link will be turn in '{5F}' which can be clicked to open the '5F' conversation. - */ -euphorik.Formater.prototype.processConversationLinks = function(m) { - return m.replace( - /\{\w+\}/g, - function(lien) { - return "" + lien + ""; - } - ); -}; - -/** - * Substitute the smiles (':)', ':P', etc.) with HTML. - * FIXME : This function is very heavy, to optimize ! - * Average : 234ms - */ -euphorik.Formater.prototype.processSmiles = function(m) { - objectEach(this.smiles, function(name, smiles) { - for (var i = 0; i < smiles.length; i++) { - m = m.replace(smiles[i], "\"""); - } - }); - return m; -}; - -euphorik.Formater.prototype.remplacerBalisesHTML = function(m) { - return m.replace(//g, ">").replace(/"/g, """); -}; - -euphorik.Formater.prototype.traiterURL = function(m, nick) { - var thisFormater = this; - var traitementUrl = function(url) { - // si ya pas de protocole on rajoute "http://" - if (!thisFormater.regexTestIfProtocolExists.test(url)) { - url = "http://" + url; - } - var extension = thisFormater.getShort(url); - return "[" + extension[0] + "]"; - }; - return m.replace(this.regexUrl, traitementUrl); -}; - -/** - * Formatage en utilisant un sous-ensemble des règles de Textile : http://en.wikipedia.org/wiki/Textile_(markup_language). - * par exemple _italic_ devient italic. - */ -euphorik.Formater.prototype.traiterWikiSyntaxe = function(m) { - return m.replace( - /(?:^| )_(.*?)_(?:$| )/g, - function(texte, c1, c2, c3) { - return '' + c1 + c2 + c3 + ''; - } - ).replace( - /(?:^| )\*(.*?)\*(?:$| )/g, - function(texte, c1, c2, c3) { - return '' + c1 + c2 + c3 + ''; - } - ); -}; - -/** - * Renvoie une version courte de l'url. - * par exemple : http://en.wikipedia.org/wiki/Yakov_Smirnoff devient en.wikipedia.org - */ -euphorik.Formater.prototype.getShort = function(url) { - var estUneImage = false; - var versionShort = null; - var rechercheImg = this.regexImg.exec(url); - - if (rechercheImg) { - versionShort = rechercheImg[1].toLowerCase(); - if (versionShort === "jpeg") { - versionShort = "jpg"; // jpeg -> jpg - } - estUneImage = true; - } else { - var rechercheDomaine = this.regexDomain.exec(url); - if (rechercheDomaine && rechercheDomaine.length >= 2) { - versionShort = rechercheDomaine[1]; - } else { - var protocolName = this.regexProtocolName.exec(url); - if (protocolName && protocolName.length >= 2) { - versionShort = protocolName[1]; - } - } - } - - return [versionShort ? versionShort : "url", estUneImage]; - }; - -euphorik.Formater.prototype.supprimerSmiles = function(m) { - objectEach(this.smiles, function(name, smiles) { - for (var i = 0; i < smiles.length; i++) { - m = m.replace(smiles[i], ""); - } - }); - return m; -}; - -/** - * Traite les nick et messages à être affiché dans le titre d'une image visualisé avec lightbox. - * Supprime les smiles pour pas qu'ils puissent être remplacés par la fonction 'processSmiles'. - * TODO : trouver un moyen pour que les smiles puissent être conservés - */ -euphorik.Formater.prototype.traiterPourFenetreLightBox = function(M, urlCourante) { - var thisFormater = this; - var traitementUrl = function(url) { - return "[" + thisFormater.getShort(url)[0] + (urlCourante === url ? "*" : "") + "]"; - }; - - return this.remplacerBalisesHTML(this.supprimerSmiles(M)).replace(this.regexUrl, traitementUrl); -}; diff --git a/js/formatter.js b/js/formatter.js new file mode 100644 index 0000000..b1227f0 --- /dev/null +++ b/js/formatter.js @@ -0,0 +1,183 @@ +// coding: utf-8 +// Copyright 2008 Grégory Burri +// +// This file is part of Euphorik. +// +// Euphorik is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Euphorik is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Euphorik. If not, see . + +/*jslint laxbreak:true */ + +/** + * An object for text formatting like Wiki syntax or smiles substitution. + * TODO : improve the performance of the smiles substitution + */ +euphorik.Formatter = function() { + this.smiles = euphorik.conf.smiles; + this.protocols = "http|https|ed2k"; + + this.regexUrl = new RegExp("(?:(?:" + this.protocols + ")://|www\\.)[^ ]*", "gi"); + this.regexImg = new RegExp("^.*?\\.(gif|jpg|png|jpeg|bmp|tiff)$", "i"); + this.regexDomain = new RegExp("^(?:(?:" + this.protocols + ")://)(.*?)(?:$|/).*$", "i"); + this.regexTestIfProtocolExists = new RegExp("^(?:" + this.protocols + ")://.*$", "i"); + this.regexProtocolName = new RegExp("^(.*?)://"); +}; + +/** + * Formats a nick given by the user. + * Trim and remove "{..}". + * @param nick the given nick + * @return the cleaned nick + */ +euphorik.Formatter.prototype.formatNick = function(nick) { + return nick.replace(/\{|\}/g, "").trim(); +}; + +euphorik.Formatter.prototype.getSmilesHTML = function() { + var XHTML = ""; + objectEach(this.smiles, function(name) { + XHTML += "\"""; + }); + return XHTML; +}; + +/** + * Complete formatting process applied to a text. + * - Remove HTML markups + * - Substitutes wiki syntax with HTML + * - Replaces URL with 'a' tag + * - Replaces smiles with HTML + * - Replaces the link to a conversation with HTML + * @m the raw message + * @nick optional, attaches the nick and the message to each images like " : " + */ +euphorik.Formatter.prototype.completeProcessing = function(m, nick) { + return this.processConversationLinks(this.processSmiles(this.traiterURL(this.traiterWikiSyntaxe(this.remplacerBalisesHTML(m)), nick))); +}; + +/** + * Processes all conversation links. + * The user can click on a conversation link to open it. + * A link is a number in between brackets like that : "{5F}" where '5F' is the id of the root message. + * This link will be turn in '{5F}' which can be clicked to open the '5F' conversation. + */ +euphorik.Formatter.prototype.processConversationLinks = function(m) { + return m.replace( + /\{\w+\}/g, + function(lien) { + return "" + lien + ""; + } + ); +}; + +/** + * Substitute the smiles (':)', ':P', etc.) with HTML. + * FIXME : This function is very heavy, to optimize ! + * Average : 234ms + */ +euphorik.Formatter.prototype.processSmiles = function(m) { + objectEach(this.smiles, function(name, smiles) { + for (var i = 0; i < smiles.length; i++) { + m = m.replace(smiles[i], "\"""); + } + }); + return m; +}; + +euphorik.Formatter.prototype.remplacerBalisesHTML = function(m) { + return m.replace(//g, ">").replace(/"/g, """); +}; + +euphorik.Formatter.prototype.traiterURL = function(m, nick) { + var thisFormatter = this; + var traitementUrl = function(url) { + // si ya pas de protocole on rajoute "http://" + if (!thisFormatter.regexTestIfProtocolExists.test(url)) { + url = "http://" + url; + } + var extension = thisFormatter.getShort(url); + return "[" + extension[0] + "]"; + }; + return m.replace(this.regexUrl, traitementUrl); +}; + +/** + * Formatage en utilisant un sous-ensemble des règles de Textile : http://en.wikipedia.org/wiki/Textile_(markup_language). + * par exemple _italic_ devient italic. + */ +euphorik.Formatter.prototype.traiterWikiSyntaxe = function(m) { + return m.replace( + /(?:^| )_(.*?)_(?:$| )/g, + function(texte, c1, c2, c3) { + return '' + c1 + c2 + c3 + ''; + } + ).replace( + /(?:^| )\*(.*?)\*(?:$| )/g, + function(texte, c1, c2, c3) { + return '' + c1 + c2 + c3 + ''; + } + ); +}; + +/** + * Renvoie une version courte de l'url. + * par exemple : http://en.wikipedia.org/wiki/Yakov_Smirnoff devient en.wikipedia.org + */ +euphorik.Formatter.prototype.getShort = function(url) { + var estUneImage = false; + var versionShort = null; + var rechercheImg = this.regexImg.exec(url); + + if (rechercheImg) { + versionShort = rechercheImg[1].toLowerCase(); + if (versionShort === "jpeg") { + versionShort = "jpg"; // jpeg -> jpg + } + estUneImage = true; + } else { + var rechercheDomaine = this.regexDomain.exec(url); + if (rechercheDomaine && rechercheDomaine.length >= 2) { + versionShort = rechercheDomaine[1]; + } else { + var protocolName = this.regexProtocolName.exec(url); + if (protocolName && protocolName.length >= 2) { + versionShort = protocolName[1]; + } + } + } + + return [versionShort ? versionShort : "url", estUneImage]; + }; + +euphorik.Formatter.prototype.supprimerSmiles = function(m) { + objectEach(this.smiles, function(name, smiles) { + for (var i = 0; i < smiles.length; i++) { + m = m.replace(smiles[i], ""); + } + }); + return m; +}; + +/** + * Traite les nick et messages à être affiché dans le titre d'une image visualisé avec lightbox. + * Supprime les smiles pour pas qu'ils puissent être remplacés par la fonction 'processSmiles'. + * TODO : trouver un moyen pour que les smiles puissent être conservés + */ +euphorik.Formatter.prototype.traiterPourFenetreLightBox = function(M, urlCourante) { + var thisFormatter = this; + var traitementUrl = function(url) { + return "[" + thisFormatter.getShort(url)[0] + (urlCourante === url ? "*" : "") + "]"; + }; + + return this.remplacerBalisesHTML(this.supprimerSmiles(M)).replace(this.regexUrl, traitementUrl); +}; diff --git a/js/pageAbout.js b/js/pageAbout.js index 9a72139..e5da1cb 100644 --- a/js/pageAbout.js +++ b/js/pageAbout.js @@ -16,12 +16,12 @@ // You should have received a copy of the GNU General Public License // along with Euphorik. If not, see . -euphorik.PageAbout = function(client, formater, util, communication) { +euphorik.PageAbout = function(client, formatter, util, communication) { this.name = "about"; this.client = client; - this.formater = formater; - this.util = util; + this.formatter = formatter; + this.util = util; this.communication = communication; }; diff --git a/js/pageAdmin.js b/js/pageAdmin.js index fe464b8..6b1819d 100644 --- a/js/pageAdmin.js +++ b/js/pageAdmin.js @@ -21,11 +21,11 @@ /*jslint laxbreak:true */ -euphorik.PageAdmin = function(client, formater, util, communication) { +euphorik.PageAdmin = function(client, formatter, util, communication) { this.name = "admin"; this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; this.communication = communication; @@ -87,8 +87,8 @@ euphorik.PageAdmin.prototype.majIPs = function() { '|'; ip.users.each(function(j, user) { XHTML += (j > 0 ? ", " : "") + - '' + thisPageAdmin.formater.completeProcessing(user.nick) + '' + - (user.login === "" ? "" : ''); + '' + thisPageAdmin.formatter.completeProcessing(user.nick) + '' + + (user.login === "" ? "" : ''); }); XHTML += 'débannir'; }); diff --git a/js/pageMinichat.js b/js/pageMinichat.js index 13f3375..4068222 100755 --- a/js/pageMinichat.js +++ b/js/pageMinichat.js @@ -18,14 +18,14 @@ /*jslint laxbreak:true */ -euphorik.PageMinichat = function(client, formater, util, communication) { +euphorik.PageMinichat = function(client, formatter, util, communication) { this.name = "minichat"; this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; this.communication = communication; - this.commandes = new euphorik.Commandes(this.client, this, this.util, this.formater); + this.commandes = new euphorik.Commandes(this.client, this, this.util, this.formatter); // permet d'éviter d'envoyer plusieurs messages simultanément en pressant // rapidement sur "enter" par exemple @@ -65,7 +65,7 @@ euphorik.PageMinichat.prototype.charger = function() { $("#posterMessage input.nick").val(this.client.nick); // cet appel ne doit pas être fait avant l'appel à 'charger' - this.conversations = new euphorik.Conversations(this.client, this.formater, this.util, this.communication, this.fragment); + this.conversations = new euphorik.Conversations(this.client, this.formatter, this.util, this.communication, this.fragment); this.chargerConversationsFragment(); @@ -118,12 +118,12 @@ euphorik.PageMinichat.prototype.charger = function() { // $("body").append('
'); // affichage des smiles - $("#smiles").append(this.formater.getSmilesHTML()).children().each( + $("#smiles").append(this.formatter.getSmilesHTML()).children().each( function(i) { var opacityBase = $(this).css("opacity"); $(this).click( function() { - thisPage.util.replaceSelection($("form#posterMessage input.message")[0], thisPage.formater.smiles[$(this).attr("class")][0].source.replace(/\\/g, "")); + thisPage.util.replaceSelection($("form#posterMessage input.message")[0], thisPage.formatter.smiles[$(this).attr("class")][0].source.replace(/\\/g, "")); } ).hover( function() { $(this).animate({opacity: 1}, 200); }, @@ -227,7 +227,7 @@ euphorik.PageMinichat.prototype.envoyerMessage = function(message) { var nick = $("form#posterMessage input.nick").val(); // (un nick vide est autorisé) - nick = this.formater.formatNick(nick); + nick = this.formatter.formatNick(nick); if (nick === euphorik.conf.defaultNick) { this.util.messageDialog("Choose a nickname"); diff --git a/js/pageProfile.js b/js/pageProfile.js index c5ea5df..1a474d7 100755 --- a/js/pageProfile.js +++ b/js/pageProfile.js @@ -16,11 +16,11 @@ // You should have received a copy of the GNU General Public License // along with Euphorik. If not, see . -euphorik.PageProfile = function(client, formater, util) { +euphorik.PageProfile = function(client, formatter, util) { this.name = "profile"; this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; }; @@ -64,7 +64,7 @@ euphorik.PageProfile.prototype.chargerProfile = function() { $("form#profile button").click( function() { - thisPage.client.nick = thisPage.formater.formatNick($("form#profile input.nick").val()); + thisPage.client.nick = thisPage.formatter.formatNick($("form#profile input.nick").val()); thisPage.client.email = $("form#profile input.email").val(); thisPage.client.chatOrder = $("form#profile select#chatOrder option:selected").attr("value"); thisPage.client.nickFormat = $("form#profile select#affichagePseudo option:selected").attr("value"); diff --git a/js/pageRegister.js b/js/pageRegister.js index 09d3631..56be885 100755 --- a/js/pageRegister.js +++ b/js/pageRegister.js @@ -16,11 +16,11 @@ // You should have received a copy of the GNU General Public License // along with Euphorik. If not, see . -euphorik.PageRegister = function(client, formater, util) { +euphorik.PageRegister = function(client, formatter, util) { this.name = "register"; this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; }; diff --git a/js/util.js b/js/util.js index 5feacb5..39f89b0 100644 --- a/js/util.js +++ b/js/util.js @@ -23,16 +23,16 @@ * - Print a message box to display some information for the user. * - Set a tooltip for a HTML element. * - Some text manipulation for input area. - * @formater An object for string format + * @formatter An object for string format */ -euphorik.Util = function (formater) { +euphorik.Util = function (formatter) { $("#info .close").click(function() { $("#info").slideUp(50); }); $("body").append('
').append('

'); - this.formater = formater; + this.formatter = formatter; this.bulleActive = true; }; @@ -43,7 +43,7 @@ euphorik.Util.messageType = {informatif: 0, question: 1, erreur: 2}; * @message [String] The message. * @type [euphorik.Util.messageType] The message type like 'information' or 'error'. Default is messageType.informatif. * @buttons An object where the properties are the labels and the values are functions which will be executed when a button is clicked. - * @format [bool] The message should be formated. (see 'formater.js') + * @format [bool] The message should be formated. (see 'formatter.js') * @time The time while the message is displayed. -1 for infinity. */ euphorik.Util.prototype.messageDialog = function(message, type, buttons, format, time) { @@ -59,7 +59,7 @@ euphorik.Util.prototype.messageDialog = function(message, type, buttons, format, var close = function() { $("#info").slideUp(100); }; close(); - $("#info .message").html(!thisUtil.formater || !format ? message : thisUtil.formater.completeProcessing(message)); + $("#info .message").html(!thisUtil.formatter || !format ? message : thisUtil.formatter.completeProcessing(message)); switch(type) { case euphorik.Util.messageType.informatif : $("#info #icone").attr("class", "information"); break; diff --git a/modules/erl/euphorik_bd.erl b/modules/erl/euphorik_bd.erl index aabf365..6b10f4b 100755 --- a/modules/erl/euphorik_bd.erl +++ b/modules/erl/euphorik_bd.erl @@ -19,10 +19,10 @@ % Ce module permet de gérer les données persistantes lié au site d'euphorik.ch. % Il permet d'ajouter des message, de demande les messages sur une page donnée, etc.. % Ce module utilise une base mnesia. -% @author G.Burri -module(euphorik_bd). +-author("Greg Burri "). -export([ % texte : get_texte/1, Reading git-diff-tree failed