[Improved display of sip traces
Adrian Georgescu <ag@ag-projects.com>**20061014140239] hunk ./cdrlib_ser.phtml 4148
-        print "<p>
-        <a name=#top>
-        <table cellpadding=0 border=0>";
-
hunk ./cdrlib_ser.phtml 4150
-    	    <tr>
-        	<td colspan=3>
-	        <a href=$fullURL>URL for this trace</a>
-        	</td>
-	        </tr>
+	        <p><a href=$fullURL>CDRTool trace for SIP session $callid</a>
hunk ./cdrlib_ser.phtml 4154
-            print "<tr>
-            <td colspan=3>SIP trace for session id $callid is not available anymore.
-            <p>SIP traces are available for the last $this->purgeRecordsAfter days.
-            </td>
-            </tr>
-            </table>";
+            print "<p>
+            SIP trace for session id $callid is not available.
+            ";
hunk ./cdrlib_ser.phtml 4160
-        print "<tr><td colspan=3><p></td></tr>";
hunk ./cdrlib_ser.phtml 4161
-        while ($this->db->next_record()) {
+		$tableColumns=0;
hunk ./cdrlib_ser.phtml 4163
+        while ($this->db->next_record()) {
hunk ./cdrlib_ser.phtml 4175
+
+            if (strlen($this->db->f('fromip')) && !$column[$this->db->f('fromip')]) {
+                $column[$this->db->f('fromip')]=$tableColumns+1;
+                $tableColumns++;
+            }
hunk ./cdrlib_ser.phtml 4184
-        <tr>
-        <td colspan=3 align=left>
+        <p>
hunk ./cdrlib_ser.phtml 4212
-        </td>
-        </tr>
-        ";
+        <p>
+        <a name=#top>
+        <table cellpadding=0 border=0 width=100%>";
hunk ./cdrlib_ser.phtml 4216
-        print "<tr><td colspan=3><p></td></tr>";
+        $colspan=1+count($column);
+
+        print "<tr bgcolor=lightgrey>
+        <td><b>Packet</b></td>
+        <td><b>Time</b></td>
+        ";
+        foreach (array_keys($column) as $_key) {
+            printf ("<td class=border><b>%s</h3></b>",$_key);
+        }
+        print "</tr>";
hunk ./cdrlib_ser.phtml 4252
-                    $_lines[0]="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".$m[1];
+                    $_lines[0]=$m[1];
hunk ./cdrlib_ser.phtml 4255
-				$time=substr($date,10);
+				if ($direction == "out") $fromip="127.0.0.1";
+
+                $_span=1;
+                $t=1;
+                while ($t < $column[$fromip]) {
+                    $_span++;
+                    $t++;
+                }
hunk ./cdrlib_ser.phtml 4266
-                <td bgcolor=lightgrey colspan=2 onClick=\"return toggleVisibility('row$i')\">
+        		<td class=border align=right>$i/$rows</td>
+                <td colspan=$_span class=border>$date</td>
+                ";
+                print "
+                <td class=border onClick=\"return toggleVisibility('row$i')\">
hunk ./cdrlib_ser.phtml 4272
-                $time : $_lines[0]
+                $_lines[0]
hunk ./cdrlib_ser.phtml 4277
-                } else {
-                	print " from <font color=#1A9C1A>$fromip</font>";
hunk ./cdrlib_ser.phtml 4281
-                 Packet $i/$rows
hunk ./cdrlib_ser.phtml 4298
-                <td colspan=3>
+                <td colspan=$colspan>
hunk ./debian/changelog 4
+  * Improve display of SIP traces
hunk ./debian/changelog 6
- -- Adrian Georgescu <ag@ag-projects.com>  Fri, 13 Oct 2006 12:45:25 +0200
+ -- Adrian Georgescu <ag@ag-projects.com>  Sat, 14 Oct 2006 16:02:18 +0200