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

931 Commits

Author SHA1 Message Date
Michal Čihař
2fffee3093 Merge remote-tracking branch 'origin/pull/11986' 2016-02-22 07:56:50 +01:00
chintan zaveri
2b74163914 Removal of Swekey 
Signed-off-by: Chintan Zaveri <zaveri_chintan@rediff.com>

master rebased

Signed-off-by: Chintan Zaveri <zaveri_chintan@rediff.com>
 2016-02-20 21:41:07 +05:30
Madhura Jayaratne
ddf847a5eb Align docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 22:54:18 +11:00
Michal Čihař
f1379e2b26 Merge branch 'QA_4_6' 2016-02-17 11:33:02 +01:00
Michal Čihař
dd09116716 Correct fix for table import processing 
We need to consistently propagate the $sql_data array.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:12:08 +01:00
Michal Čihař
5563f3e137 Revert "Remove sql data parameter" 
This reverts commit 84c12c2fdd.
 2016-02-17 10:59:40 +01:00
Michal Čihař
2670a1499f Merge branch 'QA_4_6' 2016-02-17 10:52:55 +01:00
Michal Čihař
84c12c2fdd Remove sql data parameter 
This just makes the SQL import different from others leading to subtle
breakages.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:42:14 +01:00
Michal Čihař
edc46f02e9 Merge branch 'QA_4_6' 2016-02-16 10:21:19 +01:00
Michal Čihař
67b681d63e Merge branch 'QA_4_5' into QA_4_6 2016-02-16 10:21:07 +01:00
Michal Čihař
50af85cf34 Fix export of index comments in SQL 
Fixes #11968

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 10:20:09 +01:00
Michal Čihař
7c249478dc Remove check for libxml_disable_entity_loader 
It's there since PHP 5.2.11 and we require 5.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 09:16:55 +01:00
Michal Čihař
9a590a0b76 Merge branch 'QA_4_5' into QA_4_6 2016-02-16 09:00:41 +01:00
Michal Čihař
310fd4b2c1 Fix PHP error on loading invalid XML or ODS file 
Fixes #11967

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 09:00:32 +01:00
Michal Čihař
0c34cb60a0 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 13:47:04 +01:00
Michal Čihař
53b1f9adcc Silent errors on checking for files and folders 
Fixes #11951
Fixes #11952

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 13:45:04 +01:00
Michal Čihař
5042b65398 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 10:45:43 +01:00
Michal Čihař
4534a90b80 Silent warnings when checking for file existance 
Another occurences of file_exists which can be limited by open_basedir.

Issue #11940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 10:38:47 +01:00
Dan Ungureanu
c6b3292fe5 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 09:39:01 +02:00
Dan Ungureanu
490325c89d Fixes #11920. Can't disable backquotes in export 
Updated sql-parser to phpmyadmin/sql-parser@de8b3efbbc (v3.2.0).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-12 09:37:03 +02:00
Michal Čihař
2148e7cad8 Implement test for Cookie auth without runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:21:40 +01:00
Michal Čihař
c2b41b829a Wrap header() and headers_sent() in response 
This allows us to test the code without using runkit. Currenly only
AuthenticationHttp is migrated to new code, but others will follow.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Michal Čihař
431450a237 Make test run even without runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Michal Čihař
db6af1be82 Simplify code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:57:19 +01:00
Michal Čihař
2a9fb73f92 Remove PmaAbsoluteUri from redirects 
This is no longer needed as per RFC 7231.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:32:14 +01:00
Michal Čihař
ac9714cf6a Autoloading for phpseclib 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-01 21:53:53 +01:00
Michal Čihař
7b58acf62e Merge branch 'QA_4_5' 2016-02-01 21:46:33 +01:00
Madhura Jayaratne
30ac5b6094 Fix #11892 Error with PMA 4.4.15.3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-29 08:33:42 +11:00
Michal Čihař
b69fa1499f Bring back file inclustion, just remove version check from it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 17:08:19 +01:00
Michal Čihař
072ff0b38a Remove checks for PHP versions we no longer support 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 16:08:47 +01:00
Michal Čihař
e4dfb159c4 Do not use global constant with class 
As this doesn't play well together. This fixes the PDF schema export.

Fixes #11849

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 15:24:48 +01:00
Michal Čihař
37004337ab Merge commit 'a478437e0ee4d74ec5036cb32e165da002303dd1' 2016-01-14 09:10:43 +01:00
Deven Bansod
3b8644318a Fix #11752 , analyse the grant strings to perform checks for privileges instead of running all the test queries on mysql db 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-08 16:48:57 +05:30
Marc Delisle
68f8adfd84 No letters for logical operators 
https://github.com/dseguy/clearPHP/blob/master/rules/no-letter-logical.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-05 17:17:43 -05:00
Michal Čihař
628b19283d Fix spacing of docstrings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:40:44 +01:00
Michal Čihař
049e62285c Fix spacing after . 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:33:13 +01:00
Michal Čihař
af258e8073 Fix spacing of comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:31:30 +01:00
Michal Čihař
ebda156932 The shared method has to be protected, not private 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:15:17 +01:00
Michal Čihař
a7bafe5a6c Share code for exporting routines and events to XML 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:08:32 +01:00
Michal Čihař
5801e7a019 Share _getPaperSizeArray code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:57:34 +01:00
Michal Čihař
ca59f5046c Use new contructor for Group() objects 
This safes us next calls to setName and setText.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:26:52 +01:00
Michal Čihař
4975ef2bc2 Use new constructor for Item() objects 
This allows to directly set name and text.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:04:02 +01:00
Michal Čihař
1168ed61b4 Share code for routines export 
The exporting of functions and procedures is almost same.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 13:06:28 +01:00
Michal Čihař
c660edd057 Simplify code by removing parallel if statements 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:53:18 +01:00
Michal Čihař
3c90f45020 Simplify shape record loading 
We can use foreach with reference to simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +01:00
Michal Čihař
f4eb1a9b4f There is no need to reset() before foreach() 
The code is there since past when PHP 4 was still supported reset was
necessary.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 11:26:34 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Marc Delisle
49302ec644 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-04 07:40:11 -05:00
Michal Čihař
4d74053e3f Remove not used controluser support from PMA_importRunQuery 
This code was never executed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:29:51 +01:00
Marc Delisle
3f97698382 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 08:25:39 -05:00