Commit Graph

52 Commits

Author SHA1 Message Date
Rahul Kadyan
4d308ba364 Remove unneeded closing tags
Closing tags at the end of file are not mandatory. It is often
suggested to omit to closing tags at the end of file to prevent
unwanted effects as PHP will start output buffering if there is
any character after closing tag.

Reference: http://php.net/manual/en/language.basic-syntax.phptags.php

Signed-off-by: Rahul Kadyan <hi@znck.me>
2015-03-06 23:37:35 +05:30
Hugues Peccatte
7a60853443 Replace $replication_info by a global variable.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 19:14:26 +01:00
Hugues Peccatte
49836e6e6f Use $replication_info everywhere, instead of $server_* variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 16:30:07 +01:00
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-16 13:32:15 -04:00
Michal Čihař
2456af7a01 Remove no longer used JSON plugin for jQuery
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-03-19 12:33:46 +01:00
Michal Čihař
50fb18a941 Drop no longer needed date.js 2013-07-08 11:27:36 +02:00
xmujay
e3a824cc7b 1. using a better function name 2. fix code style issue 3. add doc for functions 2013-06-17 21:43:13 +08:00
xmujay
cb2f07eb94 refactor the Ajax request part of server_status_monitor.php
1. split long code to function
2. move functions to server_status_monitor.lib.php
2013-06-16 16:58:06 +08:00
xmujay
6acdec1aef rename the function to a meaningful name 2013-06-13 14:49:25 +08:00
xmujay
9156b61c40 refactor server_status_monitor.php
1. split long functions
2. add server_status_monitor.lib.php
2013-06-11 14:14:23 +08:00
Marc Delisle
302d38ad9d Fix typo 2013-05-27 07:59:10 -04:00
Madhura Jayaratne
2baf473ad7 Merge branch 'master' into OOP_DBI
Conflicts:
	libraries/database_interface.lib.php
2013-05-26 21:43:33 +05:30
Madhura Jayaratne
50b0eed668 isSuperuser() is also a part of DatabaseInterface class 2013-05-26 09:18:11 +05:30
Marc Delisle
3a89c9938a Missing renamings 2013-05-25 15:22:43 -04:00
Marc Delisle
07f9493800 Fix merge conflicts 2013-05-25 07:29:30 -04:00
Marc Delisle
dda6b7f0e5 Improve message appearance 2013-05-25 07:25:22 -04:00
Atul Pratap Singh
2af41d6f58 Rename message in QA_4_0 2013-05-25 16:26:38 +05:30
Atul Pratap Singh
ebf75cd9b7 Rename message 2013-05-25 16:18:05 +05:30
Michal Čihař
b63ad15fb2 End sentence with stop 2013-05-24 10:59:43 +02:00
Atul Pratap Singh
ecf45f9de1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-05-24 01:43:58 +05:30
Atul Pratap Singh
0e23451efa Wrap chart and legend in a single div, fix rearrange charts feature in status monitor 2013-05-24 01:30:02 +05:30
Madhura Jayaratne
e6b8ab7c30 Replace tabs with 4 whitespaces 2013-05-23 23:05:35 +05:30
Michal Čihař
37b6f67fcb Merge pull request #387 from xmujay/2332_xmujay
make function outside class starting with "PMA"; render HTML at once
2013-05-15 23:20:28 -07:00
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
xmujay
76df1ca1c1 make function outside class starting with "PMA"; render HTML at once 2013-05-15 23:48:30 +08:00
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems
Thanks Rasmus Lerdorf for analyzing!
2013-05-13 11:27:56 +02:00
Marc Delisle
9966cedcde Fix merge conflicts 2013-05-11 07:34:09 -04:00
Michal Čihař
0ebf0a1324 Consistent function naming and corrected documentation 2013-05-10 09:42:17 +02:00
xmujay
665dbb65bf fix Undefined variable: ServerStatusData 2013-05-10 15:14:08 +08:00
xmujay
46af1aeb38 refactor server_view:
1. add function for html render
2. code indention
3. split long lines
2013-05-07 21:35:41 +08:00
Kasun Chathuranga
5ef0833210 Merge branch 'master' into DBI_naming_cleanUp2
Conflicts:
	sql.php
2013-05-05 20:58:07 +05:30
xmujay
dcb97f46ce server_status_monitor.php refactor, split long function into small ones:
1 getTabLinksHtml
2 getPopContentHtml
2013-05-05 20:53:26 +08:00
Kasun Chathuranga
556bcb9f9d PMA_DBI_num_rows --> PMA_DBI_numRows 2013-05-04 08:39:43 +05:30
Kasun Chathuranga
1c884f0cca PMA_DBI_free_result --> PMA_DBI_freeResult 2013-05-04 08:33:49 +05:30
Kasun Chathuranga
5bcc32999f PMA_DBI_fetch_assoc --> PMA_DBI_fetchAssoc 2013-05-04 08:30:12 +05:30
Kasun Chathuranga
42256b2d0c PMA_DBI_select_db --> PMA_DBI_selectDb 2013-05-04 08:26:27 +05:30
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
2013-05-01 00:51:15 +05:30
Kasun Chathuranga
fbe4438628 PMA_DBI_fetch_result --> PMA_DBI_fetchResult 2013-05-01 00:05:16 +05:30
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
Atul Pratap Singh
e32bdd27ec Hide rearrange chart feature for now 2013-04-20 20:18:28 +05:30
Atul Pratap Singh
19953410d0 Cloning addChartForm duplicated whole set of inner elements, further breaking add chart functionality 2013-02-04 06:35:57 +05:30
Marc Delisle
431df615f2 Upgraded to jquery-ui-timepicker-addon 1.1.1 2013-01-01 11:50:04 -05:00
Rouslan Placella
9b0dbbddea Upgraded jquery json plugin to v2.4 2012-12-20 18:42:51 +00:00
Rouslan Placella
b0004fbbcb Fixed another multiple dialogs bug in server status monitor 2012-12-17 19:16:23 +00:00
Rouslan Placella
099750af03 Fixed multiple dialogs bug in server status monitor 2012-12-17 18:40:02 +00:00
Rouslan Placella
fe95c8988d phpcs fixes 2012-12-14 19:05:04 +00:00
Rouslan Placella
0f317d4b56 Removed redundant parameter 2012-12-14 19:05:04 +00:00
Rouslan Placella
9775d295da Improved formatting and display of data in server status monitor 2012-12-14 19:05:04 +00:00
Rouslan Placella
b8354b07a5 Added missing js include 2012-12-14 19:05:04 +00:00
Rouslan Placella
6575eb5a61 Don't json_encode server status monitor responses twice 2012-12-14 19:05:04 +00:00