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

6380 Commits

Author SHA1 Message Date
Michal Čihař
e07929af7a Description for Turkmen language 2011-12-28 15:28:25 +01:00
Madhura Jayaratne
25b78bef1b Merge branch 'QA_3_4' 2011-12-24 21:33:35 +05:30
Madhura Jayaratne
cd294e5b97 bug #3049209 [import] Import from ODS ignores cell that is the same as cell before 2011-12-24 21:31:08 +05:30
Yuichiro
f6a6063850 Improved % escape 2011-12-19 14:44:26 +01:00
Madhura Jayaratne
d6f12a7044 but #3461750 [edit] Sort by key generates wrong sql with limit clause 2011-12-18 10:58:25 +05:30
Madhura Jayaratne
21bf7ce381 bug #3299486 [prettyprint] Order By in a query containing comment character - part2 - sort by fey 2011-12-18 08:38:45 +05:30
Madhura Jayaratne
5b62968f47 Swap odd, even in RTE 2011-12-17 23:28:12 +05:30
Madhura Jayaratne
41b956936b Changes to facilitate more data in a page 2011-12-17 21:27:59 +05:30
Madhura Jayaratne
6e74bc172a Coding style improvements 2011-12-17 18:53:37 +05:30
Madhura Jayaratne
902074a314 Avoid undefined variable notice 2011-12-17 18:44:33 +05:30
Marc Delisle
c03228e7f7 Fix merge conflicts 2011-12-16 12:06:10 -05:00
Sven Strickroth
a9d9890726 fixed typo 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-12-16 11:38:45 -05:00
Sven Strickroth
797ec6faf0 added spaces to improve look and feel of output 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-12-16 11:38:35 -05:00
Sven Strickroth
7ef064f648 add backquotes to improve look and feel of output 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-12-16 11:38:24 -05:00
Sven Strickroth
9fc23c8824 escape single quotes in column names 
Column names like `id'` must be escaped in a PHP string

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-12-16 11:38:14 -05:00
Sven Strickroth
e43ed55b04 fix invalid PHP variable names 
Tables with names like `0-` are allowed in SQL, but not in PHP variable names

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-12-16 11:37:55 -05:00
Michal Čihař
9502e57c34 Whitespace cleanup 2011-12-16 15:35:35 +01:00
Michal Čihař
c296064614 Fix sort order 2011-12-16 15:28:49 +01:00
Michal Čihař
16290082b6 Update reference 2011-12-16 15:15:04 +01:00
Michal Čihař
eafecac2e8 Add MySQL 5.5 reserved words 2011-12-16 15:14:33 +01:00
Michal Čihař
6adcae4164 Add FALSE as reserved word (bug#3460596) 2011-12-16 15:12:32 +01:00
Michal Čihař
7a997072d1 Update TCPDF to 5.9.141 2011-12-16 14:55:46 +01:00
Rouslan Placella
64d4f8b00c Merge branch 'QA_3_4' 2011-12-15 23:03:54 +00:00
Rouslan Placella
5130615c0a Fixed bug # 3460090 - TextareaAutoSelect feature broken 2011-12-15 23:03:03 +00:00
Rouslan Placella
e5c094d080 Rows in index list are not clickable 2011-12-15 13:48:57 +00:00
Michal Čihař
2c4e79edc0 Do not store too many error messages in session 
In case of some bug in our code (like missing flags on fields meta in
mysql DBI), the session would explode to huge size (hundreths of
megabytes). Now we limit number of messages to store to 20 (what should
be more than enough for regular usage). Developers still should have
$GLOBALS['cfg']['Error_Handler']['gather'] enabled and will get all
errors.
 2011-12-14 18:05:20 +01:00
Marc Delisle
3553fe63ee 3.4.10-dev 2011-12-14 08:12:21 -05:00
Marc Delisle
c555fc1b34 Fix merge conflicts 2011-12-14 08:00:51 -05:00
Marc Delisle
ba255de1b2 Fix merge conflicts 2011-12-14 07:54:50 -05:00
Michal Čihař
cdffe9fb97 Merge remote-tracking branch 'origin/QA_3_4' 
Conflicts:
	libraries/dbi/mysql.dbi.lib.php
 2011-12-14 10:06:36 +01:00
Michal Čihař
da62d86238 These are done and we do not seem to use decimals 2011-12-14 10:00:01 +01:00
Michal Čihař
91241f71d3 Fill orgtable and orgname attributes 2011-12-14 09:58:47 +01:00
Michal Čihař
cec8f1b094 Add actually some sane value to field flags 2011-12-14 09:56:02 +01:00
Michal Čihař
a074b4c6e2 Create fake flags field 
The content is empty for now, but at least the code will not emit
warnings on every access to it (which is quite often). The proper value
calculation should be added later.
 2011-12-14 09:49:51 +01:00
Michal Čihař
ea64f8f731 Whitespace cleanup 2011-12-14 09:49:35 +01:00
Michal Čihař
0e707906e6 [security] Self-XSS in setup (host parameter), see PMASA-2011-19 2011-12-13 12:42:39 -05:00
Yuichiro
ad5ae4ceb0 Add gettext 2011-12-12 14:03:46 +01:00
Rouslan Placella
628a0c6469 Speed up PMA_getImage() 2011-12-11 23:01:03 +00:00
Madhura Jayaratne
84b8281c1a Coding style improvements 2011-12-11 14:58:35 +05:30
Dieter Adriaenssens
bd3735ba58 [security] Self-XSS on export options (export server/database/table), see PMASA-2011-20 2011-12-10 17:10:41 +01:00
Madhura Jayaratne
173e5926a0 More coding style improvements 2011-12-08 00:01:02 +05:30
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Madhura Jayaratne
a7c00f719f Coding style improvements - Control structures 2011-12-07 22:45:13 +05:30
Madhura Jayaratne
7ac39c04c2 Merge branch 'QA_3_4' 
Conflicts:
	libraries/Table.class.php
 2011-12-07 08:53:13 +05:30
Madhura Jayaratne
6e0a10494f bug #3452506 [edit] Unable to move tables with triggers 2011-12-07 08:33:28 +05:30
Marc Delisle
6a786a859e Merge branch 'QA_3_4' 2011-12-05 14:14:26 -05:00
Marc Delisle
b02f4eec07 bug #3384035 [display] Problems regarding ShowTooltipAliasTB 2011-12-05 14:14:13 -05:00
Marc Delisle
63ffeebcf8 Merge branch 'QA_3_4' 2011-12-05 11:04:28 -05:00
Marc Delisle
d68c8bb8ed bug #3398788 [session] No feedback when result is empty (signon auth_type) 2011-12-05 11:04:16 -05:00
Dieter Adriaenssens
04a26c3cfd typo 2011-11-30 16:48:57 +01:00
Dieter Adriaenssens
e82584aaee coding style : use lower case constant false 2011-11-30 16:36:37 +01:00
Michal Čihař
e448774704 Improve description of MaxTableUiprefs 2011-11-30 14:17:39 +01:00
Dieter Adriaenssens
b4b9b34ec5 clarify function descriptions 2011-11-29 21:40:42 +01:00
Marc Delisle
3dce618b7b Merge branch 'QA_3_4' 2011-11-26 06:54:49 -05:00
Marc Delisle
5e61730157 bug #3438420 [core] Magic quotes removed in PHP 5.4 2011-11-26 06:54:40 -05:00
Marc Delisle
277b6a96fa Merge branch 'QA_3_4' 2011-11-26 06:17:16 -05:00
Marc Delisle
dddcddbf38 bug #3442004 [interface] DB suggestion not correct for user with underscore 2011-11-26 06:17:08 -05:00
Madhura Jayaratne
bbc44c410c Merge branch 'QA_3_4' 
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
	libraries/display_tbl.lib.php
 2011-11-25 18:25:13 +05:30
Madhura Jayaratne
9c278d020c bug #3442028 [edit] Inline editing enum fields with null shows no dropdown 2011-11-25 18:12:53 +05:30
Marc Delisle
c43babad7c 3.4.9-dev 2011-11-24 17:05:44 -05:00
Marc Delisle
96dd071a5f Fix merge conflicts 2011-11-24 16:54:25 -05:00
Dieter Adriaenssens
f62c4a1809 coding style : control structures 2011-11-24 15:32:30 +01:00
Dieter Adriaenssens
90bd76540c coding style : correct use of includeonce() 2011-11-24 14:47:45 +01:00
Dieter Adriaenssens
077c10020e [security] Self-XSS on invalid query (table overview), see PMASA-2011-18 2011-11-22 21:59:19 +01:00
Marc Delisle
b289fe0824 [security] Self-XSS on database names (Synchronize), see PMASA-2011-18 2011-11-21 17:53:10 -05:00
Marc Delisle
29e658a1f7 Merge branch 'QA_3_4' 2011-11-21 12:42:07 -05:00
Marc Delisle
e2b6af5a99 Avoid showing the password in phpinfo()'s output 2011-11-21 12:41:13 -05:00
Madhura Jayaratne
8fa909da78 Merge branch 'QA_3_4' 
Conflicts:
	libraries/server_synchronize.lib.php
 2011-11-20 22:33:02 +05:30
Madhura Jayaratne
81f6766f96 bug #3439292 [core] Fail to synchronize column with name of keyword 2011-11-20 22:18:55 +05:30
Madhura Jayaratne
b5c45d0d35 White space cleanup 2011-11-20 21:52:22 +05:30
Madhura Jayaratne
7d2718801e Coding style improvements 2011-11-20 18:30:56 +05:30
Rouslan Placella
46fbe36b6b Wrapped the "Indexes" and "Information" sections from tbl_structure.php in fieldsets 2011-11-19 14:43:52 +00:00
Rouslan Placella
f8e6631dfd "No index" or "duplicate indexes" on a column are not errors 2011-11-19 14:43:52 +00:00
Marc Delisle
c2a8246bc8 Merge branch 'QA_3_4' 2011-11-19 07:03:12 -05:00
Marc Delisle
8219f7c544 When ShowTooltipAliasTB is true, VIEW is wrongly shown as the view name in main panel db Structure page 2011-11-19 07:02:54 -05:00
Marc Delisle
584fa4d2c8 Merge branch 'QA_3_4' 2011-11-15 12:48:29 -05:00
Remi COLLET
ac430ea21d patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 2011-11-15 12:47:28 -05:00
Marc Delisle
3142c0caf1 See bug #3418579. In commit f2fe4db5f1 
this global definition was removed, causing the bug.
 2011-11-12 11:00:37 -05:00
Marc Delisle
979209c4cc Code cleanup 2011-11-12 10:18:35 -05:00
Thomas Hergenhahn
7cd6894257 patch #3432835 [interface] Add useful intermediate pages to pageselector 2011-11-12 10:15:12 -05:00
Michal Čihař
c672292268 rfe #1632106 [interface] Improved error handling 2011-11-10 15:44:00 +01:00
Marc Delisle
839c0d493a Merge branch 'QA_3_4' 2011-11-10 09:00:13 -05:00
Marc Delisle
edea25b07b Merge branch 'MAINT_3_4_7' into QA_3_4 2011-11-10 08:56:39 -05:00
Michal Čihař
34d99de000 Disable XML loading plugins on old PHP 
When libxml_disable_entity_loader is not available, we can not guarantee
safe handling of XML data.
 2011-11-07 15:18:10 +01:00
Michal Čihař
f496bc9f1f Better error message 2011-11-07 15:16:47 +01:00
Michal Čihař
a5e206fbd2 Disable loading of external XML entities when loading XML 
Fixes CVE-2011-4107
 2011-11-07 14:47:54 +01:00
Rouslan Placella
a00fc340f9 Merge branch 'menubar' 2011-11-05 14:36:08 +00:00
Rouslan Placella
75a7e6f50b Generate the "floating_menubar" element in PHP to avoid firing it's JS handler in the navi frame 2011-11-05 14:05:13 +00:00
Marc Delisle
02d5799893 Fix merge conflicts 2011-11-05 10:00:50 -04:00
Robert Scheck
8170d03d3c Patch by Robert Scheck <robert@fedoraproject.org> 
for phpMyAdmin >= 3.4.7, which makes the php-gettext
library that is used configurable, which is helpful or even required for
some vendors or downstreams. The default is the internal library to keep
backward compatibility. More details can be found at SourceForge:
https://sourceforge.net/tracker/?func=detail&aid=3433770&group_id=23067&atid=377410
 2011-11-05 09:57:28 -04:00
Rouslan Placella
15b25f93e9 Fixed incorrect display of breadcrumbs in RTL mode 2011-11-04 14:43:25 +00:00
Marc Delisle
7ea269797d Typo 2011-11-02 15:29:12 -04:00
Marc Delisle
8d3bb76d26 Typo 2011-11-02 15:25:58 -04:00
Marc Delisle
4e2533f506 Typo 2011-11-02 15:17:48 -04:00
Marc Delisle
4c123bc560 Change to a similar message 2011-11-02 15:03:30 -04:00
Marc Delisle
0b16d690d2 Fix merge conflicts 2011-11-02 12:41:13 -04:00
Marc Delisle
d22fae4201 bug #3428065 [parser] TRUE not recognized by parser 2011-11-02 12:39:43 -04:00
Marc Delisle
00576dc1bb Fix merge conflicts 2011-10-31 12:36:45 -04:00
Marc Delisle
a691fce64c bug #3428627 [import] ODS import ignores memory limits 2011-10-31 12:35:02 -04:00
Marc Delisle
6f7ca79218 patch #3410688 [interface] Improving field size for character columns 2011-10-30 05:35:00 -04:00