Commit Graph

280 Commits

Author SHA1 Message Date
Piotr Przybylski
df9b8c2729 Fix comments for functions with missing @return tag 2011-08-16 14:31:52 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
5f8842739d Remove invalid usage of $php_errormsg 2011-07-27 21:26:28 +02:00
Marc Delisle
7e197b695e Fix merge conflicts 2011-07-23 08:25:49 -04:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Michal Čihař
3f8badd37f Replace tabs with spaces, cleanup identation 2011-07-22 09:53:41 +02:00
Michal Čihař
9730a6b3d7 Merge commit '97b1375605f241481a953e2c78eb42d43f84fa9d'
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
2011-07-21 15:51:05 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Tyron Madlener
da943ecbf7 PMA Icons to sprites part 1 2011-07-14 15:37:08 +03:00
Michal Čihař
571cdc6ff4 Pass token along with swekey auth requests 2011-07-11 14:50:44 +02:00
Herman van Rink
e7bb42c002 [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-12 2011-07-09 23:10:23 +02:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Marc Delisle
12fcc270f2 Merge branch 'QA_3_4' 2011-07-02 20:52:10 -04:00
Herman van Rink
7ebd958b2b Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 2011-06-30 12:30:58 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Michal Čihař
4aa470e27e Indentation fixes 2011-06-22 11:03:38 +02:00
Michal Čihař
e0c7147806 This is a fatal error rather than place for warning
It is not necessary to translate as this really should not happen.
2011-06-22 11:02:15 +02:00
Michal Čihař
568a0e03de Show mcrypt waring only on main page and not on every page 2011-06-22 11:00:45 +02:00
Tyron Madlener
2816b427ab Merge remote-tracking branch 'origin/master' 2011-06-13 15:00:11 +02:00
Michal Čihař
72886c3c8a Add option to call extenal script from signon method 2011-06-06 17:13:15 +02:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +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ř
bbbf2c49ed Drop $GLOBALS['charset'].
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
2011-06-03 14:04:29 +02:00
Marc Delisle
99eb0cde32 bug #3308072 [auth] Version disclosure to anonymous visitors 2011-05-30 16:32:29 -04:00
Michal Čihař
adc6de0685 [auth] Fixed error handling for signon auth method.
The message is now stored in caller session data and properly displayed
in example script.
2011-05-23 10:33:14 +02:00
Michal Čihař
8fb267930e bug #3039384 [auth] Force signon auth on signon URL change. 2011-03-18 16:12:16 +01:00
Michal Čihař
d0d236fd62 rfe #2936155 [auth] Allow to pass additional parameters using signon method. 2011-03-02 11:44:57 +01:00
Michal Čihař
cd74e9fa5d bug #3175227 [auth] Reset user cache on login. 2011-02-08 13:15:01 +01:00
Michal Čihař
5a2835ec86 Readd redirect login to top frame 2011-02-02 11:44:56 +01:00
Michal Čihař
685e199c16 Use standard javascript loading on login page. 2011-02-01 17:52:14 +01:00
Michal Čihař
67e4994490 Single place to handle redirection. 2011-01-31 15:22:25 +01:00
Michal Čihař
dc0c6938b2 [security] Redirect external links to avoid Referer leakage. 2011-01-28 13:22:41 +01:00
Marc Delisle
b923bb3fbb Upgrade to jQuery 1.4.4 2011-01-02 08:00:25 -05: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ř
6c3ad9e942 Fix back showing login form in frames. 2010-07-26 17:31:56 +02:00
Michal Čihař
d291827444 No need to require_once footer
It is the last thing executed anyway (ends with exit).
2010-07-26 16:20:24 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
eeae8bec21 Get rid of inline javascript in login form. 2010-07-21 09:21:58 +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
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
Dieter Adriaenssens
16ed06531a remove author names 2010-06-28 20:36:12 +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
632211d065 gettext conversion 2010-05-09 16:24:32 -04:00
Michal Čihař
ee776a570c Convert mcrypt warning to generic function. 2010-05-05 11:35:32 +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ř
20925728e7 Replace other usages of deprecated split(). 2010-04-22 20:21:07 +02:00