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

184 Commits

Author SHA1 Message Date
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
Marc Delisle
9b788276fc Fix coding style 2013-10-28 06:01:57 -04:00
Spun Nakandala
8747100928 Bug Fix 4138 2013-10-28 00:52:15 +05:30
Michal Čihař
cb5e1cb966 Various coding style fixes 2013-08-07 13:21:59 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Atul Pratap Singh
78cf1c4e22 Left while fixing 4006 2013-07-29 19:37:43 +05:30
Michal Čihař
80e6ecc1c2 Merge commit '5d590ef3d67b4f87b58dbda50e86519bf9b64d34' 
Conflicts:
	import.php
 2013-07-29 15:00:07 +02:00
Atul Pratap Singh
5d590ef3d6 Fix bug#4006 2013-07-29 17:36:45 +05:30
Spun Nakandala
3dd358746d removed include sql.php from import.php 2013-07-27 23:18:06 +05:30
Spun Nakandala
c44eb79b49 no use of the code segment 2013-07-27 23:18:04 +05:30
Marc Delisle
fd111566c9 Fix merge conflict 2013-06-30 06:41:44 -04:00
Marc Delisle
0124642684 [security] Global variables scope injection vulnerability (see PMASA-2013-7) 2013-06-28 13:09:13 -04:00
Marc Delisle
c4883127c7 This file should not end in .lib.php 2013-06-16 08:08:07 -04:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems 
Thanks Rasmus Lerdorf for analyzing!
 2013-05-13 11:27:56 +02:00
Kasun Chathuranga
42256b2d0c PMA_DBI_select_db --> PMA_DBI_selectDb 2013-05-04 08:26:27 +05:30
Marc Delisle
6e88efd282 Fix merge conflicts 2013-04-27 16:43:04 -04:00
J.M
8bf86d9a7a Fix bug #3891 Server upload folder import file name missing in success message 2013-04-27 21:16:31 +02:00
J.M
1f7336f540 Fix bug #3890 [import] Web server upload directory import fails 2013-04-26 12:13:07 +02:00
Madhura Jayaratne
324e4dbe73 Merge branch 'QA_4_0' 
Conflicts:
	ChangeLog
 2013-04-25 20:54:51 +05:30
Kasun Chathuranga
06655bf45d Fix bug #3879 Import broken for CSV using LOAD DATA 2013-04-17 23:25:16 +05:30
Madhura Jayaratne
466a7645c7 PHP keywords must be lowercase 2013-04-12 21:45:02 +05:30