Browse Source

fix config missing key

master
pvincent 3 years ago
parent
commit
98dffaebed
  1. 7
      README.md
  2. 2
      src/controller/Contract.hx
  3. 71
      src/controller/admin/Admin.hx

7
README.md

@ -28,11 +28,6 @@ curl -L https://deb.nodesource.com/setup_8.x | bash -
apt install -y nodejs=8.17.0-1nodesource1 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 apt install -y sudo haxe apache2 make git imagemagick gettext libapache2-mod-neko mariadb-server sendemail libio-socket-ssl-perl libnet-ssleay-perl
mysql -u root <<EOF
CREATE DATABASE cagettepei;
GRANT ALL ON cagettepei.* TO 'cagettepei'@'%' IDENTIFIED BY 'cagettepei';
EOF
cd /var/www cd /var/www
git clone https://git.artcode.re/cagetters/cagettepei.git git clone https://git.artcode.re/cagetters/cagettepei.git
cd cagettepei cd cagettepei
@ -91,7 +86,7 @@ go to http://localhost for ERROR + table regeneration, then
``` ```
cd /var/www/cagettepei cd /var/www/cagettepei
SECRET=$(grep key= config.xml | cut -d= -f2 | cut -d'"' -f2)
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 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
``` ```

2
src/controller/Contract.hx

@ -30,7 +30,7 @@ class Contract extends Controller {
@tpl("contract/default.mtt") @tpl("contract/default.mtt")
function doDefault() { 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").split(";");
var langs = App.config.get("langs", "fr").split(";");
var langNames = App.config.get("langnames", "Français").split(";"); var langNames = App.config.get("langnames", "Français").split(";");
var i = 0; var i = 0;
var langLinks = ""; var langLinks = "";

71
src/controller/admin/Admin.hx

@ -1,9 +1,9 @@
package controller.admin; package controller.admin;
import haxe.web.Dispatch; import haxe.web.Dispatch;
import Common; import Common;
class Admin extends Controller { class Admin extends Controller {
public function new() { public function new() {
super(); super();
view.category = 'admin'; view.category = 'admin';
@ -13,7 +13,6 @@ class Admin extends Controller {
var e = Nav(nav, "admin"); var e = Nav(nav, "admin");
app.event(e); app.event(e);
view.nav = e.getParameters()[0]; view.nav = e.getParameters()[0];
} }
@tpl("admin/default.mtt") @tpl("admin/default.mtt")
@ -30,24 +29,18 @@ class Admin extends Controller {
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; view.num = count;
} }
@tpl("form.mtt") @tpl("form.mtt")
function doSmtp() { function doSmtp() {
var f = new sugoi.form.Form("emails"); var f = new sugoi.form.Form("emails");
var data = [
{label:"SMTP",value:"smtp"},
{label:"Mandrill API",value:"mandrill"},
];
var data = [{label: "SMTP", value: "smtp"}, {label: "Mandrill API", value: "mandrill"},];
var mailer = sugoi.db.Variable.get("mailer") == null ? "smtp" : sugoi.db.Variable.get("mailer"); var mailer = sugoi.db.Variable.get("mailer") == null ? "smtp" : sugoi.db.Variable.get("mailer");
var host = sugoi.db.Variable.get("smtp_host")==null ? App.config.get("smtp_host") : sugoi.db.Variable.get("smtp_host");
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");
var pass = sugoi.db.Variable.get("smtp_pass")==null ? App.config.get("smtp_pass") : sugoi.db.Variable.get("smtp_pass");
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 user = sugoi.db.Variable.get("smtp_user") == null ? "" : sugoi.db.Variable.get("smtp_user");
var pass = sugoi.db.Variable.get("smtp_pass") == null ? "" : sugoi.db.Variable.get("smtp_pass");
f.addElement(new sugoi.form.elements.StringSelect("mailer", "Mailer", data, mailer)); 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_host", "host", host));
@ -55,13 +48,11 @@ class Admin extends Controller {
f.addElement(new sugoi.form.elements.StringInput("smtp_user", "user", user)); f.addElement(new sugoi.form.elements.StringInput("smtp_user", "user", user));
f.addElement(new sugoi.form.elements.StringInput("smtp_pass", "pass", pass)); 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)); 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.title = t._("Email service configuration");
@ -72,12 +63,9 @@ class Admin extends Controller {
d.dispatch(new controller.admin.Plugins()); d.dispatch(new controller.admin.Plugins());
} }
@tpl("admin/taxo.mtt") @tpl("admin/taxo.mtt")
function doTaxo() { function doTaxo() {
view.categ = db.TxpCategory.manager.all(); view.categ = db.TxpCategory.manager.all();
} }
/** /**
@ -91,31 +79,31 @@ class Admin extends Controller {
view.like = args.like != null ? args.like : ""; view.like = args.like != null ? args.like : "";
var sql = ""; var sql = "";
if( args.user!=null ) sql += " AND uid="+args.user;
if (args.user != null)
sql += " AND uid=" + args.user;
// if( args.like!=null && args.like != "" ) sql += " AND error like "+sys.db.Manager.cnx.quote("%"+args.like+"%"); // if( args.like!=null && args.like != "" ) sql += " AND error like "+sys.db.Manager.cnx.quote("%"+args.like+"%");
if (args.empty) { if (args.empty) {
sys.db.Manager.cnx.request("truncate table Error"); 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.errorsStats = errorsStats;
view.browser = new sugoi.tools.ResultsBrowser(
sugoi.db.Error.manager.unsafeCount("SELECT count(*) FROM Error WHERE 1 "+sql),
20,
function(start, limit) { return sugoi.db.Error.manager.unsafeObjects("SELECT * FROM Error WHERE 1 "+sql+" ORDER BY date DESC LIMIT "+start+","+limit,false); }
);
view.browser = new sugoi.tools.ResultsBrowser(sugoi.db.Error.manager.unsafeCount("SELECT count(*) FROM Error WHERE 1 " + sql), 20,
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") @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 from = new Date(year, month, 1, 0, 0, 0);
var to = new Date(year, month + 1, 0, 23, 59, 59); var to = new Date(year, month + 1, 0, 23, 59, 59);
if (app.params.exists("recompute")) { if (app.params.exists("recompute")) {
switch (key) { switch (key) {
case "basket": case "basket":
for (d in 1...to.getDate()) { for (d in 1...to.getDate()) {
@ -124,12 +112,8 @@ class Admin extends Controller {
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); // trace(value,_from,g);
} }
} }
} }
var data = db.Graph.getRange(key, from, to); var data = db.Graph.getRange(key, from, to);
@ -140,18 +124,14 @@ class Admin extends Controller {
var averageValue = 0.0; var averageValue = 0.0;
var total = 0.0; var total = 0.0;
for( d in data) total += d.value;
for (d in data)
total += d.value;
averageValue = total / data.length; averageValue = total / data.length;
view.total = total; view.total = total;
view.averageValue = averageValue; view.averageValue = averageValue;
} }
function doFixDistribValidation() { function doFixDistribValidation() {
Sys.println("===== Liste des distributions ayant été re-validées ====<br>"); Sys.println("===== Liste des distributions ayant été re-validées ====<br>");
// Get the current group // Get the current group
@ -161,18 +141,14 @@ class Admin extends Controller {
// 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); service.PaymentService.validateDistribution(distrib);
Sys.println(distrib.toString() + "<br>"); Sys.println(distrib.toString() + "<br>");
} }
Sys.println("===== Fin de la liste ===="); Sys.println("===== Fin de la liste ====");
} }
function doCheckDistribValidation() { function doCheckDistribValidation() {
Sys.println("===== Liste des distributions validées ayant des opérations/paiements non validés ====<br>"); Sys.println("===== Liste des distributions validées ayant des opérations/paiements non validés ====<br>");
// Get the current group // Get the current group
@ -182,11 +158,10 @@ class Admin extends Controller {
// 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); 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) { if (!order.paid) {
@ -197,27 +172,21 @@ class Admin extends Controller {
var operation = basket.getOrderOperation(false); var operation = basket.getOrderOperation(false);
if (operation != null) { if (operation != null) {
if (operation.pending) { if (operation.pending) {
Sys.println(distrib.toString() + "<br>"); Sys.println(distrib.toString() + "<br>");
Sys.println(operation.toString() + "<br>"); Sys.println(operation.toString() + "<br>");
} }
for (payment in basket.getPayments()) { for (payment in basket.getPayments()) {
if (payment.pending) { if (payment.pending) {
Sys.println(distrib.toString() + "<br>"); Sys.println(distrib.toString() + "<br>");
Sys.println(payment.toString() + "<br>"); Sys.println(payment.toString() + "<br>");
} }
} }
} }
} }
} }
Sys.println("===== Fin de la liste ===="); Sys.println("===== Fin de la liste ====");
} }
} }
Loading…
Cancel
Save