aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2010-09-13 20:17:41 +0000
committernikrou <nikrou@piwigo.org>2010-09-13 20:17:41 +0000
commit2c6ac64a9db92cfa098b4e436407a248cccbed60 (patch)
tree51442d5800cf72e09208b35ba506eceb77dceb73 /admin
parent25ca538c0c59d14df1c76a557c7f76da9019f643 (diff)
Fix bug 1856 : CSRF issue that allow to change admin password
Merge from trunk git-svn-id: http://piwigo.org/svn/branches/2.1@6903 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/profile.php6
-rw-r--r--admin/themes/default/template/profile_content.tpl1
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/profile.php b/admin/profile.php
index f1d5e08e3..ebb372518 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -25,8 +25,12 @@ if( !defined("PHPWG_ROOT_PATH") ) die ("Hacking attempt!");
$edit_user = build_user( $_GET['user_id'], false );
-include_once(PHPWG_ROOT_PATH.'profile.php');
+if (!empty($_POST))
+{
+ check_pwg_token();
+}
+include_once(PHPWG_ROOT_PATH.'profile.php');
$errors = array();
if ( !is_adviser() )
diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index 57dba40d1..6b42863ad 100644
--- a/admin/themes/default/template/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
@@ -103,6 +103,7 @@
</fieldset>
<p class="bottomButtons">
+ <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
<input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
<input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
</p>