From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 23 Jun 2018 15:00:53 +0000 (+0100)
Subject: [Minor] Show transparency and tag name in HTML blocks
X-Git-Tag: 1.7.7~47
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8bf359e9f41aff57695967c6ae8ac623e5ac941e;p=rspamd.git

[Minor] Show transparency and tag name in HTML blocks
---

diff --git a/src/lua/lua_html.c b/src/lua/lua_html.c
index 8d75bfa67..3734e37ff 100644
--- a/src/lua/lua_html.c
+++ b/src/lua/lua_html.c
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <src/libserver/html.h>
 #include "lua_common.h"
 #include "message.h"
 #include "html.h"
@@ -317,38 +318,39 @@ static void
 lua_html_push_block (lua_State *L, struct html_block *bl)
 {
 	struct rspamd_lua_text *t;
-	struct html_tag **ptag;
 
 	lua_createtable (L, 0, 6);
 
 	if (bl->tag) {
 		lua_pushstring (L, "tag");
-		ptag = lua_newuserdata (L, sizeof (gpointer));
-		*ptag = bl->tag;
-		rspamd_lua_setclass (L, "rspamd{html_tag}", -1);
+		lua_pushlstring (L, bl->tag->name.start, bl->tag->name.len);
 		lua_settable (L, -3);
 	}
 
 	if (bl->font_color.valid) {
 		lua_pushstring (L, "color");
-		lua_newtable (L);
+		lua_createtable (L, 4, 0);
 		lua_pushnumber (L, bl->font_color.d.comp.r);
 		lua_rawseti (L, -2, 1);
 		lua_pushnumber (L, bl->font_color.d.comp.g);
 		lua_rawseti (L, -2, 2);
 		lua_pushnumber (L, bl->font_color.d.comp.b);
 		lua_rawseti (L, -2, 3);
+		lua_pushnumber (L, bl->font_color.d.comp.alpha);
+		lua_rawseti (L, -2, 4);
 		lua_settable (L, -3);
 	}
 	if (bl->background_color.valid) {
 		lua_pushstring (L, "bgcolor");
-		lua_newtable (L);
+		lua_createtable (L, 4, 0);
 		lua_pushnumber (L, bl->background_color.d.comp.r);
 		lua_rawseti (L, -2, 1);
 		lua_pushnumber (L, bl->background_color.d.comp.g);
 		lua_rawseti (L, -2, 2);
 		lua_pushnumber (L, bl->background_color.d.comp.b);
 		lua_rawseti (L, -2, 3);
+		lua_pushnumber (L, bl->background_color.d.comp.alpha);
+		lua_rawseti (L, -2, 4);
 		lua_settable (L, -3);
 	}