projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xorg/maint'
[platal.git]
/
modules
/
googleapps.php
diff --git
a/modules/googleapps.php
b/modules/googleapps.php
index
bad3836
..
c898819
100644
(file)
--- a/
modules/googleapps.php
+++ b/
modules/googleapps.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
1
Polytechnique.org *
+ * Copyright (C) 2003-201
4
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-70,7
+70,7
@@
class GoogleAppsModule extends PLModule
S::assert_xsrf_token();
if (Post::v('pwsync') == 'sync') {
$account->set_password_sync(true);
S::assert_xsrf_token();
if (Post::v('pwsync') == 'sync') {
$account->set_password_sync(true);
- $account->set_password(
S::v('password'
));
+ $account->set_password(
$user->password(
));
} else {
$account->set_password_sync(false);
}
} else {
$account->set_password_sync(false);
}
@@
-236,5
+236,5
@@
class GoogleAppsModule extends PLModule
}
}
}
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker
f
enc=utf-8:
?>
?>