X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvalidations.inc.php;h=085fffc5a83a8a25d983056a554497f871bd8528;hb=8230e9f8eff954fb1103c8bdcf0d22557d419ae7;hp=4c35048d05c96a7704e95606acc2b3f5e5ea9636;hpb=612a2d8ae13ee29edb3279132877b63db18a5da5;p=platal.git diff --git a/include/validations.inc.php b/include/validations.inc.php index 4c35048..085fffc 100644 --- a/include/validations.inc.php +++ b/include/validations.inc.php @@ -1,6 +1,6 @@ spoolroot . '/core/classes/xdb.php'; /** * Iterator class, that lists objects through the database @@ -32,7 +33,7 @@ class ValidateIterator extends XOrgDBIterator public function __construct () { - parent::__construct('SELECT data,stamp FROM requests ORDER BY stamp', MYSQL_NUM); + parent::__construct('SELECT data, DATE_FORMAT(stamp, "%Y%m%d%H%i%s") FROM requests ORDER BY stamp', MYSQL_NUM); } // }}} @@ -41,7 +42,7 @@ class ValidateIterator extends XOrgDBIterator public function next () { if (list($result, $stamp) = parent::next()) { - $result = unserialize($result); + $result = Validate::unserialize($result); $result->stamp = $stamp; return($result); } else { @@ -57,20 +58,14 @@ class ValidateIterator extends XOrgDBIterator abstract class Validate { // {{{ properties - - public $uid; - public $prenom; - public $nom; - public $promo; - public $sexe; - public $bestalias; - public $forlife; + + public $user; public $stamp; public $unique; // enable the refuse button public $refuse = true; - + public $type; public $comments = Array(); // the validations rules : comments for admins @@ -78,27 +73,20 @@ abstract class Validate // }}} // {{{ constructor - + /** constructeur - * @param $_uid user id + * @param $_user user object * @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($_uid, $_unique, $_type) + public function __construct(User &$_user, $_unique, $_type) { - $this->uid = $_uid; + $this->user = &$_user; $this->stamp = date('YmdHis'); $this->unique = $_unique; $this->type = $_type; - $res = XDB::query( - "SELECT u.prenom, u.nom, u.promo, FIND_IN_SET('femme', u.flags) AS sexe, a.alias, b.alias - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON ( u.user_id=a.id AND a.type='a_vie' ) - INNER JOIN aliases AS b ON ( u.user_id=b.id AND b.type!='homonyme' AND FIND_IN_SET('bestalias', b.flags) ) - WHERE u.user_id={?}", $_uid); - list($this->prenom, $this->nom, $this->promo, $this->sexe, $this->forlife, $this->bestalias) = $res->fetchOneRow(); } - + // }}} // {{{ function submit() @@ -108,13 +96,15 @@ abstract class Validate public function submit() { if ($this->unique) { - XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}', $this->uid, $this->type); + XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}', $this->user->id(), $this->type); } - + $this->stamp = date('YmdHis'); XDB::execute('INSERT INTO requests (user_id, type, data, stamp) VALUES ({?}, {?}, {?}, {?})', - $this->uid, $this->type, $this, $this->stamp); + $this->user->id(), $this->type, $this, $this->stamp); + global $globals; + $globals->updateNbValid(); return true; } @@ -125,37 +115,41 @@ abstract class Validate { XDB::execute('UPDATE requests SET data={?}, stamp=stamp WHERE user_id={?} AND type={?} AND stamp={?}', - $this, $this->uid, $this->type, $this->stamp); + $this, $this->user->id(), $this->type, $this->stamp); return true; } // }}} // {{{ function clean() - + /** fonction à utiliser pour nettoyer l'entrée de la requête dans la table requests * attention, tout est supprimé si c'est un unique */ - protected function clean() + public function clean() { + global $globals; + if ($this->unique) { - return XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}', - $this->uid, $this->type); + $success = XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}', + $this->user->id(), $this->type); } else { - return XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?} AND stamp={?}', - $this->uid, $this->type, $this->stamp); + $success = XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?} AND stamp={?}', + $this->user->id(), $this->type, $this->stamp); } + $globals->updateNbValid(); + return $success; } // }}} // {{{ function handle_formu() - - /** fonction à réaliser en cas de valistion du formulaire + + /** fonction à réaliser en cas de validation du formulaire */ public function handle_formu() { if (Env::has('delete')) { $this->clean(); - $this->trig('requete supprimée'); + $this->trigSuccess('Requête supprimée'); return true; } @@ -163,7 +157,7 @@ abstract class Validate if (Env::has('edit')) { if ($this->handle_editor()) { $this->update(); - $this->trig('requête mise à jour'); + $this->trigSuccess('Requête mise à jour'); return true; } return false; @@ -180,25 +174,25 @@ abstract class Validate if (!strlen(trim(Env::v('comm')))) { return true; } - $this->comments[] = Array(S::v('bestalias'), Env::v('comm'), $formid); + $this->comments[] = Array(S::user()->login(), Env::v('comm'), $formid); // envoi d'un mail à hotliners global $globals; - $mailer = new PlMailer; + $mailer = new PlMailer(); $mailer->setSubject("Commentaires de validation {$this->type}"); $mailer->setFrom("validation+{$this->type}@{$globals->mail->domain}"); - $mailer->addTo("hotliners@staff.polytechnique.org"); + $mailer->addTo($globals->core->admin_email); - $body = "Validation {$this->type} pour {$this->prenom} {$this->nom}\n\n" - . S::v('bestalias')." a ajouté le commentaire :\n\n" - . Env::v('comm')."\n\n" - . "cf la discussion sur : ".$globals->baseurl."/admin/validate"; + $body = "Validation {$this->type} pour {$this->user->login()}\n\n" + . S::user()->login() . " a ajouté le commentaire :\n\n" + . Env::v('comm') . "\n\n" + . "cf la discussion sur : " . $globals->baseurl . "/admin/validate"; $mailer->setTxtBody(wordwrap($body)); $mailer->send(); $this->update(); - $this->trig('commentaire ajouté'); + $this->trigSuccess('Commentaire ajouté'); return true; } @@ -206,10 +200,10 @@ abstract class Validate if ($this->commit()) { $this->sendmail(true); $this->clean(); - $this->trig('mail envoyé'); + $this->trigSuccess('Email de validation envoyé'); return true; } else { - $this->trig('erreur lors de la validation'); + $this->trigError('Erreur lors de la validation'); return false; } } @@ -218,10 +212,10 @@ abstract class Validate if (Env::v('comm')) { $this->sendmail(false); $this->clean(); - $this->trig('mail envoyé'); + $this->trigSuccess('Email de refus envoyé'); return true; } else { - $this->trig('pas de motivation pour le refus !!!'); + $this->trigError('pas de motivation pour le refus !!!'); } } @@ -237,13 +231,13 @@ abstract class Validate $mailer = new PlMailer(); $mailer->setSubject($this->_mail_subj()); $mailer->setFrom("validation+{$this->type}@{$globals->mail->domain}"); - $mailer->addTo("\"{$this->prenom} {$this->nom}\" <{$this->bestalias}@{$globals->mail->domain}>"); + $mailer->addTo("\"{$this->user->fullName()}\" <{$this->user->bestEmail()}>"); $mailer->addCc("validation+{$this->type}@{$globals->mail->domain}"); - $body = ($this->sexe ? "Chère camarade,\n\n" : "Cher camarade,\n\n") + $body = ($this->user->isFemale() ? "Chère camarade,\n\n" : "Cher camarade,\n\n") . $this->_mail_body($isok) . (Env::has('comm') ? "\n\n".Env::v('comm') : '') - . "\n\nCordialement,\nL'équipe Polytechnique.org\n"; + . "\n\nCordialement,\n\n-- \nL'équipe de Polytechnique.org\n"; $mailer->setTxtBody(wordwrap($body)); $mailer->send(); @@ -251,13 +245,22 @@ abstract class Validate // }}} // {{{ function trig() - - protected function trig($msg) + + protected function trigError($msg) { - global $page; - $page->trig($msg); + Platal::page()->trigError($msg); } - + + protected function trigWarning($msg) + { + Platal::page()->trigWarning($msg); + } + + protected function trigSuccess($msg) + { + Platal::page()->trigSuccess($msg); + } + // }}} // {{{ function get_typed_request() @@ -274,10 +277,10 @@ abstract class Validate if ($stamp == -1) { $res = XDB::query('SELECT data FROM requests WHERE user_id={?} and type={?}', $uid, $type); } else { - $res = XDB::query("SELECT data, stamp FROM requests WHERE user_id={?} AND type={?} and stamp={?}", $uid, $type, $stamp); + $res = XDB::query('SELECT data, DATE_FORMAT(stamp, "%Y%m%d%H%i%s") FROM requests WHERE user_id={?} AND type={?} and stamp={?}', $uid, $type, $stamp); } if ($result = $res->fetchOneCell()) { - $result = unserialize($result); + $result = Validate::unserialize($result); } else { $result = false; } @@ -285,6 +288,15 @@ abstract class Validate } // }}} + // {{{ function get_request_by_id() + + static public function get_request_by_id($id) + { + list($uid, $type, $stamp) = explode('_', $id, 3); + return Validate::get_typed_request($uid, $type, $stamp); + } + + // }}} // {{{ function get_typed_requests() /** same as get_typed_request() but return an array of objects @@ -294,31 +306,42 @@ abstract class Validate $res = XDB::iterRow('SELECT data FROM requests WHERE user_id={?} and type={?}', $uid, $type); $array = array(); while (list($data) = $res->next()) { - $array[] = unserialize($data); + $array[] = Validate::unserialize($data); } return $array; } // }}} + // {{{ function get_typed_requests_count() + + /** same as get_typed_requests() but return the count of available requests. + */ + static public function get_typed_requests_count($uid, $type) + { + $res = XDB::query('SELECT COUNT(data) FROM requests WHERE user_id={?} and type={?}', $uid, $type); + return $res->fetchOneCell(); + } + + // }}} // {{{ function _mail_body abstract protected function _mail_body($isok); - + // }}} // {{{ function _mail_subj abstract protected function _mail_subj(); - + // }}} // {{{ function commit() - + /** fonction à utiliser pour insérer les données dans x4dat */ abstract public function commit(); // }}} // {{{ function formu() - + /** nom du template qui contient le formulaire */ abstract public function formu(); @@ -350,10 +373,29 @@ abstract class Validate public function id() { - return $this->uid . '_' . $this->type . '_' . $this->stamp; + return $this->user->id() . '_' . $this->type . '_' . $this->stamp; + } + + // }}} + // {{{ function ruleText() + + public function ruleText() + { + return str_replace('\'', '\\\'', $this->rules); } // }}} + // {{{ function unserialize() + public static function unserialize($data) + { + $obj = unserialize($data); + /* XXX: Temporary for hruid migration */ + if (!isset($obj->user) || !is_object($obj)) { + $obj->user =& User::get($obj->forlife); + } + /* XXX: End temporary block */ + return $obj; + } } foreach (glob(dirname(__FILE__).'/validations/*.inc.php') as $file) {