From 612a2d8ae13ee29edb3279132877b63db18a5da5 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Mon, 5 Mar 2007 10:44:36 +0000 Subject: [PATCH] PHP5-ize all classes git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1546 839d8a87-29fc-0310-9880-83ba4fa771e5 --- include/emails.inc.php | 112 ++++++++++---------- include/globals.inc.php.in | 35 +++---- include/notifs.inc.php | 190 +++++++++++++++++++--------------- include/validations.inc.php | 84 +++++++-------- include/validations/aliases.inc.php | 32 +++--- include/validations/broken.inc.php | 32 +++--- include/validations/evts.inc.php | 39 ++++--- include/validations/homonymes.inc.php | 36 +++---- include/validations/listes.inc.php | 38 +++---- include/validations/marketing.inc.php | 29 +++--- include/validations/medals.inc.php | 42 ++++---- include/validations/nl.inc.php | 21 ++-- include/validations/nomusage.inc.php | 32 +++--- include/validations/orange.inc.php | 24 +++-- include/validations/paiements.inc.php | 63 +++++------ include/validations/photos.inc.php | 68 ++++++------ 16 files changed, 461 insertions(+), 416 deletions(-) diff --git a/include/emails.inc.php b/include/emails.inc.php index dbfa739..106b6a1 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -38,10 +38,10 @@ function fix_bestalias($uid) return; } XDB::execute("UPDATE aliases - SET flags=CONCAT(flags,',','bestalias') - WHERE id={?} AND type!='homonyme' - ORDER BY !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias) - LIMIT 1", $uid); + SET flags=CONCAT(flags,',','bestalias') + WHERE id={?} AND type!='homonyme' + ORDER BY !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias) + LIMIT 1", $uid); } // }}} @@ -69,20 +69,20 @@ class Bogo { // {{{ properties - var $state; - var $_states = Array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams'); + private $state; + private $_states = Array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams'); // }}} // {{{ constructor - function Bogo($uid) + public function __construct($uid) { if (!$uid) { return; } $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid); if ($res->numRows()) { - $this->state = $res->fetchOneCell(); + $this->state = $res->fetchOneCell(); } else { $this->state = 'tag_and_drop_spams'; $res = XDB::query("INSERT INTO emails (uid,email,rewrite,panne,flags) @@ -93,18 +93,20 @@ class Bogo // }}} // {{{ function change() - function change($uid, $state) + public function change($uid, $state) { - $this->state = is_int($state) ? $this->_states[$state] : $state; - XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"', - $this->state, $uid); + $this->state = is_int($state) ? $this->_states[$state] : $state; + XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"', + $this->state, $uid); } // }}} // {{{ function level() - function level() - { return array_search($this->state, $this->_states); } + public function level() + { + return array_search($this->state, $this->_states); + } // }}} } @@ -115,19 +117,19 @@ class Bogo class Email { // {{{ properties - - var $email; - var $active; - var $broken; - var $rewrite; - var $panne; - var $last; - var $panne_level; + + public $email; + public $active; + public $broken; + public $rewrite; + public $panne; + public $last; + public $panne_level; // }}} // {{{ constructor - function Email($row) + public function __construct($row) { list($this->email, $flags, $this->rewrite, $this->panne, $this->last, $this->panne_level) = $row; $this->active = ($flags == 'active'); @@ -137,14 +139,14 @@ class Email // }}} // {{{ function activate() - function activate($uid) + public function activate($uid) { if (!$this->active) { XDB::execute("UPDATE emails SET panne_level = IF(flags = 'panne', panne_level - 1, panne_level), flags = 'active' WHERE uid={?} AND email={?}", $uid, $this->email); - $_SESSION['log']->log("email_on", $this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "")); + $_SESSION['log']->log("email_on", $this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "")); $this->active = true; $this->broken = false; } @@ -153,20 +155,20 @@ class Email // }}} // {{{ function deactivate() - function deactivate($uid) + public function deactivate($uid) { if ($this->active) { XDB::execute("UPDATE emails SET flags ='' - WHERE uid={?} AND email={?}", $uid, $this->email); + WHERE uid={?} AND email={?}", $uid, $this->email); $_SESSION['log']->log("email_off",$this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "") ); $this->active = false; } } - + // }}} // {{{ function rewrite() - function rewrite($rew, $uid) + public function rewrite($rew, $uid) { if ($this->rewrite == $rew) { return; @@ -188,21 +190,22 @@ class Email class Redirect { // {{{ properties - - var $flag_active = 'active'; - var $emails; - var $bogo; - var $uid; + + private $flag_active = 'active'; + private $uid; + + public $emails; + public $bogo; // }}} // {{{ function Redirect() - function Redirect($_uid) + public function __construct($_uid) { $this->uid=$_uid; - $res = XDB::iterRow(" - SELECT email, flags, rewrite, panne, last, panne_level - FROM emails WHERE uid = {?} AND flags != 'filter'", $_uid); + $res = XDB::iterRow("SELECT email, flags, rewrite, panne, last, panne_level + FROM emails + WHERE uid = {?} AND flags != 'filter'", $_uid); $this->emails=Array(); while ($row = $res->next()) { $this->emails[] = new Email($row); @@ -213,7 +216,7 @@ class Redirect // }}} // {{{ function other_active() - function other_active($email) + public function other_active($email) { foreach ($this->emails as $mail) { if ($mail->email!=$email && $mail->active) { @@ -226,7 +229,7 @@ class Redirect // }}} // {{{ function delete_email() - function delete_email($email) + public function delete_email($email) { if (!$this->other_active($email)) { return ERROR_INACTIVE_REDIRECTION; @@ -244,8 +247,8 @@ class Redirect // }}} // {{{ function add_email() - - function add_email($email) + + public function add_email($email) { $email_stripped = strtolower(trim($email)); if (!isvalid_email($email_stripped)) { @@ -274,7 +277,7 @@ class Redirect // }}} // {{{ function modify_email() - function modify_email($emails_actifs,$emails_rewrite) + public function modify_email($emails_actifs, $emails_rewrite) { foreach ($this->emails as $i=>$mail) { if (in_array($mail->email,$emails_actifs)) { @@ -287,7 +290,7 @@ class Redirect check_redirect($this); } - function modify_one_email($email, $activate) + public function modify_one_email($email, $activate) { $allinactive = true; $thisone = false; @@ -313,23 +316,24 @@ class Redirect } } - function modify_one_email_redirect($email, $redirect) { - foreach ($this->emails as $i=>$mail) { - if ($mail->email == $email) { - $this->emails[$i]->rewrite($redirect, $this->uid); + public function modify_one_email_redirect($email, $redirect) + { + foreach ($this->emails as $i=>$mail) { + if ($mail->email == $email) { + $this->emails[$i]->rewrite($redirect, $this->uid); check_redirect($this); return; - } - } - } + } + } + } // }}} // {{{ function get_broken_mx() - function get_broken_mx() + public function get_broken_mx() { $res = XDB::query("SELECT host, text - FROM mx_watch - WHERE state != 'ok'"); + FROM mx_watch + WHERE state != 'ok'"); if (!$res->numRows()) { return array(); } diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in index 31a5760..fa8646a 100644 --- a/include/globals.inc.php.in +++ b/include/globals.inc.php.in @@ -21,27 +21,27 @@ class PlatalGlobals { - var $session; + public $session; /** The x.org version */ - var $version = '@VERSION@'; - var $debug = 0; + public $version = '@VERSION@'; + public $debug = 0; /** db params */ - var $dbdb = 'x4dat'; - var $dbhost = 'localhost'; - var $dbuser = 'x4dat'; - var $dbpwd = 'x4dat'; - var $dbcharset = 'utf8'; + public $dbdb = 'x4dat'; + public $dbhost = 'localhost'; + public $dbuser = 'x4dat'; + public $dbpwd = 'x4dat'; + public $dbcharset = 'utf8'; /** paths */ - var $baseurl; - var $spoolroot; + public $baseurl; + public $spoolroot; - var $locale; - var $timezone; + public $locale; + public $timezone; - function PlatalGlobals($sess) + public function __construct($sess) { $this->session = $sess; @@ -53,7 +53,7 @@ class PlatalGlobals $this->setlocale(); } - function read_ini_file($filename) + private function read_ini_file($filename) { $array = parse_ini_file($filename, true); if (!is_array($array)) { @@ -74,14 +74,13 @@ class PlatalGlobals } } - function read_config() + private function read_config() { $this->read_ini_file($this->spoolroot.'/configs/platal.ini'); - $this->read_ini_file($this->spoolroot.'/configs/platal.conf'); } - function setlocale() + private function setlocale() { setlocale(LC_MESSAGES, $this->locale); setlocale(LC_TIME, $this->locale); @@ -89,7 +88,7 @@ class PlatalGlobals date_default_timezone_set($this->timezone); } - function asso($key=null) + public function asso($key=null) { static $aid = null; diff --git a/include/notifs.inc.php b/include/notifs.inc.php index 0295890..43cfe17 100644 --- a/include/notifs.inc.php +++ b/include/notifs.inc.php @@ -40,14 +40,14 @@ function register_watch_op($uid, $cid, $date='', $info='') $date = date('Y-m-d'); }; XDB::execute('REPLACE INTO watch_ops (uid,cid,known,date,info) VALUES({?},{?},NOW(),{?},{?})', - $uid, $cid, $date, $info); + $uid, $cid, $date, $info); if($cid == WATCH_FICHE) { XDB::execute('UPDATE auth_user_md5 SET DATE=NOW() WHERE user_id={?}', $uid); } elseif($cid == WATCH_INSCR) { XDB::execute('REPLACE INTO contacts (uid,contact) - SELECT uid,ni_id - FROM watch_nonins - WHERE ni_id={?}', $uid); + SELECT uid,ni_id + FROM watch_nonins + WHERE ni_id={?}', $uid); XDB::execute('DELETE FROM watch_nonins WHERE ni_id={?}', $uid); } } @@ -58,33 +58,33 @@ function register_watch_op($uid, $cid, $date='', $info='') function _select_notifs_base($table, $mail, $where) { $cases = Array( - 'contacts' => Array('wfield' => 'contact', 'ufield' => 'user_id', 'need_contact' => false, - 'freq_sql' => '', - 'contact_sql' => '1' - ), - 'watch_promo' => Array('wfield' => 'promo', 'ufield' => 'promo', 'need_contact' => true, - 'freq_sql' => ' AND ( wc.type = "basic" OR wc.type="near" AND (u.promo <= v.promo_sortie-2 AND u.promo_sortie >= v.promo+2) )', - 'contact_sql' => 'NOT (c.contact IS NULL)' - ), - 'watch_nonins' => Array('wfield' => 'ni_id', 'ufield' => 'user_id', 'need_contact' => false, - 'freq_sql' => '', - 'contact_sql' => '0' - ) + 'contacts' => Array('wfield' => 'contact', 'ufield' => 'user_id', 'need_contact' => false, + 'freq_sql' => '', + 'contact_sql' => '1' + ), + 'watch_promo' => Array('wfield' => 'promo', 'ufield' => 'promo', 'need_contact' => true, + 'freq_sql' => ' AND ( wc.type = "basic" OR wc.type="near" AND (u.promo <= v.promo_sortie-2 AND u.promo_sortie >= v.promo+2) )', + 'contact_sql' => 'NOT (c.contact IS NULL)' + ), + 'watch_nonins' => Array('wfield' => 'ni_id', 'ufield' => 'user_id', 'need_contact' => false, + 'freq_sql' => '', + 'contact_sql' => '0' + ) ); $our = $cases[$table]; $sql = " ( - SELECT u.promo, u.prenom, IF(u.nom_usage='',u.nom,u.nom_usage) AS nom, - u.deces != 0 AS dcd, - a.alias AS bestalias, - wo.*, - {$our['contact_sql']} AS contact, - (u.perms IN('admin','user')) AS inscrit"; + SELECT u.promo, u.prenom, IF(u.nom_usage='',u.nom,u.nom_usage) AS nom, + u.deces != 0 AS dcd, + a.alias AS bestalias, + wo.*, + {$our['contact_sql']} AS contact, + (u.perms IN('admin','user')) AS inscrit"; if ($mail) { $sql.=", - w.uid AS aid, v.prenom AS aprenom, IF(v.nom_usage='',v.nom,v.nom_usage) AS anom, - b.alias AS abestalias, (v.flags='femme') AS sexe, q.core_mail_fmt AS mail_fmt"; + w.uid AS aid, v.prenom AS aprenom, IF(v.nom_usage='',v.nom,v.nom_usage) AS anom, + b.alias AS abestalias, (v.flags='femme') AS sexe, q.core_mail_fmt AS mail_fmt"; } $sql .= " @@ -106,8 +106,8 @@ function _select_notifs_base($table, $mail, $where) INNER JOIN watch_sub AS ws ON(ws.cid = wo.cid AND ws.uid = w.uid) INNER JOIN watch_cat AS wc ON(wc.id = wo.cid{$our['freq_sql']}) LEFT JOIN aliases AS a ON(a.id = u.user_id AND FIND_IN_SET('bestalias', a.flags)) - WHERE $where - )"; + WHERE $where + )"; return $sql; } @@ -132,7 +132,8 @@ function select_notifs($mail, $uid=null, $last=null, $iterator=true) // }}} // {{{ function getNbNotifs -function getNbNotifs() { +function getNbNotifs() +{ if (!S::has('uid')) { return 0; } @@ -154,11 +155,13 @@ function getNbNotifs() { // }}} // {{{ class AllNotifs -class AllNotifs { - var $_cats = Array(); - var $_data = Array(); +class AllNotifs +{ + public $_cats = Array(); + public $_data = Array(); - function AllNotifs() { + public function __construct() + { $res = XDB::iterator("SELECT * FROM watch_cat"); while($tmp = $res->next()) { $this->_cats[$tmp['id']] = $tmp; @@ -172,8 +175,8 @@ class AllNotifs { $aid = $tmp['aid']; if (empty($this->_data[$aid])) { $this->_data[$aid] = Array("prenom" => $tmp['aprenom'], 'nom' => $tmp['anom'], - 'bestalias'=>$tmp['abestalias'], 'sexe' => $tmp['sexe'], 'mail_fmt' => $tmp['mail_fmt'], - 'dcd'=>$tmp['dcd']); + 'bestalias'=>$tmp['abestalias'], 'sexe' => $tmp['sexe'], 'mail_fmt' => $tmp['mail_fmt'], + 'dcd'=>$tmp['dcd']); } unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['sexe'], $tmp['mail_fmt'], $tmp['dcd']); $this->_data[$aid]['data'][$tmp['cid']][] = $tmp; @@ -184,12 +187,14 @@ class AllNotifs { // }}} // {{{ class Notifs -class Notifs { - var $_uid; - var $_cats = Array(); - var $_data = Array(); +class Notifs +{ + public $_uid; + public $_cats = Array(); + public $_data = Array(); - function Notifs($uid, $up=false) { + function __concstruct($uid, $up=false) + { $this->_uid = $uid; $res = XDB::iterator("SELECT * FROM watch_cat"); @@ -215,23 +220,25 @@ class Notifs { // }}} // {{{ class Watch -class Watch { - var $_uid; - var $_promos; - var $_nonins; - var $_cats = Array(); - var $_subs; - var $watch_contacts; - var $watch_mail; - - function Watch($uid) { +class Watch +{ + public $_uid; + public $_promos; + public $_nonins; + public $_cats = Array(); + public $_subs; + public $watch_contacts; + public $watch_mail; + + public function __construct($uid) + { $this->_uid = $uid; $this->_promos = new PromoNotifs($uid); $this->_nonins = new NoninsNotifs($uid); $this->_subs = new WatchSub($uid); $res = XDB::query("SELECT FIND_IN_SET('contacts',watch_flags),FIND_IN_SET('mail',watch_flags) - FROM auth_user_quick - WHERE user_id={?}", $uid); + FROM auth_user_quick + WHERE user_id={?}", $uid); list($this->watch_contacts,$this->watch_mail) = $res->fetchOneRow(); $res = XDB::iterator("SELECT * FROM watch_cat"); @@ -240,29 +247,34 @@ class Watch { } } - function saveFlags() { + public function saveFlags() + { $flags = ""; if ($this->watch_contacts) $flags = "contacts"; if ($this->watch_mail) $flags .= ($flags ? ',' : '')."mail"; XDB::execute('UPDATE auth_user_quick SET watch_flags={?} WHERE user_id={?}', - $flags, $this->_uid); + $flags, $this->_uid); } - function cats() { + public function cats() + { return $this->_cats; } - function subs($i) { + public function subs($i) + { return $this->_subs->_data[$i]; } - function promos() { + public function promos() + { return $this->_promos->toRanges(); } - function nonins() { + public function nonins() + { return $this->_nonins->_data; } } @@ -270,11 +282,13 @@ class Watch { // }}} // {{{ class WatchSub -class WatchSub { - var $_uid; - var $_data = Array(); +class WatchSub +{ + public $_uid; + public $_data = Array(); - function WatchSub($uid) { + public function __construct($uid) + { $this->_uid = $uid; $res = XDB::iterRow('SELECT cid FROM watch_sub WHERE uid={?}', $uid); while(list($c) = $res->next()) { @@ -282,7 +296,8 @@ class WatchSub { } } - function update($ind) { + public function update($ind) + { $this->_data = Array(); XDB::execute('DELETE FROM watch_sub WHERE uid={?}', $this->_uid); foreach (Env::v($ind) as $key=>$val) { @@ -297,11 +312,13 @@ class WatchSub { // }}} // {{{ class PromoNotifs -class PromoNotifs { - var $_uid; - var $_data = Array(); +class PromoNotifs +{ + public $_uid; + public $_data = Array(); - function PromoNotifs($uid) { + public function __construct($uid) + { $this->_uid = $uid; $res = XDB::iterRow('SELECT promo FROM watch_promo WHERE uid={?} ORDER BY promo', $uid); while (list($p) = $res->next()) { @@ -309,20 +326,23 @@ class PromoNotifs { } } - function add($p) { + public function add($p) + { $promo = intval($p); XDB::execute('REPLACE INTO watch_promo (uid,promo) VALUES({?},{?})', $this->_uid, $promo); $this->_data[$promo] = $promo; asort($this->_data); } - function del($p) { + public function del($p) + { $promo = intval($p); XDB::execute('DELETE FROM watch_promo WHERE uid={?} AND promo={?}', $this->_uid, $promo); unset($this->_data[$promo]); } - function addRange($_p1,$_p2) { + public function addRange($_p1,$_p2) + { $p1 = intval($_p1); $p2 = intval($_p2); $values = Array(); @@ -334,7 +354,8 @@ class PromoNotifs { asort($this->_data); } - function delRange($_p1,$_p2) { + public function delRange($_p1,$_p2) + { $p1 = intval($_p1); $p2 = intval($_p2); $where = Array(); @@ -345,7 +366,8 @@ class PromoNotifs { XDB::execute('DELETE FROM watch_promo WHERE uid={?} AND ('.join(' OR ',$where).')', $this->_uid); } - function toRanges() { + public function toRanges() + { $ranges = Array(); $I = Array(); foreach($this->_data as $promo) { @@ -368,32 +390,36 @@ class PromoNotifs { // }}} // {{{ class NoninsNotifs -class NoninsNotifs { - var $_uid; - var $_data = Array(); +class NoninsNotifs +{ + public $_uid; + public $_data = Array(); - function NoninsNotifs($uid) { + public function __construct($uid) + { $this->_uid = $uid; $res = XDB::iterator("SELECT u.prenom,IF(u.nom_usage='',u.nom,u.nom_usage) AS nom, u.promo, u.user_id - FROM watch_nonins AS w - INNER JOIN auth_user_md5 AS u ON (u.user_id = w.ni_id) - WHERE w.uid = {?} - ORDER BY promo,nom", $uid); + FROM watch_nonins AS w + INNER JOIN auth_user_md5 AS u ON (u.user_id = w.ni_id) + WHERE w.uid = {?} + ORDER BY promo,nom", $uid); while($tmp = $res->next()) { $this->_data[$tmp['user_id']] = $tmp; } } - function del($p) { + public function del($p) + { unset($this->_data["$p"]); XDB::execute('DELETE FROM watch_nonins WHERE uid={?} AND ni_id={?}', $this->_uid, $p); } - function add($p) { + public function add($p) + { XDB::execute('INSERT INTO watch_nonins (uid,ni_id) VALUES({?},{?})', $this->_uid, $p); $res = XDB::query('SELECT prenom,IF(nom_usage="",nom,nom_usage) AS nom,promo,user_id - FROM auth_user_md5 - WHERE user_id={?}', $p); + FROM auth_user_md5 + WHERE user_id={?}', $p); $this->_data["$p"] = $res->fetchOneAssoc(); } } diff --git a/include/validations.inc.php b/include/validations.inc.php index 8314d98..4c35048 100644 --- a/include/validations.inc.php +++ b/include/validations.inc.php @@ -30,7 +30,7 @@ class ValidateIterator extends XOrgDBIterator { // {{{ constuctor - function ValidateIterator () + public function __construct () { parent::__construct('SELECT data,stamp FROM requests ORDER BY stamp', MYSQL_NUM); } @@ -38,7 +38,7 @@ class ValidateIterator extends XOrgDBIterator // }}} // {{{ function next() - function next () + public function next () { if (list($result, $stamp) = parent::next()) { $result = unserialize($result); @@ -54,27 +54,27 @@ class ValidateIterator extends XOrgDBIterator /** classe "virtuelle" à dériver pour chaque nouvelle implémentation */ -class Validate +abstract class Validate { // {{{ properties - var $uid; - var $prenom; - var $nom; - var $promo; - var $sexe; - var $bestalias; - var $forlife; - - var $stamp; - var $unique; + public $uid; + public $prenom; + public $nom; + public $promo; + public $sexe; + public $bestalias; + public $forlife; + + public $stamp; + public $unique; // enable the refuse button - var $refuse = true; + public $refuse = true; - var $type; - var $comments = Array(); + public $type; + public $comments = Array(); // the validations rules : comments for admins - var $rules = "Mieux vaut laisser une demande de validation à un autre admin que de valider une requête illégale ou que de refuser une demande légitime"; + public $rules = "Mieux vaut laisser une demande de validation à un autre admin que de valider une requête illégale ou que de refuser une demande légitime"; // }}} // {{{ constructor @@ -84,7 +84,7 @@ 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 */ - function Validate($_uid, $_unique, $_type) + public function __construct($_uid, $_unique, $_type) { $this->uid = $_uid; $this->stamp = date('YmdHis'); @@ -105,7 +105,7 @@ class Validate /** fonction à utiliser pour envoyer les données à la modération * cette fonction supprimme les doublons sur un couple ($user,$type) si $this->unique est vrai */ - function submit () + public function submit() { if ($this->unique) { XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}', $this->uid, $this->type); @@ -121,12 +121,11 @@ class Validate // }}} // {{{ function update() - function update () + protected function update() { XDB::execute('UPDATE requests SET data={?}, stamp=stamp - WHERE user_id={?} AND type={?} AND stamp={?}', - $this, $this->uid, $this->type, $this->stamp); - + WHERE user_id={?} AND type={?} AND stamp={?}', + $this, $this->uid, $this->type, $this->stamp); return true; } @@ -136,7 +135,7 @@ class Validate /** fonction à utiliser pour nettoyer l'entrée de la requête dans la table requests * attention, tout est supprimé si c'est un unique */ - function clean () + protected function clean() { if ($this->unique) { return XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}', @@ -152,7 +151,7 @@ class Validate /** fonction à réaliser en cas de valistion du formulaire */ - function handle_formu() + public function handle_formu() { if (Env::has('delete')) { $this->clean(); @@ -232,7 +231,7 @@ class Validate // }}} // {{{ function sendmail - function sendmail($isok) + protected function sendmail($isok) { global $globals; $mailer = new PlMailer(); @@ -253,7 +252,8 @@ class Validate // }}} // {{{ function trig() - function trig($msg) { + protected function trig($msg) + { global $page; $page->trig($msg); } @@ -269,7 +269,7 @@ class Validate * XXX fonction "statique" XXX * à utiliser uniquement pour récupérer un objet dans la BD avec Validate::get_typed_request(...) */ - static function get_typed_request($uid, $type, $stamp = -1) + static public function get_typed_request($uid, $type, $stamp = -1) { if ($stamp == -1) { $res = XDB::query('SELECT data FROM requests WHERE user_id={?} and type={?}', $uid, $type); @@ -289,7 +289,7 @@ class Validate /** same as get_typed_request() but return an array of objects */ - static function get_typed_requests($uid, $type) + static public function get_typed_requests($uid, $type) { $res = XDB::iterRow('SELECT data FROM requests WHERE user_id={?} and type={?}', $uid, $type); $array = array(); @@ -302,45 +302,41 @@ class Validate // }}} // {{{ function _mail_body - function _mail_body($isok) - { - } + abstract protected function _mail_body($isok); // }}} // {{{ function _mail_subj - function _mail_subj() - { - } + abstract protected function _mail_subj(); // }}} // {{{ function commit() /** fonction à utiliser pour insérer les données dans x4dat - * XXX la fonction est "virtuelle" XXX */ - function commit () - { } + abstract public function commit(); // }}} // {{{ function formu() /** nom du template qui contient le formulaire */ - function formu() - { return null; } + abstract public function formu(); // }}} // {{{ function editor() /** nom du formulaire d'édition */ - function editor() - { return null; } + public function editor() + { + return null; + } // }}} // {{{ function answers() /** automatic answers table for this type of validation */ - function answers() { + public function answers() + { static $answers_table; if (!isset($answers_table[$this->type])) { $r = XDB::query("SELECT id, title, answer FROM requests_answers WHERE category = {?}", $this->type); @@ -352,7 +348,7 @@ class Validate // }}} // {{{ function id() - function id() + public function id() { return $this->uid . '_' . $this->type . '_' . $this->stamp; } diff --git a/include/validations/aliases.inc.php b/include/validations/aliases.inc.php index 0412fad..c89e48d 100644 --- a/include/validations/aliases.inc.php +++ b/include/validations/aliases.inc.php @@ -25,24 +25,24 @@ class AliasReq extends Validate { // {{{ properties - var $alias; - var $raison; - var $unique = true; + public $alias; + public $raison; + public $unique = true; - var $old=''; - var $public='private'; + public $old=''; + public $public='private'; - var $rules = "Interdire ce qui peut nous servir (virus@, postmaster@, ...), + public $rules = "Interdire ce qui peut nous servir (virus@, postmaster@, ...), les alias vulgaires, et les prenom.nom (sauf si c'est pour l'utilisateur prenom.nom). Pas de contrainte pour les tirets ou les points, en revanche le souligné (_) est interdit"; // }}} // {{{ constructor - function AliasReq ($_uid, $_alias, $_raison, $_public, $_stamp=0) + public function __construct($_uid, $_alias, $_raison, $_public, $_stamp=0) { global $globals; - $this->Validate($_uid, true, 'alias', $_stamp); + parent::__construct($_uid, true, 'alias', $_stamp); $this->alias = $_alias.'@'.$globals->mail->alias_dom; $this->raison = $_raison; $this->public = $_public; @@ -60,7 +60,7 @@ class AliasReq extends Validate // }}} // {{{ function get_request() - static function get_request($uid) + static public function get_request($uid) { return parent::get_typed_request($uid,'alias'); } @@ -68,13 +68,15 @@ class AliasReq extends Validate // }}} // {{{ function formu() - function formu() - { return 'include/form.valid.aliases.tpl'; } + public function formu() + { + return 'include/form.valid.aliases.tpl'; + } // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/MELIX] Demande de l'alias {$this->alias}"; } @@ -82,7 +84,7 @@ class AliasReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { return " L'adresse mail {$this->alias} que tu avais demandée vient d'être créée, tu peux désormais l'utiliser à ta convenance.".(($this->public == 'public')?" A ta demande, cette adresse apparaît maintenant sur ta fiche.":""); @@ -94,7 +96,7 @@ class AliasReq extends Validate // }}} // {{{ function shorter_domain - function shorter_domain() + private function shorter_domain() { global $globals; @@ -110,7 +112,7 @@ class AliasReq extends Validate // }}} // {{{ function commit() - function commit () + public function commit () { XDB::execute("UPDATE auth_user_quick SET emails_alias_pub = {?} WHERE user_id = {?}", $this->public, $this->uid); diff --git a/include/validations/broken.inc.php b/include/validations/broken.inc.php index 5cbbdfa..46e3916 100644 --- a/include/validations/broken.inc.php +++ b/include/validations/broken.inc.php @@ -24,26 +24,26 @@ class BrokenReq extends Validate { // {{{ properties - var $m_forlife; - var $m_bestalias; - var $m_prenom; - var $m_nom; - var $m_promo; - var $m_sexe; - var $m_email; - var $old_email; - var $m_comment; + public $m_forlife; + public $m_bestalias; + public $m_prenom; + public $m_nom; + public $m_promo; + public $m_sexe; + public $m_email; + public $old_email; + public $m_comment; - var $rules = "Accepter si l'adresse mail parait correcte, et pas absurde (ou si le marketeur est de confiance). + public $rules = "Accepter si l'adresse mail parait correcte, et pas absurde (ou si le marketeur est de confiance). Si le demandeur marque sa propre adresse mail, refuser dans tous les cas. Si l'adresse proposée est surveillée, refuser. Si le compte associé est désactivé, étudier le cas en fonction de la raison de la désactivation"; // }}} // {{{ constructor - function BrokenReq($sender, $user, $email, $comment = null) + public function __construct($sender, $user, $email, $comment = null) { - $this->Validate($sender, false, 'broken'); + parent::__construct($sender, false, 'broken'); $this->m_email = $email; $this->m_comment = trim($comment); $this->m_forlife = $user['forlife']; @@ -58,7 +58,7 @@ class BrokenReq extends Validate // }}} // {{{ function formu() - function formu() + public function formu() { return 'include/form.valid.broken.tpl'; } @@ -66,7 +66,7 @@ class BrokenReq extends Validate // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org] Récupération de {$this->m_prenom} {$this->m_nom} ({$this->m_promo})"; } @@ -74,7 +74,7 @@ class BrokenReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { return " Un mail de contact vient d'être envoyé " @@ -89,7 +89,7 @@ class BrokenReq extends Validate // }}} // {{{ function commit() - function commit() + public function commit() { global $globals; $email = $this->m_bestalias . '@' . $globals->mail->domain; diff --git a/include/validations/evts.inc.php b/include/validations/evts.inc.php index 40c8ddc..9cca8b5 100644 --- a/include/validations/evts.inc.php +++ b/include/validations/evts.inc.php @@ -25,19 +25,20 @@ class EvtReq extends Validate { // {{{ properties - var $evtid; - var $titre; - var $texte; - var $pmin; - var $pmax; - var $peremption; - var $comment; + public $evtid; + public $titre; + public $texte; + public $pmin; + public $pmax; + public $peremption; + public $comment; // }}} // {{{ constructor - function EvtReq($_titre, $_texte, $_pmin, $_pmax, $_peremption, $_comment, $_uid) { - $this->Validate($_uid, false, 'evts'); + public function __construct($_titre, $_texte, $_pmin, $_pmax, $_peremption, $_comment, $_uid) + { + parent::__construct($_uid, false, 'evts'); $this->titre = $_titre; $this->texte = $_texte; $this->pmin = $_pmin; @@ -49,19 +50,23 @@ class EvtReq extends Validate // }}} // {{{ function formu() - function formu() - { return 'include/form.valid.evts.tpl'; } + public function formu() + { + return 'include/form.valid.evts.tpl'; + } // }}} // {{{ functon editor() - function editor() - { return 'include/form.valid.edit-evts.tpl'; } + public function editor() + { + return 'include/form.valid.edit-evts.tpl'; + } // }}} // {{{ function handle_editor() - function handle_editor() + protected function handle_editor() { $this->titre = Env::v('titre'); $this->texte = Env::v('texte'); @@ -74,7 +79,7 @@ class EvtReq extends Validate // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/EVENEMENTS] Proposition d'événement"; } @@ -82,7 +87,7 @@ class EvtReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { return " L'annonce que tu avais proposée ({$this->titre}) vient d'être validée."; @@ -94,7 +99,7 @@ class EvtReq extends Validate // }}} // {{{ function commit() - function commit() + public function commit() { return XDB::execute( "INSERT INTO evenements diff --git a/include/validations/homonymes.inc.php b/include/validations/homonymes.inc.php index a686525..39c0794 100644 --- a/include/validations/homonymes.inc.php +++ b/include/validations/homonymes.inc.php @@ -19,57 +19,55 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -require_once('validations.inc.php'); +require_once 'validations.inc.php'; // {{{ class HomonymeReq class HomonymeReq extends Validate { // {{{ properties - var $loginbis; + public $loginbis; - var $warning = true; + public $warning = true; - var $homonymes_forlife; + public $homonymes_forlife; - var $rules = "Accepter, sauf cas particulier d'utilisateur dont l'homonymie est traité plus ... manuellement"; + public $rules = "Accepter, sauf cas particulier d'utilisateur dont l'homonymie est traité plus ... manuellement"; // }}} // {{{ constructor - function HomonymeReq($_uid, $_loginbis, $_homonymes_forlife, $warning=true) + public function __construct($_uid, $_loginbis, $_homonymes_forlife, $warning=true) { - global $global; - $this->warning = $warning; - $this->Validate($_uid, true, $this->title()); + parent::__construct($_uid, true, $this->title()); $this->refuse = false; - $this->loginbis = $_loginbis; - $this->homonymes_forlife = $_homonymes_forlife; - } // }}} // {{{ title() - function title() { + private function title() + { return $this->warning?'alerte alias':'robot répondeur'; } // }}} // {{{ function formu() - function formu() - { return 'include/form.valid.homonymes.tpl'; } + public function formu() + { + return 'include/form.valid.homonymes.tpl'; + } // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/Support] ".($this->warning?"Dans une semaine : suppression de l'alias":"Mise en place du robot")." $loginbis@polytechnique.org"; } @@ -77,7 +75,7 @@ class HomonymeReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { global $globals; return @@ -95,7 +93,7 @@ est ambigu pour des raisons d'homonymie et signalera ton email exact."; // }}} // {{{ function sendmail() - function sendmail($isok) + protected function sendmail($isok) { if (!$isok) return false; global $globals; @@ -118,7 +116,7 @@ est ambigu pour des raisons d'homonymie et signalera ton email exact."; // }}} // {{{ function commit() - function commit() + public function commit() { require_once('homonymes.inc.php'); diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php index 5732ef8..cd7356d 100644 --- a/include/validations/listes.inc.php +++ b/include/validations/listes.inc.php @@ -25,25 +25,25 @@ class ListeReq extends Validate { // {{{ properties - var $liste; - var $desc; + public $liste; + public $desc; - var $advertise; - var $modlevel; - var $inslevel; + public $advertise; + public $modlevel; + public $inslevel; - var $owners; - var $members; + public $owners; + public $members; - var $rules = "Refuser les listes de binets si elles ne sont pas datées (oui : apv2002@, non : apv@). + public $rules = "Refuser les listes de binets si elles ne sont pas datées (oui : apv2002@, non : apv@). Refuser également des listes qui pourraient nous servir (admin, postmaster,...)"; // }}} // {{{ constructor - function ListeReq($_uid, $_liste, $_desc, $_advertise, $_modlevel, - $_inslevel, $_owners, $_members, $_stamp=0) + public function __construct($_uid, $_liste, $_desc, $_advertise, $_modlevel, + $_inslevel, $_owners, $_members, $_stamp=0) { - $this->Validate($_uid, true, 'liste', $_stamp); + parent::__construct($_uid, true, 'liste', $_stamp); $this->liste = $_liste; $this->desc = $_desc; @@ -57,13 +57,15 @@ class ListeReq extends Validate // }}} // {{{ function formu() - function formu() - { return 'include/form.valid.listes.tpl'; } + public function formu() + { + return 'include/form.valid.listes.tpl'; + } // }}} // {{{ function editor() - function editor() + public function editor() { return 'include/form.valid.edit-listes.tpl'; } @@ -71,7 +73,7 @@ class ListeReq extends Validate // }}} // {{{ function handle_editor() - function handle_editor() + protected function handle_editor() { if (Env::has('listname')) { $this->liste = trim(Env::v('listname')); @@ -82,7 +84,7 @@ class ListeReq extends Validate // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/LISTES] Demande de la liste {$this->liste}"; } @@ -90,7 +92,7 @@ class ListeReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { return " La mailing list {$this->liste} que tu avais demandée vient d'être créée."; @@ -102,7 +104,7 @@ class ListeReq extends Validate // }}} // {{{ function commit() - function commit() + public function commit() { $list = new MMList(S::v('uid'), S::v('password')); $ret = $list->create_list($this->liste, $this->desc, $this->advertise, diff --git a/include/validations/marketing.inc.php b/include/validations/marketing.inc.php index 69bedab..83ca858 100644 --- a/include/validations/marketing.inc.php +++ b/include/validations/marketing.inc.php @@ -24,24 +24,25 @@ class MarkReq extends Validate { // {{{ properties - var $perso; + public $perso; - var $m_id; - var $m_email; - var $m_nom; - var $m_prenom; - var $m_promo; - var $m_relance; + public $m_id; + public $m_email; + public $m_nom; + public $m_prenom; + public $m_promo; + public $m_relance; - var $rules = "Accepter si l'adresse mail parait correcte, et pas absurde (ou si le marketeur est de confiance). Si le + public $rules = "Accepter si l'adresse mail parait correcte, et pas absurde (ou si le marketeur est de confiance). Si le demandeur marque sa propre adresse mail, refuser dans tous les cas. Ne pas marqueter au nom de Polytechnique.org plus d'une fois par an."; // }}} // {{{ constructor - function MarkReq($sender, $mark_id, $email, $perso = false) { - $this->Validate($sender, false, 'marketing'); + public function __construct($sender, $mark_id, $email, $perso = false) + { + parent::__construct($sender, false, 'marketing'); $this->m_id = $mark_id; $this->m_email = $email; $this->perso = $perso; @@ -56,7 +57,7 @@ class MarkReq extends Validate // }}} // {{{ function formu() - function formu() + public function formu() { $res = XDB::query('SELECT IF(MAX(m.last)>p.relance, MAX(m.last), p.relance) FROM auth_user_md5 AS u @@ -71,7 +72,7 @@ class MarkReq extends Validate // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org] Marketing de {$this->m_prenom} {$this->m_nom} ({$this->m_promo})"; } @@ -79,7 +80,7 @@ class MarkReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { return " Un mail de marketing vient d'être envoyé " @@ -94,7 +95,7 @@ class MarkReq extends Validate // }}} // {{{ function commit() - function commit() + public function commit() { require_once('marketing.inc.php'); mark_send_mail($this->m_id, $this->m_email,(!$this->perso)?"staff":"user"); diff --git a/include/validations/medals.inc.php b/include/validations/medals.inc.php index c308d4d..3e7cce5 100644 --- a/include/validations/medals.inc.php +++ b/include/validations/medals.inc.php @@ -25,15 +25,15 @@ class MedalReq extends Validate { // {{{ properties - var $mid; - var $gid; + public $mid; + public $gid; // }}} // {{{ constructor - function MedalReq ($_uid, $_idmedal, $_subidmedal, $_stamp=0) + public function __construct($_uid, $_idmedal, $_subidmedal, $_stamp=0) { - $this->Validate($_uid, false, 'medal', $_stamp); + parent::__construct($_uid, false, 'medal', $_stamp); $this->mid = $_idmedal; $this->gid = $_subidmedal; } @@ -41,15 +41,15 @@ class MedalReq extends Validate // }}} // {{{ function formu() - function formu() + public function formu() { - return 'include/form.valid.medals.tpl'; - } + return 'include/form.valid.medals.tpl'; + } // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/Décoration] Demande de décoration : ".$this->medal_name(); } @@ -57,7 +57,7 @@ class MedalReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { return " La décoration ".$this->medal_name()." vient d'être ajoutée à ta fiche."; @@ -69,21 +69,21 @@ class MedalReq extends Validate // }}} // {{{ function medal_name - function medal_name() + public function medal_name() { - //var_dump($this); - $r = XDB::query(" - SELECT IF (g.text IS NOT NULL, CONCAT(m.text,' - ', g.text), m.text) - FROM profile_medals AS m - LEFT JOIN profile_medals_grades AS g ON(g.mid = m.id AND g.gid = {?}) - WHERE m.id = {?}", $this->gid, $this->mid); - return $r->fetchOneCell(); + //var_dump($this); + $r = XDB::query(" + SELECT IF (g.text IS NOT NULL, CONCAT(m.text,' - ', g.text), m.text) + FROM profile_medals AS m + LEFT JOIN profile_medals_grades AS g ON(g.mid = m.id AND g.gid = {?}) + WHERE m.id = {?}", $this->gid, $this->mid); + return $r->fetchOneCell(); } // }}} // {{{ function submit() - function submit() + public function submit() { $res = XDB::query("SELECT FIND_IN_SET(flags, 'validation') FROM profile_medals @@ -94,13 +94,13 @@ class MedalReq extends Validate $this->commit(); } } - + // }}} // {{{ function commit() - function commit () + public function commit () { - return XDB::execute('REPLACE INTO profile_medals_sub VALUES({?}, {?}, {?})', $this->uid, $this->mid, $this->gid); + return XDB::execute('REPLACE INTO profile_medals_sub VALUES({?}, {?}, {?})', $this->uid, $this->mid, $this->gid); } // }}} diff --git a/include/validations/nl.inc.php b/include/validations/nl.inc.php index 9740848..f9aff28 100644 --- a/include/validations/nl.inc.php +++ b/include/validations/nl.inc.php @@ -27,21 +27,22 @@ class NLReq extends Validate { // {{{ properties - var $art; - var $rules = "Laisser valider par le NL-MASTER"; + public $art; + public $rules = "Laisser valider par le NL-MASTER"; // }}} // {{{ constructor - function NlReq($uid, $title, $body, $append) { - $this->Validate($uid, false, 'nl'); + public function __construct($uid, $title, $body, $append) + { + parent::__construct($uid, false, 'nl'); $this->art = new NLArticle($title, $body, $append); } // }}} // {{{ function formu() - function formu() + public function formu() { return 'include/form.valid.nl.tpl'; } @@ -49,7 +50,7 @@ class NLReq extends Validate // }}} // {{{ function editor() - function editor() + public function editor() { return 'include/form.valid.edit-nl.tpl'; } @@ -57,7 +58,7 @@ class NLReq extends Validate // }}} // {{{ function handle_editor() - function handle_editor() + protected function handle_editor() { $this->art->_body = Env::v('nl_body'); $this->art->_title = Env::v('nl_title'); @@ -68,7 +69,7 @@ class NLReq extends Validate // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/NL] Proposition d'article dans la NL"; } @@ -76,7 +77,7 @@ class NLReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { return ' L\'article que tu avais proposé ('.$this->art->title().') vient d\'être validé.'; @@ -88,7 +89,7 @@ class NLReq extends Validate // }}} // {{{ function commit() - function commit() + public function commit() { $nl = new Newsletter(); $nl->saveArticle($this->art); diff --git a/include/validations/nomusage.inc.php b/include/validations/nomusage.inc.php index 91e3ac1..fd24c7d 100644 --- a/include/validations/nomusage.inc.php +++ b/include/validations/nomusage.inc.php @@ -25,18 +25,18 @@ class UsageReq extends Validate { // {{{ properties - var $unique = true; + public $unique = true; - var $nom_usage; - var $alias = ''; + public $nom_usage; + public $alias = ''; - var $oldusage; - var $oldalias; + public $oldusage; + public $oldalias; - var $homonyme; - var $reason; + public $homonyme; + public $reason; - var $rules = "Refuser + public $rules = "Refuser tout ce qui n'est visiblement pas un nom de famille (ce qui est extremement rare car à peu près n'importe quoi peut être un nom de famille...)"; @@ -44,9 +44,9 @@ class UsageReq extends Validate // }}} // {{{ constructor - function UsageReq($_uid, $_usage, $_reason) + public function __construct($_uid, $_usage, $_reason) { - $this->Validate($_uid, true, 'usage'); + parent::__construct($_uid, true, 'usage'); $this->nom_usage = $_usage; $this->reason = $_reason; require_once 'xorg.misc.inc.php'; @@ -65,13 +65,15 @@ class UsageReq extends Validate // }}} // {{{ function formu() - function formu() - { return 'include/form.valid.nomusage.tpl'; } + public function formu() + { + return 'include/form.valid.nomusage.tpl'; + } // }}} // {{{ function _mail_subj() - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/USAGE] Changement de nom d'usage"; } @@ -79,7 +81,7 @@ class UsageReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { global $globals; if ($isok) { @@ -99,7 +101,7 @@ class UsageReq extends Validate // }}} // {{{ function commit() - function commit() + public function commit() { require_once('user.func.inc.php'); $this->bestalias = set_new_usage($this->uid, $this->nom_usage, $this->alias); diff --git a/include/validations/orange.inc.php b/include/validations/orange.inc.php index 1f82930..f7a0402 100644 --- a/include/validations/orange.inc.php +++ b/include/validations/orange.inc.php @@ -25,21 +25,21 @@ class OrangeReq extends Validate { // {{{ properties - var $unique = true; + public $unique = true; - var $promo; - var $promo_sortie; + public $promo; + public $promo_sortie; - var $rules = "A priori accepter (la validation sert à repousser les + public $rules = "A priori accepter (la validation sert à repousser les petits malins). Refuse si tu connais la personne et que tu es sure qu'elle n'est pas orange."; // }}} // {{{ constructor - function OrangeReq($_uid, $_sortie) + public function __construct($_uid, $_sortie) { - $this->Validate($_uid, true, 'orange'); + parent::__construct($_uid, true, 'orange'); $this->promo_sortie = $_sortie; $res = XDB::query("SELECT promo FROM auth_user_md5 WHERE user_id = {?}", $_uid); $this->promo = $res->fetchOneCell(); @@ -48,13 +48,15 @@ class OrangeReq extends Validate // }}} // {{{ function formu() - function formu() - { return 'include/form.valid.orange.tpl'; } + public function formu() + { + return 'include/form.valid.orange.tpl'; + } // }}} // {{{ function _mail_subj() - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/ORANGE] Changement de nom de promo de sortie"; } @@ -62,7 +64,7 @@ class OrangeReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { $res = " La demande de changement de promo de sortie que tu as demandée vient d'être effectuée."; @@ -75,7 +77,7 @@ class OrangeReq extends Validate // }}} // {{{ function commit() - function commit() + public function commit() { XDB::execute("UPDATE auth_user_md5 set promo_sortie={?} WHERE user_id={?}",$this->promo_sortie ,$this->uid); return true; diff --git a/include/validations/paiements.inc.php b/include/validations/paiements.inc.php index ee73771..9b3a634 100644 --- a/include/validations/paiements.inc.php +++ b/include/validations/paiements.inc.php @@ -25,28 +25,28 @@ class PayReq extends Validate { // {{{ properties - var $titre; - var $site; + public $titre; + public $site; - var $montant; - var $montant_min; - var $montant_max; + public $montant; + public $montant_min; + public $montant_max; - var $msg_reponse; - var $asso_id; - var $asso; - var $evt; - var $evt_intitule; + public $msg_reponse; + public $asso_id; + public $asso; + public $evt; + public $evt_intitule; - var $rules = "Laisser la validation à un trésorier"; + public $rules = "Laisser la validation à un trésorier"; // }}} // {{{ constructor - function PayReq($_uid, $_intitule, $_site, $_montant, $_msg, - $_montantmin=0, $_montantmax=999, $_asso_id = 0, - $_evt = 0, $_stamp=0) + public function __construct($_uid, $_intitule, $_site, $_montant, $_msg, + $_montantmin=0, $_montantmax=999, $_asso_id = 0, + $_evt = 0, $_stamp=0) { - $this->Validate($_uid, false, 'paiements', $_stamp); + parent::__construct($_uid, false, 'paiements', $_stamp); $this->titre = $_intitule; $this->site = $_site; @@ -68,35 +68,40 @@ class PayReq extends Validate } // }}} - // {{{ function same_event() - static function same_event($evt, $asso_id) + // {{{ function same_event() + + static public function same_event($evt, $asso_id) { $wevt = 's:3:"evt";s:'.strlen($evt+"").':"'.$evt.'"'; $wassoid = 's:7:"asso_id";s:'.strlen($asso_id + "").':"'.$asso_id.'"'; $where = "%".$wassoid."%".$wevt."%"; return $where; } - // }}} - // {{{ function submit() - // supprime les demandes de paiments pour le meme evenement - function submit() + + // }}} + // {{{ function submit() + + // supprime les demandes de paiments pour le meme evenement + public function submit() { if ($this->evt) { XDB::execute('DELETE FROM requests WHERE type={?} AND data LIKE {?}', 'paiements', PayReq::same_event($this->evt, $this->asso_id)); } - Validate::submit(); + parent::submit(); } // }}} // {{{ function formu() - function formu() - { return 'include/form.valid.paiements.tpl'; } + public function formu() + { + return 'include/form.valid.paiements.tpl'; + } // }}} // {{{ function editor() - function editor() + public function editor() { return 'include/form.valid.edit-paiements.tpl'; } @@ -104,7 +109,7 @@ class PayReq extends Validate // }}} // {{{ function handle_editor() - function handle_editor() + protected function handle_editor() { $this->titre = Env::v('pay_titre'); $this->site = Env::v('pay_site'); @@ -118,7 +123,7 @@ class PayReq extends Validate // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/Paiments] Demande de création de paiement {$this->titre}"; } @@ -126,7 +131,7 @@ class PayReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { return " Le paiement que tu avais demandé pour {$this->titre} vient d'être créé.".($this->evt?" Il a bien été associé à la gestion de l'événement du groupe":""); @@ -138,7 +143,7 @@ class PayReq extends Validate // }}} // {{{ function commit() - function commit() + public function commit() { global $globals; $res = XDB::query("SELECT MAX(id) FROM paiement.paiements"); diff --git a/include/validations/photos.inc.php b/include/validations/photos.inc.php index 07c2adc..f158f28 100644 --- a/include/validations/photos.inc.php +++ b/include/validations/photos.inc.php @@ -25,25 +25,25 @@ class PhotoReq extends Validate { // {{{ properties - var $mimetype; - var $data; - var $x; - var $y; + public $mimetype; + public $data; + public $x; + public $y; - var $unique = true; - var $valid = false; + public $unique = true; + public $valid = false; - var $rules = "Refuser les photos copyrightées, de mineurs, ou ayant - un caractère pornographique, violent, etc... Si une photo est mal - cadrée (20% de photo et 80% de blanc par exemple), si c'est un - camarade antique, on lui arrange sinon on lui - refuse en lui expliquant gentiment le problème. Idem si les dimensions de - la photo sont archi trop grandes ou archi trop petites."; + public $rules = "Refuser les photos copyrightées, de mineurs, ou ayant + un caractère pornographique, violent, etc... Si une photo est mal + cadrée (20% de photo et 80% de blanc par exemple), si c'est un + camarade antique, on lui arrange sinon on lui + refuse en lui expliquant gentiment le problème. Idem si les dimensions de + la photo sont archi trop grandes ou archi trop petites."; // }}} // {{{ constructor - function PhotoReq($_uid, $_data, $_stamp=0) + public function __construct($_uid, $_data, $_stamp=0) { $this->Validate($_uid, true, 'photo', $_stamp); $this->valid = $this->_get_image($_data); @@ -52,7 +52,7 @@ class PhotoReq extends Validate // }}} // {{{ function _get_image() - function _get_image($_data) + private function _get_image($_data) { global $page; @@ -70,12 +70,12 @@ class PhotoReq extends Validate list($this->x, $this->y, $this->mimetype) = $image_infos; switch ($this->mimetype) { - case 1: $this->mimetype = "gif"; break; - case 2: $this->mimetype = "jpeg"; break; - case 3: $this->mimetype = "png"; break; - default: - $page->trig("Type d'image invalide"); - return false; + case 1: $this->mimetype = "gif"; break; + case 2: $this->mimetype = "jpeg"; break; + case 3: $this->mimetype = "png"; break; + default: + $page->trig("Type d'image invalide"); + return false; } if (strlen($_data) > SIZE_MAX) { @@ -114,7 +114,7 @@ class PhotoReq extends Validate // }}} // {{{ function isValid() - function isValid() + public function isValid() { return $this->valid; } @@ -122,7 +122,7 @@ class PhotoReq extends Validate // }}} // {{{ function get_request() - function get_request($uid) + static public function get_request($uid) { return parent::get_typed_request($uid,'photo'); } @@ -130,13 +130,15 @@ class PhotoReq extends Validate // }}} // {{{ function formu() - function formu() - { return 'include/form.valid.photos.tpl'; } + public function formu() + { + return 'include/form.valid.photos.tpl'; + } // }}} // {{{ function editor() - function editor() + public function editor() { return 'include/form.valid.edit-photo.tpl'; } @@ -144,7 +146,7 @@ class PhotoReq extends Validate // }}} // {{{ function handle_editor() - function handle_editor() + protected function handle_editor() { if (isset($_FILES['userfile']['tmp_name'])) { $file = $_FILES['userfile']['tmp_name']; @@ -162,7 +164,7 @@ class PhotoReq extends Validate // }}} // {{{ function _mail_subj - function _mail_subj() + protected function _mail_subj() { return "[Polytechnique.org/PHOTO] Changement de photo"; } @@ -170,7 +172,7 @@ class PhotoReq extends Validate // }}} // {{{ function _mail_body - function _mail_body($isok) + protected function _mail_body($isok) { if ($isok) { return "Le changement de photo que tu as demandé vient d'être effectué."; @@ -182,13 +184,13 @@ class PhotoReq extends Validate // }}} // {{{ function commit() - function commit() + public function commit() { XDB::execute('REPLACE INTO photo (uid, attachmime, attach, x, y) - VALUES ({?},{?},{?},{?},{?})', - $this->uid, $this->mimetype, $this->data, $this->x, $this->y); - require_once('notifs.inc.php'); - register_watch_op($this->uid,WATCH_FICHE); + VALUES ({?},{?},{?},{?},{?})', + $this->uid, $this->mimetype, $this->data, $this->x, $this->y); + require_once('notifs.inc.php'); + register_watch_op($this->uid, WATCH_FICHE); return true; } -- 2.1.4