X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fgoogleapps.php;h=bad38368d5b75111bab2b5645601979200e8dab0;hb=a1430b3042e43ddc874abc2f6dd2e01a5d872a59;hp=7b38eae289e7ce3006ddf4fe3fb5d980e843c795;hpb=9f5bd98e936d8cef7ca9f774eeef64dbb8a1b079;p=platal.git diff --git a/modules/googleapps.php b/modules/googleapps.php index 7b38eae..bad3836 100644 --- a/modules/googleapps.php +++ b/modules/googleapps.php @@ -1,6 +1,6 @@ $this->make_hook('index', AUTH_MDP), - 'admin/googleapps' => $this->make_hook('admin', AUTH_MDP, 'admin'), - 'admin/googleapps/job' => $this->make_hook('admin_job', AUTH_MDP, 'admin'), - 'admin/googleapps/user' => $this->make_hook('admin_user', AUTH_MDP, 'admin'), + 'googleapps' => $this->make_hook('index', AUTH_PASSWD, 'gapps'), + 'admin/googleapps' => $this->make_hook('admin', AUTH_PASSWD, 'admin'), + 'admin/googleapps/job' => $this->make_hook('admin_job', AUTH_PASSWD, 'admin'), + 'admin/googleapps/user' => $this->make_hook('admin_user', AUTH_PASSWD, 'admin'), ); } - function handler_index(&$page, $action = null) + function handler_index($page, $action = null) { - require_once("emails.inc.php"); - require_once("googleapps.inc.php"); + require_once 'emails.inc.php'; + require_once 'googleapps.inc.php'; $page->changeTpl('googleapps/index.tpl'); - $page->addJsLink('motdepasse.js'); $page->setTitle('Compte Google Apps'); $user = S::user(); $account = new GoogleAppsAccount($user); // Fills up the 'is Google Apps redirection active' variable. - $page->assign('redirect_active', false); - $page->assign('redirect_unique', true); + $redirect_active = false; + $redirect_unique = true; + $gapps_email = ''; if ($account->active()) { $redirect = new Redirect($user); - $page->assign('redirect_unique', !$redirect->other_active('googleapps')); - - $storage = new EmailStorage($user, 'googleapps'); - $page->assign('redirect_active', $storage->active); + foreach ($redirect->emails as $email) { + if ($email->type == 'googleapps') { + $gapps_email = $email->email; + $redirect_active = $email->active; + $redirect_unique = !$redirect->other_active($email->email); + } + } } + $page->assign('redirect_active', $redirect_active); + $page->assign('redirect_unique', $redirect_unique); // Updates the Google Apps account as required. if ($action) { @@ -69,9 +74,9 @@ class GoogleAppsModule extends PLModule } 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(); - $account->set_password(Post::v('response2')); + $account->set_password(Post::t('pwhash')); } if ($action == 'suspend' && Post::has('suspend') && $account->active()) { @@ -80,7 +85,7 @@ class GoogleAppsModule extends PLModule if ($account->pending_update_suspension) { $page->trigWarning("Ton compte est déjà en cours de désactivation."); } else { - if ($redirect->modify_one_email('googleapps', false) == SUCCESS) { + if (!$redirect_active || $redirect->modify_one_email($gapps_email, false) == SUCCESS) { $account->suspend(); $page->trigSuccess("Ton compte Google Apps est dorénavant désactivé."); } else { @@ -102,9 +107,9 @@ class GoogleAppsModule extends PLModule $password_sync = Post::b('password_sync'); $redirect_mails = Post::b('redirect_mails'); if ($password_sync) { - $password = S::v('password'); + $password = $user->password(); } else { - $password = Post::v('response2'); + $password = Post::t('pwhash'); } $account->create($password_sync, $password, $redirect_mails); @@ -115,8 +120,8 @@ class GoogleAppsModule extends PLModule $page->assign('account', $account); } - function handler_admin(&$page, $action = null) { - require_once("googleapps.inc.php"); + function handler_admin($page, $action = null) { + require_once 'googleapps.inc.php'; $page->changeTpl('googleapps/admin.tpl'); $page->setTitle('Administration Google Apps'); $page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid'))); @@ -133,10 +138,10 @@ class GoogleAppsModule extends PLModule // Retrieves latest pending administrative requests from the gappsd queue. $res = XDB::iterator( - "SELECT q_id, q_recipient_id, a.alias, j_type, j_parameters, + "SELECT q_id, q_recipient_id, s.email AS alias, j_type, j_parameters, UNIX_TIMESTAMP(q.p_entry_date) AS p_entry_date FROM gapps_queue AS q - LEFT JOIN aliases AS a ON (a.id = q_recipient_id AND a.type = 'a_vie') + LEFT JOIN email_source_account AS s ON (s.uid = q.q_recipient_id AND s.type = 'forlife') WHERE p_status IN ('idle', 'active', 'softfail') AND p_admin_request IS TRUE ORDER BY p_entry_date"); @@ -151,28 +156,28 @@ class GoogleAppsModule extends PLModule // Retrieves latest failed requests from the gappsd queue. $res = XDB::iterator( - "SELECT q.q_id, q.q_recipient_id, a.alias, q.j_type, q.r_result, + "SELECT q.q_id, q.q_recipient_id, s.email AS alias, q.j_type, q.r_result, UNIX_TIMESTAMP(q.p_entry_date) AS p_entry_date FROM gapps_queue AS q - LEFT JOIN aliases AS a ON (a.id = q.q_recipient_id AND a.type = 'a_vie') + LEFT JOIN email_source_account AS s ON (s.uid = q.q_recipient_id AND s.type = 'forlife') WHERE q.p_status = 'hardfail' ORDER BY p_entry_date DESC LIMIT 20"); $page->assign('failed_requests', $res); } - function handler_admin_job(&$page, $job = null) { - require_once("googleapps.inc.php"); + function handler_admin_job($page, $job = null) { + require_once 'googleapps.inc.php'; $page->changeTpl('googleapps/admin.job.tpl'); $page->setTitle('Administration Google Apps'); $page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid'))); if ($job) { $res = XDB::query( - "SELECT q.*, ao.alias AS q_owner, ar.alias AS q_recipient + "SELECT q.*, so.email AS q_owner, sr.email AS q_recipient FROM gapps_queue AS q - LEFT JOIN aliases AS ao ON (ao.id = q.q_owner_id AND ao.type = 'a_vie') - LEFT JOIN aliases AS ar ON (ar.id = q.q_recipient_id AND ar.type = 'a_vie') + LEFT JOIN email_source_account AS so ON (so.uid = q.q_owner_id AND so.type = 'forlife') + LEFT JOIN email_source_account AS sr ON (sr.uid = q.q_recipient_id AND sr.type = 'forlife') WHERE q_id = {?}", $job); $sql_job = $res->fetchOneAssoc(); $sql_job['decoded_parameters'] = var_export(json_decode($sql_job['j_parameters'], true), true); @@ -180,9 +185,9 @@ class GoogleAppsModule extends PLModule } } - function handler_admin_user(&$page, $user = null) { - require_once("emails.inc.php"); - require_once("googleapps.inc.php"); + function handler_admin_user($page, $user = null) { + require_once 'emails.inc.php'; + require_once 'googleapps.inc.php'; $page->changeTpl('googleapps/admin.user.tpl'); $page->setTitle('Administration Google Apps'); $page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid'))); @@ -194,7 +199,6 @@ class GoogleAppsModule extends PLModule if ($user) { $account = new GoogleAppsAccount($user); - $storage = new EmailStorage($user, 'googleapps'); // Apply requested actions. if (Post::has('suspend') && $account->active() && !$account->pending_update_suspension) { @@ -206,12 +210,10 @@ class GoogleAppsModule extends PLModule $account->do_unsuspend(); $page->trigSuccess('Le compte est en cours de réactivation.'); } else if (Post::has('forcesync') && $account->active() && $account->sync_password) { - $res = XDB::query("SELECT password FROM auth_user_md5 WHERE user_id = {?}", $user->id()); - $account->set_password($res->fetchOneCell()); + $account->set_password($user->password()); $page->trigSuccess('Le mot de passe est en cours de synchronisation.'); } else if (Post::has('sync') && $account->active()) { - $res = XDB::query("SELECT password FROM auth_user_md5 WHERE user_id = {?}", $user->id()); - $account->set_password($res->fetchOneCell()); + $account->set_password($user->password()); $account->set_password_sync(true); } else if (Post::has('nosync') && $account->active()) { $account->set_password_sync(false); @@ -220,7 +222,7 @@ class GoogleAppsModule extends PLModule // Displays basic account information. $page->assign('account', $account); $page->assign('admin_account', GoogleAppsAccount::is_administrator($user->id())); - $page->assign('googleapps_storage', $storage->active); + $page->assign('googleapps_storage', Email::is_active_storage($user, 'googleapps')); $page->assign('user', $user->id()); // Retrieves user's pending requests.