gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,547 Commits 12 Branches 481 Tags 2.4 GiB
14bda32169
Commit Graph

206 Commits

Author SHA1 Message Date
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Marc Delisle
8a3bf5af9f Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-20 13:14:05 -04:00
Hugues Peccatte
49ababac08 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-04 10:09:06 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Hugues Peccatte
f9dd601397 Coding style modifications. 
Refactoring.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 16:16:47 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Hugues Peccatte
30e0dc70cc Coding style modifications. 
Remove unused variables.
PHPDoc update.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-09 23:11:36 +02:00
Marc Delisle
65ab32fc7b Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-02 08:22:30 -04:00
Edward Cheng
54000aa117 [Console]Second commit 
Console changes:
+ Ajax global callback
+ Support disable Codemirror
+ Global AJAX callback
+ XSS issues slove
+ JSON response bug fix
+ Selection query Explain and Profiling
+ Translation improvement
+ Bookmark creation and deletion
+ Codemirror wrong font-size under Firefox
+ Options card input elements value bug
+ Etc

Removal:
- Rollback query execution support

Other changes:
+ Unify query history behavior

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-07-29 19:20:38 +08:00
Marc Delisle
4711be3952 Simplify test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-28 10:19:51 -04:00
Marc Delisle
00fc921ebd Fix execution path notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-28 08:40:20 -04:00
Marc Delisle
605381469f Clarify variable's origin 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-25 11:54:56 -04:00
Atul Pratap Singh
7731971f9e Merge branch 'QA_4_2' 2014-07-08 20:34:08 +05:30
Atul Pratap Singh
2e76e83408 Fix bug 4483/4440: selflink was disappearing in certain cases 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-08 20:05:46 +05:30
Ann + J.M
f5a9a60382 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-03 20:27:39 +02:00
Ann + J.M
a995e28258 Fix coding style in import.php 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-02 22:30:12 +02:00
Edward Cheng
fb14e92d62 PMA console, history and bookmarks. 
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-25 21:22:33 +08:00
Ashutosh Dhundhara
04d7be1b06 RFE#869: Run SQL query: Allow rollback for InnoDB tables. 
Rollback support for other Transactional engines other than InnoDB.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-22 22:41:23 +05:30
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02:00
Ashutosh Dhundhara
8a46508bd0 RFE#861: Simulate UPDATE queries. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Show 'Simulate query' button only in case of UPDATE and DELETE.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix code style.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-19 21:16:13 +05:30
Marc Delisle
052eb0ecac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:44:39 -04:00
Marc Delisle
531fff09fe bug #4405 Cannot import (open_basedir): fix another case 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:42:14 -04:00
Michal Čihař
98034ba148 Remove $GLOBALS['cfg']['Bookmark'] variable 
It makes it impossible to include bookmark library at any time as when
it is included before configuration is loaded it caches false result for
bookmarks support.

And anyway, using superglobals is always bad idea.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 13:45:03 +02:00
Marc Delisle
bd762244ec Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:27:02 -04:00
Marc Delisle
9376bf580e Merge commit '785ad04' 2014-05-28 15:50:26 -04:00
Marc Delisle
785ad04b38 bug #4405 Cannot import (open_basedir) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 15:43:06 -04:00
Ann + J.M
6743e78ea4 PMA_Bookmark_delete: Drop unnecessary $db param 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:04:22 +02:00
Chanaka Indrajith
2dfdf472a0 Fixed documentation issue related to argument type mismatching, raised by scrutinizer 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-05-17 17:19:12 +05:30
Marc Delisle
e57088ef79 Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 16:16:52 +02:00
Marc Delisle
4b34ec6e52 Merge commit '29fb3c8' 2014-04-15 12:35:50 -04:00
Ashutosh Dhundhara
29fb3c8931 Bug Fix: #4365 Creating bookmark with multiple queries not working. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-15 19:53:05 +05:30
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 09:36:48 +01:00
Marc Delisle
bbeacf8e78 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-22 13:06:44 -05:00
Marc Delisle
f78e1a2f0f Move function to library and rename it 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-22 13:03:25 -05:00
yzsolt
1c1d95e8bb Show a meaningful error if open_basedir is misconfigured (the tmp directoy is unavailable). 
Signed-off-by: yzsolt <bolony.zsolt@gmail.com>
 2014-02-17 12:47:26 +01:00
yzsolt
e27a5ccbac Use the tmp directory provided by the system instead of a hard-coded one. 
Signed-off-by: yzsolt <bolony.zsolt@gmail.com>
 2014-02-17 12:45:01 +01:00
yzsolt
7022f5a1d5 This check is unnecessary. 
Signed-off-by: yzsolt <bolony.zsolt@gmail.com>
 2014-02-17 12:43:41 +01:00
yzsolt
315c307b89 Exit immediately on import error. 
Signed-off-by: yzsolt <bolony.zsolt@gmail.com>
 2014-02-17 12:43:07 +01:00
Michal Čihař
a46f125b8e Merge remote-tracking branch 'origin/QA_4_1' 2014-02-05 09:27:48 +01:00
Michal Čihař
968d5d5f48 Sanitize filename in import message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-05 09:25:31 +01:00
Michal Čihař
addebbee8b Avoid code duplication 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-05 09:24:11 +01:00
Michal Čihař
9d17a602f5 Better messasge after creating a bookmark 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:32:15 +01:00
Michal Čihař
2a83a5d4d3 Make error message a sentence 2014-01-29 13:15:44 +01:00
Atul Pratap Singh
5be9575057 ajax_reload was set but was not added to response 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-15 02:10:54 +05:30
Atul Pratap Singh
5fb647eb5a ajax_reload was set but was not added to response 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-14 17:50:01 +05:30
Marc Delisle
3b89a4650a Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-11 07:23:53 -05:00
Madhura Jayaratne
6335b10574 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 14:35:15 +05:30
Madhura Jayaratne
439f30ba5e Port 92b6639a9e to QA_4_1 2013-11-26 06:53:08 +05:30
Madhura Jayaratne
92b6639a9e bug #4161 - Fix PHP errors 2013-11-26 06:46:02 +05:30
Madhura Jayaratne
8d1a0f2d68 Use a better variable name ($result variable is used for storing query execution result as well) 2013-11-26 06:44:05 +05:30