X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=6d8e04917dd03aa7a25ece9797a7b2795de96843;hb=8bcc3268a0cc33db425eabc6eef142fe73a82b5b;hp=561e2bde85664d5afeb6bd525ac64a0af66a65f8;hpb=6cc38f967cc2361d731be391b12a22862e708aaf;p=svn%2FPrometheus-QoS%2F.git

diff --git a/prometheus.c b/prometheus.c
index 561e2bd..6d8e049 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -59,7 +59,7 @@ char            *html = "/var/www/traffic.html"; /* hall of fame filename */
 char         *preview = "/var/www/preview.html"; /* hall of fame preview */
 char          *cmdlog = "/var/log/prometheuslog"; /* command log filename */
 char         *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */
-char         *log_url = "logs/"; /* log directory relative URI prefix (partial URL) */
+char         *log_url = "/logs/"; /* log directory relative URI prefix (partial URL) */
 char    *html_log_dir = "/var/www/logs/html/";
 
 char      *jquery_url = "http://code.jquery.com/jquery-latest.js";
@@ -853,8 +853,8 @@ void parse_ip_log(int argc, char **argv)
   {
    if(iplog->traffic)
    {
-    fprintf(f, "<tr><td align=\"right\">%d</td><th align=\"left\">%s</td><td align=\"right\">", 
-               i++, iplog->name); 
+    fprintf(f, "<tr><td align=\"right\">%d</td><td align=\"left\"><a href=\"%s%s.log\">%s</td></td><td align=\"right\">", 
+               i++, log_url, iplog->name, iplog->name);  
     if(iplog->lmsid > 0)
     {
      /*base URL will be configurable soon ... */
@@ -864,7 +864,7 @@ void parse_ip_log(int argc, char **argv)
     {
      fputs("-------",f);
     }    
-    fprintf(f, "<td align=\"right\">%ld M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",
+    fprintf(f, "<td align=\"right\">%ld&nbsp;M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",
                iplog->traffic, iplog->traffic>>10, iplog->guaranted);
     total+=iplog->traffic>>10;
     iplog->i=i;
@@ -1536,14 +1536,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 #ifdef DEBUG
    printf("%d k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired);
 #endif
-   fprintf(f,"<tr><td align=\"right\">%d</td><td align=\"right\">%d k</td>",
+   fprintf(f,"<tr><td align=\"right\">%d</td><td align=\"right\">%d&nbsp;k</td>",
              count, group->min);
-   fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d k</td>",
+   fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d&nbsp;k</td>",
              group->count, group->desired);
 
    for_each(keyword, keywords)
    {
-    fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%d M</span></td>",
+    fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%d&nbsp;M</span></td>",
               keyword->html_color, group->min*keyword->data_limit);
    }   
    i += group->desired; 
@@ -1668,20 +1668,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }
     fputs("</td>\n",f);
    }
-   fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->credit);
-   fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%Lu M</span></td>",
+   fprintf(f,"<td align=\"right\">%Lu&nbsp;M</td>\n", ip->credit);
+   fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%Lu&nbsp;M</span></td>",
              ip->keyword->html_color,
              ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));
-   fprintf(f,"<td align=\"right\">%s%Lu M%s", f1, ip->traffic, f2);
+   fprintf(f,"<td align=\"right\">%s%Lu&nbsp;M%s", f1, ip->traffic, f2);
 
    /* download --------------------------------------- */
-   fprintf(f,"</td><td align=\"right\">%Lu M", ip->direct);
+   fprintf(f,"</td><td align=\"right\">%Lu&nbsp;M", ip->direct);
    if(use_jquery_popups)
    {
      fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))
      {
-      fprintf(f,"<br />%Lu M", sharedip->direct);
+      fprintf(f,"<br />%Lu&nbsp;M", sharedip->direct);
      }
      fputs("</span>\n",f);
    }
@@ -1690,23 +1690,23 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 
    if(qos_proxy)
    {
-    fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->proxy);
+    fprintf(f,"<td align=\"right\">%Lu&nbsp;M</td>\n", ip->proxy);
    }
    /* upload ---------------------------------------- */
-   fprintf(f,"<td align=\"right\">%Lu M", ip->upload);
+   fprintf(f,"<td align=\"right\">%Lu&nbsp;M", ip->upload);
    if(use_jquery_popups)
    {
      fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);
      for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))
      {
-      fprintf(f,"<br />%Lu M", sharedip->upload);
+      fprintf(f,"<br />%Lu&nbsp;M", sharedip->upload);
      }
      fputs("</span>\n",f);
    }
    fputs("</td>\n",f);
    /* ----------------------------------------------- */
 
-   fprintf(f,"<td align=\"right\">%d k</td><td align=\"right\">%d k</td><td align=\"right\">%s%d k%s</td><td>%s%d%s</td></tr>\n",
+   fprintf(f,"<td align=\"right\">%d&nbsp;k</td><td align=\"right\">%d&nbsp;k</td><td align=\"right\">%s%d&nbsp;k%s</td><td>%s%d%s</td></tr>\n",
              ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2);
 
    total_traffic+=ip->traffic;
@@ -1737,12 +1737,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    }
   }
   fprintf(f,"<tr><th colspan=\"%d\" align=\"left\">%d CLASSES</th>", colspan-7, i);
-  fprintf(f,"<th align=\"right\">%Lu M</th><th align=\"right\">%Lu M</th>\n", total_traffic, total_direct);
+  fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th><th align=\"right\">%Lu&nbsp;M</th>\n", total_traffic, total_direct);
   if(qos_proxy)
   {
-   fprintf(f,"<th align=\"right\">%Lu M</th>\n", total_proxy);
+   fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th>\n", total_proxy);
   }
-  fprintf(f,"<th align=\"right\">%Lu M</th>", total_upload);
+  fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th>", total_upload);
   fprintf(f,"<th colspan=\"4\"><span style=\"color:red\">FUP-LIMIT %dx</span> <span style=\"color:brown\">LOW-PRIO %dx</span></th></tr>\n</table>\n",limit_count,prio_count);
 
   if(active_classes>10)