projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates merge module.
[platal.git]
/
modules
/
googleapps.php
diff --git
a/modules/googleapps.php
b/modules/googleapps.php
index
e75ce5c
..
263a24d
100644
(file)
--- a/
modules/googleapps.php
+++ b/
modules/googleapps.php
@@
-41,7
+41,7
@@
class GoogleAppsModule extends PLModule
require_once("emails.inc.php");
require_once("googleapps.inc.php");
$page->changeTpl('googleapps/index.tpl');
require_once("emails.inc.php");
require_once("googleapps.inc.php");
$page->changeTpl('googleapps/index.tpl');
- $page->addJsLink('
motdepasse
.js');
+ $page->addJsLink('
password
.js');
$page->setTitle('Compte Google Apps');
$user = S::user();
$page->setTitle('Compte Google Apps');
$user = S::user();
@@
-69,9
+69,9
@@
class GoogleAppsModule extends PLModule
} else {
$account->set_password_sync(false);
}
} else {
$account->set_password_sync(false);
}
- } elseif ($action == 'password' && Post::has('
response2
') && !$account->sync_password) {
+ } elseif ($action == 'password' && Post::has('
pwhash') && Post::t('pwhash
') && !$account->sync_password) {
S::assert_xsrf_token();
S::assert_xsrf_token();
- $account->set_password(Post::
v('response2
'));
+ $account->set_password(Post::
t('pwhash
'));
}
if ($action == 'suspend' && Post::has('suspend') && $account->active()) {
}
if ($action == 'suspend' && Post::has('suspend') && $account->active()) {
@@
-102,9
+102,9
@@
class GoogleAppsModule extends PLModule
$password_sync = Post::b('password_sync');
$redirect_mails = Post::b('redirect_mails');
if ($password_sync) {
$password_sync = Post::b('password_sync');
$redirect_mails = Post::b('redirect_mails');
if ($password_sync) {
- $password =
S::v('password'
);
+ $password =
$user->password(
);
} else {
} else {
- $password = Post::
v('response2
');
+ $password = Post::
t('pwhash
');
}
$account->create($password_sync, $password, $redirect_mails);
}
$account->create($password_sync, $password, $redirect_mails);