total5 0.0.7-1 → 0.0.7-2

package/builders.js

@@ -75,6 +75,10 @@ Options.prototype = {
 		return this.controller ? this.controller.ip : null;
 	},
 
+	get address() {
+		return this.controller ? this.controller.address : null;
+	},
+
 	get files() {
 		return this.controller ? this.controller.files : null;
 	},
@@ -1457,6 +1461,11 @@ ActionCaller.prototype.error = function(value) {
 	return this;
 };
 
+ActionCaller.prototype.ctrl = function(ctrl) {
+	this.controller = ctrl ? (ctrl.controller || ctrl) : null;
+	return this;
+};
+
 ActionCaller.prototype.done = function($, fn) {
 	this.options.callback = function(err, response) {
 		if (err)

package/changelog.txt

@@ -3,6 +3,12 @@
 ========================
 
 - improved user-agent parser (added support for new headers `Sec-CH-UA`)
+- improved `Number.pluralize()` method
+- reduced DNS cache flush time to 3 minutes
+- added `$.address` property with the absolute URL address
+- added `$.ctrl(ctrl_instance)` method
+- extended `Mail.from(email, [name])` method by adding `name` argument by [Marek Mráz](https://github.com/Mrazbb)
+- added `CONF.mail_from_name {String}` option
 
 ========================
 0.0.6

package/controller.js

@@ -42,7 +42,7 @@ function Controller(req, res) {
 	ctrl.url = ctrl.uri.pathname;
 	ctrl.released = false;
 	ctrl.downloaded = false;
-	ctrl.protocol = req.connection.encrypted || (req.headers['x-forwarded-protocol'] || req.headers['x-forwarded-proto']) === 'https' ? 'https' : 'http';
+	ctrl.protocol = req.connection.encrypted || req.headers['x-forwarded-ssl'] === 'on' || req.headers['x-forwarded-port'] === '443' || (req.headers['x-forwarded-proto'] || req.headers['x-forwarded-protocol']) === 'https' ? 'https' : 'http';
 
 	for (let path of ctrl.split)
 		ctrl.split2.push(path.toLowerCase());
@@ -159,6 +159,10 @@ Controller.prototype = {
 
 	get host() {
 		return this.headers.host;
+	},
+
+	get address() {
+		return (this.protocol + '://' + this.headers?.host || '') + (this.req?.url || '');
 	}
 
 };

package/index.js

@@ -460,7 +460,7 @@ function unlink(arr, callback) {
 		} else
 			msg.to(email);
 
-		msg.from(F.config.mail_from || F.config.smtp.from || F.config.smtp.user);
+		msg.from(F.config.mail_from || F.config.smtp.from || F.config.smtp.user, F.config.mail_from_name || F.config.smtp.name);
 		callback && msg.callback(callback);
 
 		if (reply)
@@ -1724,7 +1724,7 @@ F.service = function(count) {
 	if (count % F.config.$tmsclearblocked === 0)
 		F.temporary.tmsblocked = {};
 
-	if (count % 30 === 0)
+	if (count % 3 === 0)
 		F.temporary.dnscache = {};
 
 	let blocked = F.temporary.blocked;

package/mail.js

@@ -60,8 +60,9 @@ Message.prototype.callback = function(fn) {
 	return this;
 };
 
-Message.prototype.sender = Message.prototype.from = function(email) {
+Message.prototype.sender = Message.prototype.from = function(email, name) {
 	this.email_from = email;
+	this.email_from_name = name;
 	return this;
 };
 
@@ -571,7 +572,7 @@ Mailer.$writemessage = function(obj, buffer) {
 	self.$priority && message.push('X-Priority: ' + self.$priority);
 	self.$confidential && message.push('Sensitivity: Company-Confidential');
 
-	message.push('From: <' + msg.email_from + '>');
+	message.push('From: ' + (msg.email_from_name ? (unicode_encode(msg.email_from_name) + ' <' + msg.email_from + '>') : msg.email_from));
 
 	if (msg.headers) {
 		for (let key in msg.headers)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.7-1",
+  "version": "0.0.7-2",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {

package/utils.js

@@ -4319,13 +4319,7 @@ NP.pluralize = function(zero, one, few, other) {
 	else
 		value = other;
 
-	var beg = value.indexOf('#');
-	if (beg === -1)
-		return value;
-
-	var end = value.lastIndexOf('#');
-	var format = value.substring(beg, end + 1);
-	return num.format(format) + value.replace(format, '');
+	return value.replace('#', num.toString());
 };
 
 NP.VAT = NP.TAX = function(percentage, decimals, includedVAT) {