projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improves user experience in creating Google Apps accounts (thanks to Olivier Le Floch).
[platal.git]
/
include
/
googleapps.inc.php
diff --git
a/include/googleapps.inc.php
b/include/googleapps.inc.php
index
54e3efe
..
1e9ee3c
100644
(file)
--- a/
include/googleapps.inc.php
+++ b/
include/googleapps.inc.php
@@
-149,6
+149,9
@@
class GoogleAppsAccount
$this->uid = $uid;
$this->g_account_name = $account_name;
$this->g_status = NULL;
$this->uid = $uid;
$this->g_account_name = $account_name;
$this->g_status = NULL;
+ if (!$this->g_account_name) {
+ return;
+ }
$res = XDB::query(
"SELECT l_sync_password, l_activate_mail_redirection,
$res = XDB::query(
"SELECT l_sync_password, l_activate_mail_redirection,
@@
-444,7
+447,7
@@
class GoogleAppsAccount
"SELECT g_admin
FROM gapps_accounts
WHERE l_userid = {?} AND g_status = 'active'", $uid);
"SELECT g_admin
FROM gapps_accounts
WHERE l_userid = {?} AND g_status = 'active'", $uid);
- return ($res->numRows() > 0 ? (bool)$res->fetchOne
Row
() : false);
+ return ($res->numRows() > 0 ? (bool)$res->fetchOne
Cell
() : false);
}
}
}
}