From 35accc05937cab56b7002899c77b0a53b381a53a Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 28 Dec 2008 23:15:20 +0100 Subject: [PATCH] Start porting googleapps.inc.php. Signed-off-by: Florent Bruneau --- include/googleapps.inc.php | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/include/googleapps.inc.php b/include/googleapps.inc.php index bc1549c..7318ba3 100644 --- a/include/googleapps.inc.php +++ b/include/googleapps.inc.php @@ -40,18 +40,12 @@ function post_queue_u_create($job) { } // Sends the 'account created' email to the user, with basic documentation. - $res = XDB::query( - "SELECT FIND_IN_SET('femme', u.flags), prenom - FROM auth_user_md5 AS u - WHERE u.user_id = {?}", $user->id()); - list($sexe, $prenom) = $res->fetchOneRow(); - $mailer = new PlMailer('googleapps/create.mail.tpl'); $mailer->assign('account', $account); $mailer->assign('email', $user->bestEmail()); $mailer->assign('googleapps_domain', $globals->mailstorage->googleapps_domain); - $mailer->assign('prenom', $prenom); - $mailer->assign('sexe', $sexe); + $mailer->assign('prenom', $user->displayName()); + $mailer->assign('sexe', $user->isFemale()); $mailer->send(); } @@ -79,17 +73,11 @@ function post_queue_u_update($job) { } // Sends an email to the account owner. - $res = XDB::query( - "SELECT FIND_IN_SET('femme', u.flags), prenom - FROM auth_user_md5 AS u - WHERE u.user_id = {?}", $user->id()); - list($sexe, $prenom) = $res->fetchOneRow(); - $mailer = new PlMailer('googleapps/unsuspend.mail.tpl'); $mailer->assign('account', $account); $mailer->assign('email', $user->bestEmail()); - $mailer->assign('prenom', $prenom); - $mailer->assign('sexe', $sexe); + $mailer->assign('prenom', $user->displayName()); + $mailer->assign('sexe', $user->isFemale()); $mailer->send(); } } @@ -353,8 +341,8 @@ class GoogleAppsAccount if ($this->sync_password) { $res = XDB::query( "SELECT password - FROM auth_user_md5 - WHERE user_id = {?}", $this->user->id()); + FROM accounts + WHERE uid = {?}", $this->user->id()); $password = ($res->numRows() > 0 ? $res->fetchOneCell() : false); } else { $password = false; @@ -379,6 +367,7 @@ class GoogleAppsAccount if (!$this->pending_create) { // Retrieves information on the new account. + // TODO: retreive first_name and last_name from the profile. $res = XDB::query( "SELECT nom, nom_usage, prenom FROM auth_user_md5 -- 2.1.4