[Phpmyadmin-devel] "Monitor" broken in master

[Michal Čihař]

Hi

Dne Sat, 20 Aug 2011 20:53:41 +0300
Tyron Madlener <tyronx at gmail.com> napsal(a):

> On Sat, Aug 20, 2011 at 8:47 PM, Tyron Madlener <tyronx at gmail.com> wrote:
> > On Sat, Aug 20, 2011 at 8:45 PM, Tyron Madlener <tyronx at gmail.com> wrote:
> >> On Sat, Aug 20, 2011 at 6:34 PM, Rouslan Placella <rouslan at placella.com> wrote:
> >>> Tyron,
> >>>
> >>> The monitor in current master is now broken. New datapoints are not
> >>> plotted correctly anymore. Screenshot attached. I think this happened
> >>> some time yesterday and may have to do with those optimisations that
> >>> Piotr pushed, though I'm not sure.
> >>>
> >>> Rouslan
> >>
> >> This is really odd because the error doesn't seem to be caused by any
> >> change in the related files functions.js, server_status.php,
> >> server_status.js or server_status_monitor.js
> >>
> >> On my fork (http://demo.phpmyadmin.net/gsoc-tyron) the charts still
> >> work. And replacing any of above files on the master version did not
> >> have any effect.
> >>
> >
> > The json data still is transferred and added to each chart correctly.
> > But the highchart charts doesn't recognize the millisecond-timestamp
> > as a correct time anymore.
> >
> 
> Oh ok found the error. Michal encapsed all the js variables in
> strings, thus breaking the server time calculation.

The reason for this was proper escaping of the variables (for example
original code would break on database name containing ', I somehow
missed that one of them is javascript code which should not be escaped.
Fixed in master now.

-- 
	Michal Čihař | http://cihar.com | http://phpmyadmin.cz
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20110822/3774fb40/attachment.sig>