projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bye xorg.misc.inc.php
[platal.git]
/
include
/
validations
/
nomusage.inc.php
diff --git
a/include/validations/nomusage.inc.php
b/include/validations/nomusage.inc.php
index
26181b6
..
788d7c6
100644
(file)
--- a/
include/validations/nomusage.inc.php
+++ b/
include/validations/nomusage.inc.php
@@
-49,7
+49,6
@@
class UsageReq extends Validate
parent::__construct($_uid, true, 'usage');
$this->nom_usage = $_usage;
$this->reason = $_reason;
parent::__construct($_uid, true, 'usage');
$this->nom_usage = $_usage;
$this->reason = $_reason;
- require_once 'xorg.misc.inc.php';
$this->alias = make_username($this->prenom, $this->nom_usage);
if (!$this->nom_usage) $this->alias = "";
$this->alias = make_username($this->prenom, $this->nom_usage);
if (!$this->nom_usage) $this->alias = "";
@@
-94,7
+93,7
@@
class UsageReq extends Validate
}
if ($globals->mailstorage->googleapps_domain) {
require_once 'googleapps.inc.php';
}
if ($globals->mailstorage->googleapps_domain) {
require_once 'googleapps.inc.php';
- $account = new GoogleAppsAccount(
S::v('uid'), S::v('forlife')
);
+ $account = new GoogleAppsAccount(
$this->uid, $this->forlife
);
if ($account->active()) {
$res .= "\n\n Si tu utilises Google Apps, tu peux changer ton nom d'usage sur https://mail.google.com/a/polytechnique.org/#settings/accounts";
}
if ($account->active()) {
$res .= "\n\n Si tu utilises Google Apps, tu peux changer ton nom d'usage sur https://mail.google.com/a/polytechnique.org/#settings/accounts";
}