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

106421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
f792f294f2 Disable setup if configuration already exists 
The setup allows to figure out quite a lot about system and network, so
it's safer to block access to it once phpMyAdmin has been configured.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 11:36:32 +01:00
Michal Čihař
c962ee4287 Remove setup download/load/delete features 
This removes risk of third party manipulating with the configuration as
there was race condition between editing and using the file.

Downloading the file should not be big hassle and this really makes the
whole setup a bit simpler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 11:34:42 +01:00
Michal Čihař
695a488c42 Do not allow arbitrary connection in replication setup without AllowArbitraryServer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 11:10:32 +01:00
Michal Čihař
e1d9e31dff Merge branch 'QA_4_6' into QA_4_6-security 2016-12-21 11:10:25 +01:00
Michal Čihař
6f01864e89 Fixed moving of columns with whitespace in name 
Fixes #12841

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 10:45:52 +01:00
Michal Čihař
c8a15f2212 Merge remote-tracking branch 'origin/pull/12815' into QA_4_6 2016-12-20 16:44:44 +01:00
Michal Čihař
09da5eb49f Test both with and without phpseclib 
This ensures we generate compatible data in both cases.

Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:40:31 +01:00
Michal Čihař
30cd5fc358 Use same encryption key with openssl and phpseclib 
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:38:34 +01:00
Michal Čihař
03bc52f6dc Correctly report OpenSSL errors from cookie encryption 
Without calling openssl_error_string() we pollute openssl global state
and some other library might report this as failure (eg. mysqlnd driver
when connecting to SSL enabled server).

Fixes #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:38:03 +01:00
Michal Čihař
b866371b9a Determine whether to use openssl just once 
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:30:51 +01:00
Michal Čihař
d730db1259 Add some missing html encoding 
Issue #12804

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 17:13:43 +01:00
Michal Čihař
a856a61c9d Fix HTTP auth test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 16:20:51 +01:00
Michal Čihař
ffe68c7219 Honor user configured connection collation 
* the user set collation is now honored
* default value has been changed to utf8mb4
* it is downgraded to utf8 if server does not support it

Fixes #12826

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 16:18:21 +01:00
Michal Čihař
2557709949 Merge pull request #12807 from nijel/cookie-fatal 
Do not delete session on fatal error
 2016-12-19 15:28:07 +01:00
Michal Čihař
7d361806c3 Share code for rendering custom header and footer 
Fixes #12802

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 15:20:12 +01:00
Michal Čihař
e267c6f9af Merge remote-tracking branch 'origin/pull/12803' into tmp 2016-12-19 15:06:30 +01:00
Michal Čihař
53274555b6 Add source release support 
See #12348

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 14:44:20 +01:00
Michal Čihař
7ad21270c4 Remove .htaccess from tests 
Issue #12348

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 13:35:28 +01:00
Weblate
59934c2914 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-19 09:15:31 +01:00
Franco
391c79e177 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-19 09:15:30 +01:00
Deven Bansod
33af5ac3d6 Uncomment mistakenly commented Selenium testing setting 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-19 13:45:00 +05:30
Isaac Bennetch
ea619794e5 Fix documentation markup 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-17 10:16:55 -05:00
Deven Bansod
967755a1de ChangeLog for #12814 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-15 09:49:58 +05:30
Deven Bansod
352a5d79d5 MySQL allows precision to be specified for DATETIME, TIME type fields too 
Fix #12814

Ref : http://dev.mysql.com/doc/refman/5.7/en/fractional-seconds.html

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-15 09:47:17 +05:30
Marc Delisle
128b0279de Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-15 00:48:27 +01:00
Marc Delisle
ba5212cb46 Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-15 00:46:22 +01:00
dingo thirteen
96c267cdf7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-14 20:31:15 +01:00
Isaac Bennetch
e3a4bfe757 Fix display of custom header and footer in certain edge cases. 
Issues #12801 and #12802

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-14 12:32:42 -05:00
Michal Čihař
96350a7984 Do not use control link when working with stored procedures 
Fixed stored procedure execution.

Fixes #12813

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-14 15:57:39 +01:00
Michal Čihař
eec9d3f3dd Use === to avoid suprises with numeric table names 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-14 15:34:39 +01:00
Michal Čihař
715bdf3a49 Fixed operation with lower_case_table_names=2 
The problem is that mysqli_fields_meta returns orgtable as lowercase
making phpMyAdmin treat it as alias later nad finding no fields for
original table.

Fixes issue #11816

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-14 15:29:43 +01:00
Παναγιώτης Παπάζογλου
92d41e4d7f Translated using Weblate (Greek) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-14 15:29:34 +01:00
Phillip Rohmberger
30bfba75da Translated using Weblate (German) 
Currently translated at 99.5% (3206 of 3222 strings)

[CI skip]
 2016-12-14 15:29:34 +01:00
Domen
16c72323d1 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-14 10:30:30 +01:00
Weblate
9f775e4b0b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-13 16:50:22 +01:00
Stefano Martinelli
ceec247a20 Translated using Weblate (Italian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-13 16:50:20 +01:00
Giovanni Sora
e40d0439fd Translated using Weblate (Interlingua) 
Currently translated at 74.7% (2408 of 3222 strings)

[CI skip]
 2016-12-13 16:50:20 +01:00
monicagrau
fd897920d7 Translated using Weblate (Catalan) 
Currently translated at 99.2% (3199 of 3222 strings)

[CI skip]
 2016-12-13 16:50:19 +01:00
Michal Čihař
ef4e584eea Fix return value documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 16:13:18 +01:00
Michal Čihař
73499a5e56 Do not delete session on fatal error 
I see no reason why this should be done, the fatal error is used
in following cases:

* Very early when there is no session (eg. missing extension)
* Invalid value for parameters
* Invalid invocation like too big request

In neither case session removal will do any good.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 11:51:43 +01:00
Weblate
a1fa82f39b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-13 11:24:18 +01:00
Giovanni Sora
ca1abc679c Translated using Weblate (Interlingua) 
Currently translated at 74.7% (2407 of 3222 strings)

[CI skip]
 2016-12-13 11:24:16 +01:00
Michal Čihař
15f63f3d96 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-12-13 11:23:06 +01:00
Michal Čihař
a86450728a Translated using Weblate (Czech) 
Currently translated at 93.8% (3023 of 3222 strings)

[CI skip]
 2016-12-13 11:22:56 +01:00
Michal Čihař
719cb1f309 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-12-13 11:22:43 +01:00
Michal Čihař
e922991f33 Merge branch 'QA_4_6' into QA_4_6-security 2016-12-13 11:18:32 +01:00
Michal Čihař
2b134240b8 Share code for session cache key calculation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 11:17:58 +01:00
Burak Yavuz
2e561a296e Translated using Weblate (Turkish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-13 11:04:48 +01:00
Michal Čihař
665a5fcbe2 Merge branch 'QA_4_6' into QA_4_6-security 2016-12-13 10:55:08 +01:00
Michal Čihař
8d5939348e Use current user in session cache key 
This makes it automatically valid only for current user.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:54:08 +01:00