Commit Graph

72 Commits

Author SHA1 Message Date
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ř
f0ad030460 Merge branch 'QA_4_6-security' into master-security 2016-07-13 10:34:31 +02:00
Michal Čihař
c3a3531b61 Escape HTML markup in transformation wrapper
...in case content type is html.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-13 10:32:55 +02:00
Michal Čihař
9e3492730e Do not use empty MIME type
This will turn on content sniffing in browser leading to unwanted
results.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-13 10:28:38 +02:00
Michal Čihař
71ccd06aa9 Merge branch 'QA_4_6-security' into master-security 2016-07-13 09:38:56 +02:00
Michal Čihař
551031da09 Validate image scaling dimensions
Ensure we pass only integers and they are not too big.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-13 09:38:33 +02:00
Madhura Jayaratne
7f082b0d6b This is an inc file
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-03-10 19:31:16 +11:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes.
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:22:52 +02:00
Rahul Kadyan
4d308ba364 Remove unneeded closing tags
Closing tags at the end of file are not mandatory. It is often
suggested to omit to closing tags at the end of file to prevent
unwanted effects as PHP will start output buffering if there is
any character after closing tag.

Reference: http://php.net/manual/en/language.basic-syntax.phptags.php

Signed-off-by: Rahul Kadyan <hi@znck.me>
2015-03-06 23:37:35 +05:30
Hugues Peccatte
49ababac08 Replace mb functions by standard string functions.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-04 10:09:06 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls.
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-28 20:53:01 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Marc Delisle
aeaf96dc9a Directly use the request parameters 2013-08-21 05:48:31 -04:00
Michal Čihař
8e71b13ced CS compliant transformation helper functions 2013-08-07 10:53:09 +02:00
Michal Čihař
bf8bb147e4 Various coding style fixes 2013-08-06 16:04:11 +02:00
Madhura Jayaratne
3dd99512f0 These constants are better as a part of DatabaseInterface class 2013-05-26 21:15:24 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Kasun Chathuranga
5bcc32999f PMA_DBI_fetch_assoc --> PMA_DBI_fetchAssoc 2013-05-04 08:30:12 +05:30
Kasun Chathuranga
42256b2d0c PMA_DBI_select_db --> PMA_DBI_selectDb 2013-05-04 08:26:27 +05:30
Madhura Jayaratne
466a7645c7 PHP keywords must be lowercase 2013-04-12 21:45:02 +05:30
Madhura Jayaratne
30f6b231df Coding style - null should be lower case 2012-10-28 15:07:59 +05:30
Marc Delisle
01e8487a51 Fix merge conflicts 2012-10-16 12:22:25 -04:00
Marc Delisle
862778acc1 bug #3577468 [display] Incorrect imagejpeg Syntax Breaks Image Transformation 2012-10-16 12:20:19 -04:00
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
Alex Marin
e330544b91 merge master 2012-07-02 20:05:34 +03:00
Alex Marin
3754538e2c Add neutral string for transformations in pma_column_info 2012-07-02 19:37:06 +03:00
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Rouslan Placella
a054562100 PMA_Footer and PMA_Header no longer need to be singletons 2012-06-11 14:06:03 +01:00
Rouslan Placella
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
Madhura Jayaratne
10510e16b4 Fix function name: PMA_download_header -> PMA_downloadHeader 2012-06-01 21:52:30 +05:30
Madhura Jayaratne
8243eace0f Wrap some long lines 2012-04-30 23:23:50 +05:30
Marc Delisle
1215f3ac88 No longer depend on grab_globals 2012-03-15 12:38:28 -04:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Michal Čihař
46c5bfc01d Fix transformation without download 2011-09-01 14:29:03 +02:00
Michal Čihař
91fb4888e2 Fix parameter order 2011-09-01 14:27:59 +02:00
Piotr Przybylski
66665f326a Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_qbe.php
	js/server_status.js
	libraries/export/xml.php
	libraries/schema/Pdf_Relation_Schema.class.php
	tbl_printview.php
	tbl_structure.php
2011-08-04 20:19:43 +02:00
Michal Čihař
1a5154bd87 Use new function for download headers 2011-08-04 14:29:56 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
2011-07-22 11:07:04 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql()
Fix PMA_DBI_get_columns() in Drizzle when $full == false
2011-06-17 00:22:25 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Marc Delisle
9785bbc561 remove author names 2010-03-26 17:44:10 -04:00
Marc Delisle
87b994743b primary_key is really a WHERE clause (that works also on tables where no PK is defined) 2009-12-30 15:27:27 +00:00
Michal Čihař
84ae0420fe Adding @package, third part. 2008-11-24 11:22:44 +00:00