git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@158 251d49ef-1d17-4917-a970-b30cf55b089b

diff --git a/prometheus.c b/prometheus.c
index 561e2bde85664d5afeb6bd525ac64a0af66a65f8..ed4661d46bbcefb8ebc6121c65c6223e641fed50 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -864,7 +864,7 @@ void parse_ip_log(int argc, char **argv)
     {\r
      fputs("-------",f);\r
     }    \r
-    fprintf(f, "<td align=\"right\">%ld M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",\r
+    fprintf(f, "<td align=\"right\">%ld&nbsp;M</td><th align=\"right\">%ld G</th><td align=\"right\">%ld kbps</th></tr>\n",\r
                iplog->traffic, iplog->traffic>>10, iplog->guaranted);\r
     total+=iplog->traffic>>10;\r
     iplog->i=i;\r
@@ -1536,14 +1536,14 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 #ifdef DEBUG\r
    printf("%d k group: %d bandwidth requested: %d k\n",group->min,group->count,group->desired);\r
 #endif\r
-   fprintf(f,"<tr><td align=\"right\">%d</td><td align=\"right\">%d k</td>",\r
+   fprintf(f,"<tr><td align=\"right\">%d</td><td align=\"right\">%d&nbsp;k</td>",\r
              count, group->min);\r
-   fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d k</td>",\r
+   fprintf(f,"<td align=\"right\">%d</td><td align=\"right\">%d&nbsp;k</td>",\r
              group->count, group->desired);\r
 \r
    for_each(keyword, keywords)\r
    {\r
-    fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%d M</span></td>",\r
+    fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%d&nbsp;M</span></td>",\r
               keyword->html_color, group->min*keyword->data_limit);\r
    }   \r
    i += group->desired; \r
@@ -1668,20 +1668,20 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }\r
     fputs("</td>\n",f);\r
    }\r
-   fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->credit);\r
-   fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%Lu M</span></td>",\r
+   fprintf(f,"<td align=\"right\">%Lu&nbsp;M</td>\n", ip->credit);\r
+   fprintf(f,"<td align=\"right\"><span style=\"color:#%s\">%Lu&nbsp;M</span></td>",\r
              ip->keyword->html_color,\r
              ip->credit+(ip->min*ip->keyword->data_limit+(ip->keyword->fixed_limit<<20)));\r
-   fprintf(f,"<td align=\"right\">%s%Lu M%s", f1, ip->traffic, f2);\r
+   fprintf(f,"<td align=\"right\">%s%Lu&nbsp;M%s", f1, ip->traffic, f2);\r
 \r
    /* download --------------------------------------- */\r
-   fprintf(f,"</td><td align=\"right\">%Lu M", ip->direct);\r
+   fprintf(f,"</td><td align=\"right\">%Lu&nbsp;M", ip->direct);\r
    if(use_jquery_popups)\r
    {\r
      fprintf(f,"<span id=\"download_%d\" style=\"display:none\">",i);\r
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))\r
      {\r
-      fprintf(f,"<br />%Lu M", sharedip->direct);\r
+      fprintf(f,"<br />%Lu&nbsp;M", sharedip->direct);\r
      }\r
      fputs("</span>\n",f);\r
    }\r
@@ -1690,23 +1690,23 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
    if(qos_proxy)\r
    {\r
-    fprintf(f,"<td align=\"right\">%Lu M</td>\n", ip->proxy);\r
+    fprintf(f,"<td align=\"right\">%Lu&nbsp;M</td>\n", ip->proxy);\r
    }\r
    /* upload ---------------------------------------- */\r
-   fprintf(f,"<td align=\"right\">%Lu M", ip->upload);\r
+   fprintf(f,"<td align=\"right\">%Lu&nbsp;M", ip->upload);\r
    if(use_jquery_popups)\r
    {\r
      fprintf(f,"<span id=\"upload_%d\" style=\"display:none\">",i);\r
      for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))\r
      {\r
-      fprintf(f,"<br />%Lu M", sharedip->upload);\r
+      fprintf(f,"<br />%Lu&nbsp;M", sharedip->upload);\r
      }\r
      fputs("</span>\n",f);\r
    }\r
    fputs("</td>\n",f);\r
    /* ----------------------------------------------- */\r
 \r
-   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",\r
+   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",\r
              ip->min,ip->desired,f1,ip->max,f2,f1,ip->prio,f2);\r
 \r
    total_traffic+=ip->traffic;\r
@@ -1737,12 +1737,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    }\r
   }\r
   fprintf(f,"<tr><th colspan=\"%d\" align=\"left\">%d CLASSES</th>", colspan-7, i);\r
-  fprintf(f,"<th align=\"right\">%Lu M</th><th align=\"right\">%Lu M</th>\n", total_traffic, total_direct);\r
+  fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th><th align=\"right\">%Lu&nbsp;M</th>\n", total_traffic, total_direct);\r
   if(qos_proxy)\r
   {\r
-   fprintf(f,"<th align=\"right\">%Lu M</th>\n", total_proxy);\r
+   fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th>\n", total_proxy);\r
   }\r
-  fprintf(f,"<th align=\"right\">%Lu M</th>", total_upload);\r
+  fprintf(f,"<th align=\"right\">%Lu&nbsp;M</th>", total_upload);\r
   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);\r
 \r
   if(active_classes>10)\r