X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=f12de1530e477e15cf1fbf45689f2f31aa56f352;hb=4f4d182088d6b40224a5475f284a9c756ae604a1;hp=59e2759d421023f2219a156c6993a5f1619cd215;hpb=be96b71b6e1c6b1166173ec615e799960a38a909;p=svn%2FPrometheus-QoS%2F.git

diff --git a/prometheus.c b/prometheus.c
index 59e2759..f12de15 100644
--- a/prometheus.c
+++ b/prometheus.c
@@ -40,7 +40,7 @@ const char *version = "0.8.3-d";
 /* C source code development versions ("beta"): 0.7.9-a, 0.8.1-b, etc. */
 /* C source code release versions: 0.8.0, 0.8.2, 0.8.4, etc. */
 
-const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2012 Michael Polak, <a href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2012 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
 
 /* ======= All path names are defined here (for RPM patch) =======  */
 
@@ -656,8 +656,7 @@ void get_traffic_statistics(void)
      }
     }  
   }
-
- free(cmd);
+  free(cmd);
 }
  
 /* ========== This function executes, logs OR ALSO prints command ========== */
@@ -689,7 +688,7 @@ void run_restore(void)
  string(restor,STRLEN);
 
  /*-----------------------------------------------------------------*/
- printf("Running %s <%s ...\n",iptablesrestore,iptablesfile);
+ printf("Running %s <%s ...\n", iptablesrestore, iptablesfile);
  /*-----------------------------------------------------------------*/
  
  save_line("COMMIT");
@@ -918,13 +917,13 @@ void parse_ip_log(int argc, char **argv)
    if(iplog->traffic)
    {
     fprintf(f, "%s<td style=\"text-align: right\">%d</td>\n\
-<td style=\"text-align: left\"><a class=\"blue\" href=\"%s%s.log\">%s</td>\n\
+<td style=\"text-align: left\"><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</td>\n\
 <td style=\"text-align: right\">", 
                tr_odd_even(), i++, log_url, iplog->name, iplog->name);  
     if(iplog->lmsid > 0)
     {
      /*base URL will be configurable soon ... */
-     fprintf(f, "<a  class=\"blue\"  href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);
+     fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, iplog->lmsid, iplog->lmsid);
     }
     else if(iplog->lmsid == 0)
     {
@@ -940,9 +939,9 @@ void parse_ip_log(int argc, char **argv)
    }
   }
   fprintf(f,"</tbody><thead><tr>\
-  <td colspan=\"4\" style=\"text-align: left\">Total:</td>\
-  <td style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></td>\
-  <td style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></td></tr>\n", total, line);
+  <th colspan=\"3\" style=\"text-align: left\">Total:</th>\
+  <th colspan=\"2\" style=\"text-align: right\"><strong>%ld&nbsp;GB</strong></th>\
+  <th style=\"text-align: right\"><strong>%Ld&nbsp;kb/s</strong></th></tr>\n", total, line);
   fputs("</thead></table>\n", f);
 
   row_odd_even = 0;
@@ -1022,9 +1021,8 @@ void parse_ip_log(int argc, char **argv)
     fprintf(f,"<td style=\"text-align: right\">%d</td><td style=\"text-align: right\">%d %%</td><td style=\"text-align: right\">%ld G</td><td style=\"text-align: right\">%d %%</td></tr>\n",iplog->i,(100*iplog->i+50)/i,iplog->l,(int)((100*iplog->l+50)/total));
    }
 
-   fprintf(f,"</tbody><thead><tr>\n\
-<th>All users, all traffic</th>\n\
-<th style=\"text-align: right\">%d</th>\n\
+   fprintf(f,"</tbody><thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);
+   fprintf(f,"<th style=\"text-align: right\">%d</th>\n\
 <th style=\"text-align: right\">100 %%</th>\n\
 <th style=\"text-align: right\">%ld G</th>\n\
 <th style=\"text-align: right\">100 %%</th></tr>\n",i-1,total);
@@ -1643,7 +1641,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     }
     if(ip->traffic || ip->direct || ip->proxy || ip->upload)
     {
-     fprintf(f, "%d:{\"ip\":%s, \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu}\n",
+     fprintf(f, " %d:{ \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",
                 ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);
     }
     jsoncount++;
@@ -1795,7 +1793,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    printf("%03d. %-22s %10Lu (%d/%d)\n",i ,ip->name, ip->traffic, ip->min, ip->max); 
 #endif
    /* hostnames -------------------------------------- */
-   fprintf(f,"%s<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td><td><a class=\"blue\" href=\"%s%s.log\">%s</a>\n", 
+   fprintf(f,"%s<td style=\"text-align: right\"><a name=\"%s\"></a>%d</td><td><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", 
               tr_odd_even(), ip->name, i, log_url, ip->name, ip->name);
 
    if(use_jquery_popups)
@@ -1804,7 +1802,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      popup_button=0;
      for_each(sharedip, ips) if(eq(ip->name, sharedip->sharing))
      {
-      fprintf(f,"<br /><a class=\"blue\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);
+      fprintf(f,"<br /><a class=\"blue\" target=\"_blank\" href=\"%s%s.log\">%s</a>\n", log_url, sharedip->name, sharedip->name);
       popup_button++;
      }
      fputs("</span>\n",f);
@@ -1822,7 +1820,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
     fputs("<td style=\"text-align: right\">",f);
     if(ip->lmsid > 0)
     {
-     fprintf(f,"<a class=\"blue\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);
+     fprintf(f,"<a class=\"blue\" target=\"_blank\" href=\"%s%d\">%04d</a>\n", lms_url, ip->lmsid, ip->lmsid);
     }
     else if(ip->lmsid == 0)
     {
@@ -1862,10 +1860,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))
      {
       fprintf(f,"<br />%Lu", sharedip->upload);
-      if(!just_preview)
-      {
-       append_log(sharedip);
-      }
      }
      fputs("</span>\n",f);
    }
@@ -1897,6 +1891,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    if(!just_preview)
    {
     append_log(ip);
+    for_each(sharedip,ips) if(eq(ip->name, sharedip->sharing))
+    {
+     append_log(sharedip);
+    }
    }
   }
   fprintf(f,"</tbody><thead><tr>\n\
@@ -2003,7 +2001,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
               sum->i,(100*sum->i+50)/active_classes,sum->l,(100*sum->l+50)/total_traffic);
    }
 
-   fprintf(f,"<tr><thead><th><a class=\"blue\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);
+   fprintf(f,"<thead><tr><th><a class=\"blue\" target=\"_blank\" href=\"%sERP.log\">All users, all traffic</a></th>\n", log_url);
    fprintf(f,"<th style=\"text-align: right\">%d</th>\n\
 <th style=\"text-align: right\">100 %%</th>\n\
 <th style=\"text-align: right\">%Lu M</th>\n\