gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,867 Commits 12 Branches 481 Tags 2.4 GiB
3bdf520bcb
Commit Graph

246 Commits

Author SHA1 Message Date
Rouslan Placella
372335a8ca Removed some references to the non-existent header.inc.php file 2012-06-11 14:06:02 +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
e1a4f227fd Fix function name: PMA_get_real_size -> PMA_getRealSize 2012-06-01 21:58:59 +05:30
Madhura Jayaratne
3849390b8b Fix function name: PMA_array_merge_recursive -> PMA_arrayMergeRecursive 2012-06-01 21:57:07 +05:30
Madhura Jayaratne
d51ed9835c Fix function name: PMA_no_cache_header -> PMA_noCacheHeader 2012-06-01 21:54:24 +05:30
Madhura Jayaratne
10510e16b4 Fix function name: PMA_download_header -> PMA_downloadHeader 2012-06-01 21:52:30 +05:30
Madhura Jayaratne
381ae7b85a Fix function name: PMA_array_read -> PMA_arrayRead 2012-06-01 21:46:31 +05:30
Madhura Jayaratne
0a595f1f54 Fix function name: PMA_array_write -> PMA_arrayWrite 2012-06-01 21:44:33 +05:30
Madhura Jayaratne
ddc575ca04 Fix function name: PMA_array_remove -> PMA_arrayRemove 2012-06-01 21:41:59 +05:30
Madhura Jayaratne
8649b8263c Fix function names: PMA_AddJSCode -> PMA_addJSCode 2012-05-25 22:45:21 +05:30
Madhura Jayaratne
1427b2f2de Fix function names: PMA_AddJSVar -> PMA_addJSVar 2012-05-25 22:43:23 +05:30
Madhura Jayaratne
d603a16316 Documentation comments 2012-05-12 21:53:59 +05:30
Michal Čihař
08ceb6e44d Pass parameter as parameter instead of defining constant 2012-05-11 14:46:02 +02:00
Michal Čihař
54dc10a012 Use PMA_fatalError instead of die 2012-05-09 11:58:10 +02:00
Michal Čihař
3bd724c9f7 Not used assignment 2012-05-09 11:47:25 +02:00
Madhura Jayaratne
ec9a8cf997 Coding style improvements 2012-05-01 19:38:04 +05:30
Dieter Adriaenssens
543087f54c fix indentation 2012-04-29 00:40:12 +02:00
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Michal Čihař
34b1d28c7b Wrap lines 2012-04-27 09:08:49 +02:00
Michal Čihař
6da791caaa This no longer applies 2012-04-27 08:36:55 +02:00
Michal Čihař
cd8f5eefaa Document IE special header 2012-04-27 08:36:09 +02:00
Michal Čihař
b6470f7a0b Already has tests 2012-04-27 08:32:39 +02:00
Madhura Jayaratne
50e6f3b387 Coding style improvements (ControlSignature) 2012-04-25 23:02:37 +05:30
Michal Čihař
7cbad5b280 Do not delete session on invalid params (bug #3519580) 2012-04-20 11:56:18 +02:00
Dieter Adriaenssens
0f772aa173 check if PHPMYADMIN is set 2012-04-14 16:51:26 +02:00
Jo Michael
00b897ba34 Allow js_includes wrapped in IE-conditional comments 2012-04-01 19:15:02 +02:00
Marc Delisle
a196cbd85f Merge pull request #7 from mynetx/master 
Various
 2012-03-18 12:09:23 -07:00
Madhura Jayaratne
d5d3d2bba4 Use 'void' if nothing is returned 2012-03-18 10:04:39 +05:30
Jo Michael
891abb9f86 Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin 2012-03-17 16:32:07 +01:00
Jo Michael
3b56f6a53b Leading ./ paths for links and favicons can be omitted, part 1 2012-03-16 23:04:12 +01:00
Madhura Jayaratne
ed219b5446 Coding style improvements 2012-03-17 01:13:00 +05:30
Marc Delisle
8481a0265d Typo 2012-02-26 07:55:50 -05:00
Marc Delisle
63508c4018 No longer globalize HTTP_ACCEPT_LANGUAGE 2012-02-26 07:54:55 -05:00
Marc Delisle
87183ee0e1 Remove BLOBstreaming support; will need to run update-po after releasing version 3.5 2012-02-17 09:25:45 -05:00
Dieter Adriaenssens
90bd76540c coding style : correct use of includeonce() 2011-11-24 14:47:45 +01: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ř
88c5f90e53 Merge branch 'QA_3_4' 
Conflicts:
	libraries/core.lib.php
	libraries/sanitizing.lib.php
 2011-10-18 12:46:24 +02:00
Michal Čihař
246b37937b PMA_linkURL can be used from fatal errors early in execution, where library is not yet loaded 2011-10-18 12:42:05 +02:00
Michal Čihař
75d1dce908 PMA_getPHPDocLink can be used from fatal errors early in execution, where gettext is not yet loaded 2011-10-18 12:41:42 +02:00
Madhura Jayaratne
e96b059dfa Merge branch 'QA_3_4' 2011-09-29 19:45:48 +05:30
Madhura Jayaratne
a9f2c38942 bug #3414744 [core] External link fails in 3.4.5 2011-09-29 19:43:28 +05:30
Dieter Adriaenssens
87459a5cf6 use include() instead of require() when including file conditionally 2011-09-06 22:04:51 +02:00
Michal Čihař
1b8b7a9b93 This is not needed as well 2011-09-01 14:29:39 +02:00
Michal Čihař
46c5bfc01d Fix transformation without download 2011-09-01 14:29:03 +02:00
Dieter Adriaenssens
5c751cd1c0 make die() messages translatable, where possible 2011-08-25 22:38:51 +02:00
Michal Čihař
93255067eb Clarify comment for translators, avoid duplicating message context 2011-08-23 10:37:31 +02:00
Michal Čihař
ef80b78991 Docblocks 2011-08-22 09:10:39 +02:00
Michal Čihař
863d8f2e52 Support for not escaped js code 2011-08-22 09:06:31 +02:00
Dieter Adriaenssens
e82d3c7136 require/include are statements not functions; no parentheses are required 2011-08-21 23:36:10 +02:00
Michal Čihař
4b5ae952dd Function for setting variable 2011-08-19 10:36:22 +02:00
Michal Čihař
d2df35108e Wrap some long lines 2011-08-19 10:33:13 +02:00
Michal Čihař
0829162550 Merge remote-tracking branch 'tyron/master' into integration 
Conflicts:
	js/functions.js
 2011-08-11 11:25:18 +02:00
Michal Čihař
79c5b6b0e2 Replace all possibly dangerous chars in filename of downloaded file 2011-08-10 10:57:44 +02:00
Tyron Madlener
82a1f9c033 addded PMA_AddJSCode() to load js code into the page header 2011-08-09 10:35:53 +03:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Michal Čihař
ff074b1d2f Better parameter name 2011-08-04 15:21:06 +02:00
Michal Čihař
a665c7d8a6 Fix docblock 2011-08-04 15:20:19 +02:00
Michal Čihař
99faf22237 Add missing docs 2011-08-04 15:03:31 +02:00
Michal Čihař
94ac586dba Move avoid_cache to end, it is not used so often as size 2011-08-04 15:02:35 +02:00
Michal Čihař
fa300e3887 Missing doc 2011-08-04 14:59:45 +02:00
Michal Čihař
1369bf2c43 Document weirdness 2011-08-04 14:38:59 +02:00
Michal Čihař
bbaeb8922b Use new function for download headers 2011-08-04 14:37:42 +02:00
Michal Čihař
2283b016bb Use HTTP/1.1 for all browsers 2011-08-04 14:35:36 +02:00
Michal Čihař
6ef6ab3d79 Add some comments 2011-08-04 14:33:11 +02:00
Michal Čihař
7281d04793 Factor out no caching headers 2011-08-04 14:31:32 +02:00
Michal Čihař
e7db079b81 Use predefined PHP constant for date instead of manually defining format 2011-08-04 14:24:15 +02:00
Michal Čihař
aa5156463b Allow spaces in filename 2011-08-04 14:22:41 +02:00
Michal Čihař
b9f1fe6bfa Include no caching headers 2011-08-04 14:18:32 +02:00
Michal Čihař
66f9667a61 Generic function for sending download headers 2011-08-04 14:17:07 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Herman van Rink
cf8ea68f09 Merge remote-tracking branch 'origin/master' into unittesting 2011-07-13 11:58:08 +02:00
Michal Čihař
4b80c81536 Merge branch 'QA_3_4' 2011-07-10 22:47:34 +02:00
Michal Čihař
ed88c4a7b6 Fix error when gettext is not yet loaded and we want to warn. 
This happens when PHP is compiled without session support, which is
checked before gettext is loaded.
 2011-07-10 22:46:46 +02:00
Herman van Rink
cf5d62b7ca Code style 2011-07-05 08:35:15 +02:00
Zarubin Stas
f7d7102d2f - Unit Test grouped by library directory 
- Added configuration file phpunit.xml.dist and bootstraper-dist.php
 - Ignoring phpunit.xml, bootstraper.php and build/
 2011-06-29 20:06:27 +03:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Michal Čihař
fc59c64fbd Merge remote-tracking branch 'origin/QA_3_4' 2011-05-20 10:03:19 +02:00
Michal Čihař
b7a8179eb6 Can not use redirector for setup. 
We currently have no reasonable way to protect it there.
 2011-05-20 09:46:15 +02:00
Michal Čihař
b3a79a9344 Merge remote-tracking branch 'origin/QA_3_4' 2011-05-20 09:02:28 +02:00
Michal Čihař
ecfc8ba4f7 Make redirector require valid token 2011-05-20 09:01:20 +02:00
Marc Delisle
e6211f0c2f Other replacements for easier reading 2011-05-09 12:57:28 -04:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Michal Čihař
9ce8bb0e87 This function needs to be in core.lib as it uses it 2011-02-17 10:50:47 +01:00
Michal Čihař
aa0e0b94a8 Standard link to PHP doc 2011-02-17 10:46:57 +01:00
Dieter Adriaenssens
03cb652cef use correct variable name 2011-02-08 10:19:50 +01:00
Michal Čihař
1208ed935f Factor out code for generating JS inclusion. 2011-02-08 09:27:40 +01:00
Michal Čihař
67e4994490 Single place to handle redirection. 2011-01-31 15:22:25 +01:00
Michal Čihař
aa6fec0532 Remove error.php 
Redirecting to other script introduces possibility of inject custom
messages to it. Though there is no clear security issue in this, it
might confuse users and mistake them to go to external site as it allows
to include links.
 2010-12-07 12:24:21 +01: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
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Michal Čihař
862e3ca2a7 Merge branch 'QA_3_3' 
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
 2010-08-20 13:40:37 +02:00
Michal Čihař
41145feb12 Merge branch 'MAINT_3_3_5' into QA_3_3 
Conflicts:
	ChangeLog
	libraries/common.lib.php
 2010-08-20 13:36:49 +02:00
Michal Čihař
5128563d07 Merge branch 'QA_3_3' 
Conflicts:
	libraries/common.lib.php
	libraries/core.lib.php
 2010-08-20 11:11:27 +02:00
Michal Čihař
893abac3e5 bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php. 
It might be needed from common.inc.php even if PMA_MINIMUM_COMMON is
defined.
 2010-08-20 11:09:15 +02:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
 2010-08-01 23:19:21 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
a47c6e8bea This might be called without initialized gettext. 2010-07-27 09:11:18 +02:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
5684d40059 Documentation. 2010-07-26 16:39:55 +02:00
Michal Čihař
9da795245e It makes no sense load translations here 
Either the message is translated or not, but we can not do much about
it.
 2010-07-26 16:39:04 +02:00
Michal Čihař
180018d4dc Drop suppor from PMA_fatalError for str* variables. 
It is not used anywhere now.
 2010-07-26 16:38:31 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Marc Delisle
56ebe05af7 blob streaming code cleanup (work in progress) 2010-07-22 13:15:27 -04:00
Barry Leslie
f8653e5803 Update blob streaming to match the current API and use the PBMS PHP extension. 2010-07-22 11:23:37 -04:00
Michal Čihař
31244e29d5 Better message for missing extension. 2010-07-21 08:52:35 +02:00
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
fab6eb09ea Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-20 12:30:03 +02:00
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable. 
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
 2010-07-20 12:05:07 +02:00
Crack
68d9c40113 moved Import by LOAD DATA settings to CSV category 
moved PMA_array_* functions to core.lib.php
moved PMA_read_userprefs_fieldnames() to user_preferences.lib.php
server/database/table filename templates are saved to pmadb when "remember template" is checked
 2010-07-04 21:56:46 +02:00
ninadsp
38ac78e3ba merging changes from origin 2010-05-24 18:32:42 +05:30
Michal Čihař
88ff43da9f Remove strError occurences. 2010-05-24 11:27:08 +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
Michal Čihař
e788257512 Generic function to warn about missing extension. 2010-05-05 11:35:14 +02:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Michal Čihař
f9ccd69538 Remove no longer needed language file names. 2010-04-09 13:57:36 +02:00
Marc Delisle
3ca82375d5 continue removing author names in code 2010-04-05 09:16:36 -04:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Michal Čihař
94c2f864ae [core] Remove config data from session as it brings chicken-egg problem. 
Configuration data stores PmaAbsoluteUri, which should be accessible
before initiating session. Otherwise there is no way to make
PmaAbsoluteUri work. PmaAbsoluteUri is needed at least for reverse
proxy setups, for example http webserver running behind https proxy.
 2010-01-21 11:18:18 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Herman van Rink
b55c48b8d8 Added unittest for PMA_ifSetOr() 2009-10-16 08:10:26 +00:00
Michal Čihař
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +00:00
Marc Delisle
4db43ab450 bug #2064649 Missing question mark 2008-08-21 16:45:14 +00:00
Marc Delisle
e77938bb20 BLOBstreaming support (Google Summer of Code 2008, Raj Kissu Rajandran) -- work in progress 2008-08-20 17:04:37 +00:00
Marc Delisle
1bd7ec70e2 bug #2046883 [core] Notices about deprecated dl() (so stop using it) 2008-08-16 14:06:27 +00:00
Sebastian Mendel
021d4b78a0 use http_build_query(); 
add some doc;
 2008-07-09 05:53:17 +00:00
Marc Delisle
bf3b1def54 explain the reason for this script 2008-07-08 19:15:27 +00:00
Michal Čihař
7fb6bc2370 There is no en-iso-8859-1 anymore, so do not attempt to use it. 2008-07-08 15:55:35 +00:00
Marc Delisle
544831fda7 patch #2007196, Typos in comments, thanks to knittl - knittl 2008-07-01 19:21:28 +00:00
Sebastian Mendel
bccd6fea65 cleanup 2007-10-17 14:07:58 +00:00
Marc Delisle
a554042b5e bug #1728590 Detected failing session_start fails 2007-06-03 23:30:40 +00:00
Sebastian Mendel
ef312fc70b PMA_isValid(): added ability to check $var against array of valid values 2007-05-09 13:03:59 +00:00
Sebastian Mendel
2454f1feff typo in fix for bug #1671813 2007-03-26 06:32:56 +00:00
Sebastian Mendel
dd5d1163b1 typo (i really should have written this phpunit test before as suggested ...) 2007-03-21 16:35:11 +00:00
Sebastian Mendel
d0f53268c6 added explanation/notice about unset variable behavior 2007-03-21 14:17:20 +00:00
Sebastian Mendel
6b47ec1252 PMA_isValid(): typo 2007-03-21 13:26:55 +00:00
Sebastian Mendel
71075dac88 PMA_isValid(): added 'identical' as $type option 2007-03-21 11:36:40 +00:00
Sebastian Mendel
47201daf61 PMA_isValid(): typo, todo and changed default from 'scalar' to 'length' 2007-03-21 09:22:23 +00:00
Sebastian Mendel
ccbd760b11 [core] added PMA_isValid() and PMA_ifSetOr() for variable handling 2007-03-21 08:56:42 +00:00
Sebastian Mendel
d0facc3d4f splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php 2007-03-20 14:16:18 +00:00