gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,239 Commits 12 Branches 481 Tags 2.4 GiB
e433d8189b
Commit Graph

80 Commits

Author SHA1 Message Date
Ann + J.M
ddf78c212b Re-merge b3dbec1...9207203, changes got lost on original merge from QA_4_2 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-26 10:39:50 +02:00
Hugues Peccatte
9dd5c4ca6e Fix typo in PHP variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-18 14:38:46 +02:00
Michal Čihař
b8a879cef2 Document when the function is called 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:09:08 +02:00
Madhura Jayaratne
d0fd5acc0f Revert 33a30ad7ae. Those funcitons are infact used. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 12:04:36 +02:00
Madhura Jayaratne
c154b1b9c5 Explicitly stating the visibility 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 11:54:49 +02:00
Madhura Jayaratne
33a30ad7ae These functions do not seem to be used anywhere, removing... 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 11:51:03 +02:00
Michal Čihař
e47566f9fd Fix code docblocks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:22:21 +02:00
Michal Čihař
e84e6c0305 Merge pull request #1165 from nijel/cleanup 
Various code cleanups
 2014-05-06 14:13:11 +02:00
Michal Čihař
9be2467109 Adjust docs to match current code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:09:18 +02:00
Michal Čihař
5cf56a9f06 This paramterer is a string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:07:49 +02:00
Michal Čihař
39550be909 This variable is always set to other value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:12:25 +02:00
Marc Delisle
f46865c660 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-11 09:34:51 -04:00
Michal Čihař
c6cc2f70b1 Merge branch 'QA_4_1' 2014-04-02 09:15:25 +02:00
Michal Čihař
b80e73979b Fixed PHP Parse error in Advisor 
There is one rule which needs to pass more values to format string and
the code did not properly handle this. Now evaluating params and passing
them to vsprintf to process the format string.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-02 09:14:15 +02:00
Michal Čihař
f5fc2ab76b Move implode to the code rather than having it in the data 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-02 08:59:01 +02:00
Michal Čihař
9fbabd6202 Backport Advisor cleanups from master 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:24:03 +01:00
Michal Čihař
53cc186591 Fixed ob_start/eval problems in phpunit 
When running in phpunit, the eval can raise exception, so treat it same
as it would be output returned by the eval. Without catching it, output
buffering gets one more level of nesting leading to occassional
timeouts in Travis-CI.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:05:55 +01:00
Michal Čihař
eb85831fe1 Fixed ob_start/eval problems in phpunit 
When running in phpunit, the eval can raise exception, so treat it same
as it would be output returned by the eval. Without catching it, output
buffering gets one more level of nesting leading to occassional
timeouts in Travis-CI.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-13 13:51:40 +01:00
Michal Čihař
2f1dc89d0a Simplify translation evaluation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-13 13:42:28 +01:00
Michal Čihař
6917afbb19 Remove no longer used ignoreUntil parameter of PMA_Advisor::ruleExprEvaluate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-27 15:17:01 +01:00
Michal Čihař
a908df0034 Simplify formatting string in advisor 
We don't need to evaluate whole printf, it's enough to evalue the
parameter.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-27 15:17:01 +01:00
Hugues Peccatte
ab42fd2ac9 PHPCS update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-17 18:53:14 +01:00
Madhura Jayaratne
728d3f32a3 Doc comment improvements 2013-11-29 23:23:19 +05:30
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Hugues Peccatte
2fc0ca777d Update PHPDoc. 2013-11-10 10:28:05 +01:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
107a727864 Various coding style fixes 2013-07-30 13:52:40 +02:00
Michal Čihař
9e2260632e Merge remote-tracking branch 'origin/QA_4_0' 2013-07-23 11:24:22 +02:00
Michal Čihař
81dba57b6a Better injection of variables into eval'd code 2013-07-23 11:20:56 +02:00
xmujay
376e8027ea fix the UT error 2013-07-17 21:04:14 +08:00
Madhura Jayaratne
ce85ebd950 Merge branch 'master' into OOP_DBI 2013-05-24 19:06:45 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Michal Čihař
9dc1282ae9 These are sentences so make them have final stop 2013-05-24 10:51:36 +02:00
Michal Čihař
e8e7c74164 Wrap some long lines 2013-05-02 10:43:30 +02:00
Michal Čihař
0f7f7bf72e Merge remote-tracking branch 'origin/QA_4_0' 2013-05-02 10:29:24 +02:00
Michal Čihař
a00b2f99a5 Use preg_replace_callback instead of deprecated /e modifier 
This causes deprecation warning in PHP 5.5
 2013-05-02 10:28:37 +02:00
Kasun Chathuranga
fbe4438628 PMA_DBI_fetch_result --> PMA_DBI_fetchResult 2013-05-01 00:05:16 +05:30
Rouslan Placella
14a7be6e37 Fixed direct linking to server variable name 2012-11-09 15:13:23 +00:00
Madhura Jayaratne
dd0e96bdf7 Spaces to improve clarity 2012-10-28 17:18:22 +05:30
Edgaras Janušauskas
1fbe74ef9b Advisor support for Windows endlines 2012-09-25 21:18:36 +03:00
Michal Čihař
3e050ff9d9 Various docblocks improvements 2012-09-19 15:05:26 +02:00
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
J.M
80911671b1 Merge branch 'QA_3_5' 
Conflicts:
	server_status.php
 2012-09-04 22:36:10 +02:00
J.M
bf5f51bee2 add support for Solaris and FreeBSD system load and memory display in server status 2012-09-04 22:15:32 +02:00
Michal Čihař
b6bd80facb Use specific advisor functions in advisor rules (bug #3545306) 2012-07-19 14:55:12 +02:00
Michal Čihař
2325b9a3df Little bit of coding standard 2012-07-16 14:38:10 +02:00
Michal Čihař
6f2e982610 Proper escaping in error message 2012-07-16 14:35:04 +02:00
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Michal Čihař
7e9388149e Follow naming conventions (private methods should start with _) 2012-05-03 12:57:01 +02:00
Michal Čihař
0cfb15490f Fix comments 2012-05-03 12:56:25 +02:00