From 532c06cf78d430c5278df7006335df2921fa98d4 Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Sun, 24 Aug 2008 17:29:18 +0200 Subject: [PATCH] Fixes non-referenced use of User, which would have led to a performance impact. Signed-off-by: Vincent Zanotti --- include/validations.inc.php | 4 ++-- include/validations/aliases.inc.php | 2 +- include/validations/broken.inc.php | 4 ++-- include/validations/evts.inc.php | 2 +- include/validations/googleapps.inc.php | 2 +- include/validations/homonymes.inc.php | 2 +- include/validations/listes.inc.php | 2 +- include/validations/marketing.inc.php | 4 ++-- include/validations/medals.inc.php | 2 +- include/validations/nl.inc.php | 2 +- include/validations/nomusage.inc.php | 4 ++-- include/validations/orange.inc.php | 2 +- include/validations/paiements.inc.php | 2 +- include/validations/photos.inc.php | 2 +- include/validations/surveys.inc.php | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/validations.inc.php b/include/validations.inc.php index c0c60e6..734a407 100644 --- a/include/validations.inc.php +++ b/include/validations.inc.php @@ -79,9 +79,9 @@ abstract class Validate * @param $_unique requête pouvant être multiple ou non * @param $_type type de la donnée comme dans le champ type de x4dat.requests */ - public function __construct(User $_user, $_unique, $_type) + public function __construct(User &$_user, $_unique, $_type) { - $this->user = $_user; + $this->user = &$_user; $this->stamp = date('YmdHis'); $this->unique = $_unique; $this->type = $_type; diff --git a/include/validations/aliases.inc.php b/include/validations/aliases.inc.php index 9827253..c5f555c 100644 --- a/include/validations/aliases.inc.php +++ b/include/validations/aliases.inc.php @@ -39,7 +39,7 @@ class AliasReq extends Validate // }}} // {{{ constructor - public function __construct(User $_user, $_alias, $_raison, $_public, $_stamp=0) + public function __construct(User &$_user, $_alias, $_raison, $_public, $_stamp=0) { global $globals; parent::__construct($_user, true, 'alias', $_stamp); diff --git a/include/validations/broken.inc.php b/include/validations/broken.inc.php index 31e3fc6..da22479 100644 --- a/include/validations/broken.inc.php +++ b/include/validations/broken.inc.php @@ -37,10 +37,10 @@ class BrokenReq extends Validate // }}} // {{{ constructor - public function __construct(User $sender, User $user, $email, $comment = null) + public function __construct(User &$sender, User &$user, $email, $comment = null) { parent::__construct($sender, false, 'broken'); - $this->m_user = $user; + $this->m_user = &$user; $this->m_comment = trim($comment); $this->m_email = $email; } diff --git a/include/validations/evts.inc.php b/include/validations/evts.inc.php index fbc3e81..73ec0ca 100644 --- a/include/validations/evts.inc.php +++ b/include/validations/evts.inc.php @@ -41,7 +41,7 @@ class EvtReq extends Validate // }}} // {{{ constructor - public function __construct($_titre, $_texte, $_pmin, $_pmax, $_peremption, $_comment, User $_user, PlUpload &$upload = null) + public function __construct($_titre, $_texte, $_pmin, $_pmax, $_peremption, $_comment, User &$_user, PlUpload &$upload = null) { parent::__construct($_user, false, 'evts'); $this->titre = $_titre; diff --git a/include/validations/googleapps.inc.php b/include/validations/googleapps.inc.php index 9dc33a3..5932e14 100644 --- a/include/validations/googleapps.inc.php +++ b/include/validations/googleapps.inc.php @@ -26,7 +26,7 @@ class GoogleAppsUnsuspendReq extends Validate alors la raison s'affichera (mais seulement 24-48h après la suspension). Si l'utilisateur a désactivé lui-même son compte, la raison sera toujours vierge."; - public function __construct(User $_user) + public function __construct(User &$_user) { parent::__construct($_user, true, 'gapps-unsuspend'); } diff --git a/include/validations/homonymes.inc.php b/include/validations/homonymes.inc.php index bf7c52d..d163c11 100644 --- a/include/validations/homonymes.inc.php +++ b/include/validations/homonymes.inc.php @@ -37,7 +37,7 @@ class HomonymeReq extends Validate // }}} // {{{ constructor - public function __construct(User $_user, $_loginbis, $_homonymes_forlife, $warning=true) + public function __construct(User &$_user, $_loginbis, $_homonymes_forlife, $warning=true) { $this->warning = $warning; diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php index af02bfe..96e0034 100644 --- a/include/validations/listes.inc.php +++ b/include/validations/listes.inc.php @@ -42,7 +42,7 @@ class ListeReq extends Validate // }}} // {{{ constructor - public function __construct(User $_user, $_asso, $_liste, $_domain, $_desc, $_advertise, + public function __construct(User &$_user, $_asso, $_liste, $_domain, $_desc, $_advertise, $_modlevel, $_inslevel, $_owners, $_members, $_stamp=0) { parent::__construct($_user, false, 'liste', $_stamp); diff --git a/include/validations/marketing.inc.php b/include/validations/marketing.inc.php index 53a5e75..a81d0a2 100644 --- a/include/validations/marketing.inc.php +++ b/include/validations/marketing.inc.php @@ -39,10 +39,10 @@ class MarkReq extends Validate // }}} // {{{ constructor - public function __construct(User $sender, User $mark, $email, $perso, $type, $data) + public function __construct(User &$sender, User &$mark, $email, $perso, $type, $data) { parent::__construct($sender, false, 'marketing'); - $this->m_user = $mark; + $this->m_user = &$mark; $this->m_email = $email; $this->perso = $perso; $this->m_type = $type; diff --git a/include/validations/medals.inc.php b/include/validations/medals.inc.php index 441a7b9..498ee49 100644 --- a/include/validations/medals.inc.php +++ b/include/validations/medals.inc.php @@ -31,7 +31,7 @@ class MedalReq extends Validate // }}} // {{{ constructor - public function __construct(User $_user, $_idmedal, $_subidmedal, $_stamp=0) + public function __construct(User &$_user, $_idmedal, $_subidmedal, $_stamp=0) { parent::__construct($_user, false, 'medal', $_stamp); $this->mid = $_idmedal; diff --git a/include/validations/nl.inc.php b/include/validations/nl.inc.php index 9b24549..3008be3 100644 --- a/include/validations/nl.inc.php +++ b/include/validations/nl.inc.php @@ -33,7 +33,7 @@ class NLReq extends Validate // }}} // {{{ constructor - public function __construct(User $_user, $_title, $_body, $_append) + public function __construct(User &$_user, $_title, $_body, $_append) { parent::__construct($_user, false, 'nl'); $this->art = new NLArticle($_title, $_body, $_append); diff --git a/include/validations/nomusage.inc.php b/include/validations/nomusage.inc.php index b4471b0..319b1cf 100644 --- a/include/validations/nomusage.inc.php +++ b/include/validations/nomusage.inc.php @@ -44,7 +44,7 @@ class UsageReq extends Validate // }}} // {{{ constructor - public function __construct(User $_user, $_usage, $_reason) + public function __construct(User &$_user, $_usage, $_reason) { parent::__construct($_user, true, 'usage'); $this->nom_usage = $_usage; @@ -61,7 +61,7 @@ class UsageReq extends Validate FROM auth_user_md5 as u LEFT JOIN aliases as e ON(e.type='alias' AND FIND_IN_SET('usage',e.flags) AND e.id = u.user_id) LEFT JOIN aliases as a ON(a.alias = {?} AND a.id != u.user_id) - WHERE u.user_id = {?}", $this->alias, $this->uid); + WHERE u.user_id = {?}", $this->alias, $this->user->id()); list($this->oldalias, $this->oldusage, $this->homonyme) = $res->fetchOneRow(); } diff --git a/include/validations/orange.inc.php b/include/validations/orange.inc.php index a17285c..2cd3918 100644 --- a/include/validations/orange.inc.php +++ b/include/validations/orange.inc.php @@ -36,7 +36,7 @@ class OrangeReq extends Validate // }}} // {{{ constructor - public function __construct(User $_user, $_sortie) + public function __construct(User &$_user, $_sortie) { parent::__construct($_user, true, 'orange'); $this->promo_sortie = $_sortie; diff --git a/include/validations/paiements.inc.php b/include/validations/paiements.inc.php index ec12a83..62e264a 100644 --- a/include/validations/paiements.inc.php +++ b/include/validations/paiements.inc.php @@ -44,7 +44,7 @@ Si le télépaiement n'est pas lié à un groupe ou supérieur à 51 euros, lais // }}} // {{{ constructor - public function __construct(User $_user, $_intitule, $_site, $_montant, $_msg, + public function __construct(User &$_user, $_intitule, $_site, $_montant, $_msg, $_montantmin=0, $_montantmax=999, $_asso_id = 0, $_evt = 0, $_stamp=0) { diff --git a/include/validations/photos.inc.php b/include/validations/photos.inc.php index 93b0ec9..f65b06c 100644 --- a/include/validations/photos.inc.php +++ b/include/validations/photos.inc.php @@ -43,7 +43,7 @@ class PhotoReq extends Validate // }}} // {{{ constructor - public function __construct(User $_user, PlUpload &$upload, $_stamp=0) + public function __construct(User &$_user, PlUpload &$upload, $_stamp=0) { parent::__construct($_user, true, 'photo', $_stamp); $this->read($upload); diff --git a/include/validations/surveys.inc.php b/include/validations/surveys.inc.php index 4c2fb02..2d1ef52 100644 --- a/include/validations/surveys.inc.php +++ b/include/validations/surveys.inc.php @@ -33,7 +33,7 @@ class SurveyReq extends Validate // }}} // {{{ constructor - public function __construct($_title, $_description, $_end, $_mode, $_promos, $_questions, User $_user) + public function __construct($_title, $_description, $_end, $_mode, $_promos, $_questions, User &$_user) { parent::__construct($_user, false, 'surveys'); $this->title = $_title; -- 2.1.4