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