gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,119 Commits 12 Branches 481 Tags 2.4 GiB
2dad1839a5
Commit Graph

104119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
2dad1839a5 Merge pull request #11753 from madhuracj/plugin 
Refactor Server Plugins Page
 2015-12-17 10:08:47 +11:00
Madhura Jayaratne
65d2413c0f Properly mock dbi 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 09:56:36 +11:00
Madhura Jayaratne
e3041f3b7a Use full namespace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 08:30:53 +11:00
Marc Delisle
52f1cabcec Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-16 09:39:42 -05:00
Michal Čihař
9187445a9f Display results for all queries returning data 
This is limited to 50 queries, and removes detection based on query
string. It rather passes all (up to 50) queries to sql.php, which can
properly handle any query returing results.

Fixes #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 15:07:23 +01:00
Michal Čihař
01d96f8bf4 Fix parameter to detect DROP/CREATE 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 15:05:02 +01:00
Michal Čihař
a786952213 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 14:53:26 +01:00
Michal Čihař
085761fe5f Simplify query execution 
We get most information as parameters.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 14:52:46 +01:00
Michal Čihař
135077bbc0 Fold updateSqlData into new function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 14:45:32 +01:00
Michal Čihař
189f893677 Split out actual query execution to separate function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 14:44:54 +01:00
Michal Čihař
d0c6f5fc9e Check for non printable chrars as well before displaying text as is 
Issue #6321

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 13:41:35 +01:00
Michal Čihař
75a2d19d3e Set test enviroment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 13:36:24 +01:00
Madhura Jayaratne
5b5b694a3a Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 23:25:43 +11:00
Madhura Jayaratne
9e19e168ea Correctly mock dbi 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 23:09:49 +11:00
Michal Čihař
79aa77f08d Adjust tests to new code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 13:07:14 +01:00
Madhura Jayaratne
a624f09e24 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:49:23 +11:00
Madhura Jayaratne
e199708ff2 Simplify 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:38:31 +11:00
Madhura Jayaratne
ca44bbd93b Template plugins page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:36:51 +11:00
Michal Čihař
a85f3f80f2 Display binary strings as text if they are valid UTF-8 
Also prepend 0x to the binary string to make it cleaner what is going on
(especially when there are only numeric results such as 616263, it's
much easier to undestand when it's there as 0x616263).

Fixes #6321

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 12:33:17 +01:00
Madhura Jayaratne
ff647fd63b Set the variable directly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:12:27 +11:00
Madhura Jayaratne
07c9d21162 Plugin list of centralized to this controller. Make it an instance variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:10:32 +11:00
Madhura Jayaratne
25c7812120 It does not really require a separate method to get the SQL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:04:19 +11:00
Madhura Jayaratne
3d1a52c1b0 Use own dbi 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:02:16 +11:00
Madhura Jayaratne
e23827f67f Create a controller class for server plugins page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-16 22:01:12 +11:00
Παναγιώτης Παπάζογλου
7dcce89b4d Translated using Weblate (Greek) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-16 10:46:34 +01:00
Weblate
e90411b1ea Merge remote-tracking branch 'origin/master' 2015-12-16 09:44:46 +01:00
Stefano Martinelli
562f0eb759 Translated using Weblate (Italian) 
Currently translated at 99.9% (3213 of 3215 strings)

[CI skip]
 2015-12-16 09:44:44 +01:00
Michal Čihař
2076b0203b Fixed displaying of SQL query on table operations 
- do not show message about executed SQL when none was executed
- always show the SQL

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Michal Čihař
a2a321eaf7 No need to set type of message when we pass Message instance 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Michal Čihař
c217eaffc2 Use default messages, no need to duplicate them 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Michal Čihař
8fc0dc7032 Include SQL even in case of error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Michal Čihař
91c6a2ad08 Fix possible undefined variable in case of error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Burak Yavuz
e6ca04f83a Translated using Weblate (Turkish) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-16 09:39:24 +01:00
Kristjan Räts
864df2b6ee Translated using Weblate (Estonian) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-16 09:21:57 +01:00
Michal Čihař
9f4717f2ab Merge branch 'QA_4_5' 2015-12-16 08:14:08 +01:00
Michal Čihař
64cbe33845 Merge remote-tracking branch 'weblate-master/master' 2015-12-16 08:13:59 +01:00
Michal Čihař
160d6e2e20 Merge remote-tracking branch 'weblate-4.5/QA_4_5' into QA_4_5 2015-12-16 08:13:08 +01:00
Krystian Biesaga
bc4af86f8e Translated using Weblate (Polish) 
Currently translated at 81.6% (2630 of 3222 strings)

[CI skip]
 2015-12-16 08:08:48 +01:00
Krystian Biesaga
369d42f0e8 Translated using Weblate (Polish) 
Currently translated at 82.7% (2657 of 3211 strings)

[CI skip]
 2015-12-16 08:08:43 +01:00
Michal Čihař
e4f72c3021 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 08:07:29 +01:00
Michal Čihař
63f048f8cb Merge branch 'QA_4_5' 2015-12-16 08:05:34 +01:00
Michal Čihař
dc8df980a2 Merge commit 'a36a80f3df7013f4bd3789a0e3679974a829863d' 2015-12-16 08:05:28 +01:00
Michal Čihař
e0ad034681 Remove \b from the messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 08:05:05 +01:00
Michal Čihař
a36a80f3df Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 08:01:02 +01:00
Marc Delisle
69bd50f7d5 Merge branch 'QA_4_5' 2015-12-15 06:26:49 -05:00
Marc Delisle
80a0b426cf ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-15 06:26:24 -05:00
Marc Delisle
129791d082 Merge pull request #11748 from devenbansod/fix_11720 
Fix #11720
 2015-12-15 06:25:13 -05:00
Michal Čihař
605ce3388b Remove duplicate checking of goto 
It's already done in common.inc.php, no need to check again here (and
the check was wrong anyway).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 10:24:03 +01:00
Michal Čihař
0a20708533 Update sql data array in place 
There is no need to create a copy here.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 10:11:00 +01:00
Michal Čihař
6b9d93a270 Do not try to catch USE when runing through sql.php 
In this case it's properly handled there, we should not do any database
changes at this point.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 09:40:52 +01:00