Changeset 11718

Timestamp:

12/26/22 18:27:29 (5 months ago)

Author:

bust3d

Message:

Picon fix for Reader-Page -> ​https://board.streamboard.tv/forum/thread/48158-keine-protokoll-picons-mehr-auf-der-reader-seite/

Location:

trunk

Files:

• module-webif.c (modified) (4 diffs)
• webif/api.xml/readers_readerlist.xml (modified) (1 diff)
• webif/include/jscript.js (modified) (1 diff)
• webif/readers/readerctypbit.html (modified) (1 diff)
• webif/readers/readerctypnoicon.html (modified) (1 diff)

trunk/module-webif.c

@@ -56 +56 @@
 CS_MUTEX_LOCK *lock_cs;
 
-static void webif_add_client_proto(struct templatevars *vars, struct s_client *cl, const char *proto, int8_t apicall);
-
 static uint8_t useLocal = 1;
 #define PRINTF_LOCAL_D useLocal ? "%'d" : "%d"
@@ -2045 +2043 @@
             {
                 connected_readers += 1;
-                webif_add_client_proto(vars, rdr->client, client_get_proto(rdr->client), apicall);
-                tpl_addVar(vars, TPLADDONCE, "CLIENTPROTOSORT", reader_get_type_desc(rdr, 0));
 
 #ifdef CS_CACHEEX_AIO
                 if(rdr->cacheex.feature_bitfield)
                 {
+                    tpl_addVar(vars, TPLADD, "CLIENTPROTOSORT", (const char*)new_proto);
+                    tpl_addVar(vars, TPLADD, "CLIENTPROTO", (const char*)new_proto);
+
                     if(rdr->cacheex.feature_bitfield & 32)
                         tpl_addVar(vars, TPLADD, "CLIENTPROTOTITLE", rdr->cacheex.aio_version);
@@ -2056 +2055 @@
                         tpl_addVar(vars, TPLADD, "CLIENTPROTOTITLE", "[cx-aio < 9.2.3]");
                 }
-#endif
-
+                else
+                {
+                    tpl_addVar(vars, TPLADD, "CLIENTPROTOSORT", proto);
+                    tpl_addVar(vars, TPLADD, "CLIENTPROTO", proto);
+                }
+#else
+                tpl_addVar(vars, TPLADD, "CLIENTPROTO", reader_get_type_desc(rdr, 0));
+                tpl_addVar(vars, TPLADD, "CLIENTPROTOSORT", reader_get_type_desc(rdr, 0));
+#endif
                 switch(rdr->card_status)
                 {
@@ -2112 +2118 @@
                     }
 
-                    tpl_addVar(vars, TPLADDONCE, "CLIENTPROTO", reader_get_type_desc(rdr, 0));
-                    tpl_addVar(vars, TPLADDONCE, "CLIENTPROTOSORT", reader_get_type_desc(rdr, 0));
+                    tpl_addVar(vars, TPLADD, "CLIENTPROTO", reader_get_type_desc(rdr, 0));
+                    tpl_addVar(vars, TPLADD, "CLIENTPROTOSORT", reader_get_type_desc(rdr, 0));
                 }
             }

trunk/webif/api.xml/readers_readerlist.xml

@@ -1 @@
-        <reader label="##READERNAME##" protocol="##CTYP##" type="##APIREADERTYPE##" enabled="##APIREADERENABLED##"></reader>
+        <reader label="##READERNAME##" protocol="##CLIENTPROTO##" type="##APIREADERTYPE##" enabled="##APIREADERENABLED##"></reader>

trunk/webif/include/jscript.js

@@ -835 +835 @@
             $(uid + " td.readercol9").text(item.stats.emmwritten);
         }
-        if (!is_nopoll('readercol2')) {
-            if (data.oscam.piconenabled == "1" && item.protoicon) {
-                $(uid + " > td.readercol2").append('<img class="protoicon" title="Protocol ' + item.protocol + ' ' +
-                     item.protocolext + '" alt="IC_' + item.protoicon + '" src="image?i=IC_' + item.protoicon + '"></img>');
-            } else {
-                $(uid + " > td.readercol2").attr('title', item.protocolext).text(item.protocol);
-            }
-        }
         if (!is_nopoll('readercol20')) {
-            $(uid + " > td.readercol20").html( item.status + "<BR>" + item.ip);
+            $(uid + " td.readercol20").html( item.status + "<BR>" + item.ip);
         }
         if (!is_nopoll('readercol10')) {

trunk/webif/readers/readerctypbit.html

@@ -1 @@
-<IMG CLASS="protoicon" SRC="image?i=IC_##CTYP##" TITLE="Protocol: ##CTYP## [##CLIENTPROTOTITLE##]" ALT="">
+<IMG CLASS="protoicon" SRC="image?i=IC_##CLIENTPROTO##" TITLE="Protocol: ##CLIENTPROTO## [##CLIENTPROTOTITLE##]" ALT="">

trunk/webif/readers/readerctypnoicon.html

@@ -1 @@
-<SPAN TITLE="Protocol: ##CTYP## [##CLIENTPROTOTITLE##]&#013;missing icon: IC_##CTYP##.tpl">##CTYP##</SPAN>
+<SPAN TITLE="Protocol: ##CLIENTPROTO## [##CLIENTPROTOTITLE##]&#013;missing icon: IC_##CLIENTPROTO##.tpl">##CLIENTPROTO##</SPAN>