webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
108,618 Commits 12 Branches 481 Tags
9ecda4175b6c19c781cf23254da151bfa15eb81a
Commit Graph

1136 Commits

Author SHA1 Message Date
Isaac Bennetch
77c33d0444 Rename Relations to Relationships in many places; Fixes issue #12536 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-13 18:20:30 -05:00
Michal Čihař
10416615cd Merge remote-tracking branch 'origin/pull/12799' 2017-01-02 16:15:58 +01:00
Ashus
10e93cea0c CRLF fix 
Signed-off-by: Ashus <github.com@ashus.net>
 2016-12-29 19:22:45 +01:00
Ashus
32f3203ed0 Documentation added, default configuration values altered to match default PHP values. 
Signed-off-by: Ashus <github.com@ashus.net>
 2016-12-29 19:17:19 +01:00
Michal Čihař
92aa487c54 Merge branch 'QA_4_6' 2016-12-20 14:44:03 +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ř
9835791bff Fix empty password login for http authetication 
Fixes #12828

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 16:01:00 +01:00
Michal Čihař
945e615253 Merge branch 'QA_4_6' 2016-12-19 15:23:31 +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
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ř
48144987d8 Ensure font size is integer, we do further calculations with it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:29:40 +01:00
Ashus
e63ffe1ab8 Added SignonCookieParams parameter 
Signed-off-by: Ashus <github.com@ashus.net>
 2016-12-10 15:52:44 +01:00
Michal Čihař
308c9d7951 Simplify Response object handling 
- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 18:17:59 +01:00
Michal Čihař
081843aa5c Fixed SQL export with newlines 
Remove manual escaping where we do proper escaping through MySQL
extension.

Fixes #12765

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-05 16:08:03 -05:00
Michal Čihař
9772df3518 Merge branch 'QA_4_6' 2016-12-01 11:49:37 +01:00
Michal Čihař
e61b2135da Fixed SQL export with newlines 
Remove manual escaping where we do proper escaping through MySQL
extension.

Fixes #12765

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 11:02:04 +01:00
Michal Čihař
3bd6d4c645 Merge branch 'QA_4_6' 2016-11-30 13:38:38 +01:00
Michal Čihař
05a258778f ReCaptcha now works without allow_url_fopen 
Fixes #12588

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 13:37:46 +01:00
Isaac Bennetch
1f24e5c755 Merge branch 'master-security' 2016-11-25 01:22:59 -05:00
Isaac Bennetch
253894e299 Resolve merge conflicts with ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-24 11:03:58 -05:00
Michal Čihař
cf7a731ca1 Merge branch 'QA_4_6' 2016-11-18 11:01:10 +01:00
Michal Čihař
53f07e7179 Remove protection against < in HTTP Authorization header 
It really doesn't make sense here as the username can potentionally
contain < anyway and we need to deal with it later (and we do).

Fixes #12710

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-18 11:00:11 +01:00
Deven Bansod
0fa45dae24 Merge branch 'QA_4_6' 2016-11-14 11:07:06 +05:30
Deven Bansod
ea1e3e3a6f Remove old sqlAddslashes call 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-14 10:45:10 +05:30
Michal Čihař
df0d8a06d3 Merge branch 'master' into master-security 2016-11-10 11:09:32 +01:00
Michal Čihař
970de0ac7a Merge branch 'QA_4_6' into QA_4_6-security 2016-11-10 11:09:21 +01:00
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Michal Čihař
daae30499f Merge branch 'master' into master-security 2016-11-08 15:59:39 +01:00
Deven Bansod
e2dac31bdb Refactor the language selector display into a template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-31 09:02:59 +05:30
Deven Bansod
f14cffdbe7 Properly escape strings in MySQL statement values 
Use *_real_escape string functions provided by connectors to escape strings while exporting

Fix #12453

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/server_privileges.lib.php
 2016-10-29 10:45:12 +05:30
Michal Čihař
2ed64c3c6a Merge branch 'master' into master-security 2016-10-24 13:55:39 +02:00
Michal Čihař
47078395c2 Merge branch 'QA_4_6' into QA_4_6-security 2016-10-24 13:55:29 +02:00
Michal Čihař
75a5fde46d Use secure.php.net for PHP documentation links 
This avoids unnecessary redirect on the way (I still think this website
setup is weird, but that's all I can do about it).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 11:13:24 +02:00
Deven Bansod
c00cf34886 Use IF EXISTS with DROP Database while exporting to prevent error while importing this dump 
Fix #12634

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 10:00:50 +05:30
Deven Bansod
6ed1da5a45 Merge branch 'QA_4_6' 2016-10-14 09:59:32 +05:30
Deven Bansod
41b07b2009 Use IF EXISTS with DROP Database to prevent error while importing 
Fix #12634

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 09:54:50 +05:30
Michal Čihař
6f8edef792 Merge branch 'master' into master-security 2016-09-26 13:47:05 +02:00
Michal Čihař
6cbcc319b1 Fix function name 
Fixes #12505

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:41:33 +02:00
Michal Čihař
5a1854c2b7 Merge branch 'QA_4_6-security' into master-security 2016-09-19 11:53:49 +02:00
Michal Čihař
fbad6b9b4d Verify value of access_time to avoid unwanted session extension 
We need to ansure the access_time parameter is in valid range to avoid
possibility of remotely extending session validity.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-19 11:53:07 +02:00
Michal Čihař
07b846f94b Merge branch 'master' into master-security 2016-09-19 11:37:08 +02:00
Michal Čihař
a2ab6a04af Define namespace as constant 
Also use PHP 5.5 compatible way of defining static variable.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 13:21:20 +02:00
Michal Čihař
1d09172f14 Turn OpenDocument wrapper to a class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 11:49:53 +02:00
Michal Čihař
19c24a8c6c Merge branch 'master' into master-security 2016-09-16 10:30:28 +02:00
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty 
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:21 +02:00
Michal Čihař
6e3d38a1d3 Use strlen for calculating string index 
Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:18:46 +02:00
Michal Čihař
809a75eb92 Merge branch 'master' into master-security 2016-09-16 09:49:28 +02:00
Michal Čihař
e52ceecb3d Ensure font size is integer, we do further calculations with it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-05 18:46:01 +02:00