Changeset 1029

Timestamp:

01/02/10 11:01:11 (12 years ago)

Author:

alno

Message:

WebIF: fixed compiler warnings if CS_RDR_INIT_HIST is not set

File:

• branches/monitor-improvement/oscam-http.c (modified) (8 diffs)

branches/monitor-improvement/oscam-http.c

@@ -106 +106 @@
     tpl_printf(vars, 0, "PASSIVE", "%d",  cfg->c33_passive);
 
-    for (i = 0; i < sizeof(cfg->c33_key); ++i) tpl_printf(vars, 1, "KEY", "%02X",cfg->c33_key[i]);      
+    for (i = 0; i < sizeof(cfg->c33_key); ++i) tpl_printf(vars, 1, "KEY", "%02X",cfg->c33_key[i]);
       struct s_ip *cip;
       char *dot="";
@@ -149 +149 @@
         tpl_addVar(vars, 1, "MESSAGE", "<BR><BR><B>Configuration newcamd *DONE*</B><BR><BR>");
         refresh_oscam(REFR_SERVER);
-    } 
+    }
         int j;
         char *dot1, *dot2;
@@ -185 +185 @@
         tpl_addVar(vars, 1, "MESSAGE", "<BR><BR><B>Configuration Radegast *DONE*</B><BR><BR>");
         refresh_oscam(REFR_SERVER);
-    }   
+    }
     tpl_printf(vars, 0, "PORT", "%d", cfg->rad_port);
     tpl_addVar(vars, 0, "SERVERIP", inet_ntoa(*(struct in_addr *)&cfg->rad_srvip));
@@ -265 +265 @@
     tpl_addVar(vars, 0, "HTTPCSS", cfg->http_css);
     tpl_printf(vars, 0, "HTTPREFRESH", "%d", cfg->http_refresh);
-    tpl_addVar(vars, 0, "HTTPTPL", cfg->http_tpl);  
+    tpl_addVar(vars, 0, "HTTPTPL", cfg->http_tpl);
 
       struct s_ip *cip;
@@ -278 +278 @@
     tpl_printf(vars, 0, "TMP", "MONSELECTED%d", cfg->mon_level);
     tpl_addVar(vars, 0, tpl_getVar(vars, "TMP"), "selected");
-    
+
     fputs(tpl_getTpl(vars, "CONFIGMONITOR"), f);
 }
@@ -667 +667 @@
 void send_oscam_entitlement(struct templatevars *vars, FILE *f, struct uriparams *params) {
   /* build entitlements from reader init history */
+#ifdef CS_RDR_INIT_HIST
     int ridx;
     char *p;
     char *reader_ = getParam(params, "reader");
     if(strlen(reader_) > 0){
-#ifdef CS_RDR_INIT_HIST
         for (ridx=0; ridx<CS_MAXREADER && strcmp(reader_, reader[ridx].label) != 0; ridx++);
         if(ridx<CS_MAXREADER){
@@ -678 +678 @@
             }
         }
+        tpl_addVar(vars, 0, "READERNAME", reader_);
 #else
         tpl_addVar(vars, 0, "LOGHISTORY", "The flag CS_RDR_INIT_HIST is not set in your binary<BR>\n");
 #endif
-        tpl_addVar(vars, 0, "READERNAME", reader_);
     }
     fputs(tpl_getTpl(vars, "ENTITLEMENTS"), f);
@@ -730 +730 @@
             tpl_printf(vars, 0, "CLIENTIDLESECS", "%d", isec);
             tpl_printf(vars, 0, "CLIENTCON", "%d", con);
-                tpl_printf(vars, 0, "CWOK", "%d", client[i].cwfound);
-                tpl_printf(vars, 0, "CWNOK", "%d", client[i].cwnot);
+            tpl_printf(vars, 0, "CWOK", "%d", client[i].cwfound);
+            tpl_printf(vars, 0, "CWNOK", "%d", client[i].cwnot);
             tpl_addVar(vars, 1, "CLIENTSTATUS", tpl_getTpl(vars, "CLIENTSTATUSBIT"));
         }