cvs: pear /Mail_Queue/Queue Body.php /Mail_Queue/Queue/Container db.php mdb.php mdb2.php

quipo Tue Aug 17 10:30:53 2004 EDT Modified files: /pear/Mail_Queue/Queue Body.php /pear/Mail_Queue/Queue/Container db.php mdb.php mdb2.php Log: PHP5 fix: Mail_Queue_Body::try() => _try() [bug #2098] http://cvs.php.net/diff.php/pear/Mail_Queue/Queue/Body.php?r1=1.8&r2=1.9&ty=u Index: pear/Mail_Queue/Queue/Body.php diff -u pear/Mail_Queue/Queue/Body.php:1.8 pear/Mail_Queue/Queue/Body.php:1.9 --- pear/Mail_Queue/Queue/Body.php:1.8 Sun Jul 18 10:59:15 2004 +++ pear/Mail_Queue/Queue/Body.php Tue Aug 17 10:30:52 2004 @@ -16,12 +16,12 @@ // | Authors: Radek Maciaszek <chief@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Body.php,v 1.8 2004/07/18 14:59:15 quipo Exp $ +// $Id: Body.php,v 1.9 2004/08/17 14:30:52 quipo Exp $ /** * Class contains mail data. * -* @version $Revision: 1.8 $ +* @version $Revision: 1.9 $ * @author Radek Maciaszek <chief@php.net> */ @@ -29,7 +29,7 @@ * Mail_Queue_Body contains mail data * * @author Radek Maciaszek <wodzu@pomocprawna.info> -* @version $Revision: 1.8 $ +* @version $Revision: 1.9 $ * @package Mail_Queue * @access public */ @@ -322,12 +322,12 @@ /** * Increase and return try_sent * - * Mail_Queue_Body::try() + * Mail_Queue_Body::_try() * * @return integer How many times mail was sent * @access public **/ - function try() + function _try() { return ++$this->try_sent; } http://cvs.php.net/diff.php/pear/Mail_Queue/Queue/Container/db.php?r1=1.15&r2=1.16&ty=u Index: pear/Mail_Queue/Queue/Container/db.php diff -u pear/Mail_Queue/Queue/Container/db.php:1.15 pear/Mail_Queue/Queue/Container/db.php:1.16 --- pear/Mail_Queue/Queue/Container/db.php:1.15 Tue Jul 27 04:58:45 2004 +++ pear/Mail_Queue/Queue/Container/db.php Tue Aug 17 10:30:53 2004 @@ -17,7 +17,7 @@ // | Lorenzo Alberton <l.alberton at quipo.it> | // +----------------------------------------------------------------------+ // -// $Id: db.php,v 1.15 2004/07/27 08:58:45 quipo Exp $ +// $Id: db.php,v 1.16 2004/08/17 14:30:53 quipo Exp $ /** * Storage driver for fetching mail queue data from a PEAR_DB database @@ -27,7 +27,7 @@ * * @author Radek Maciaszek <chief@php.net> * @package Mail_Queue - * @version $Revision: 1.15 $ + * @version $Revision: 1.16 $ */ require_once 'DB.php'; require_once 'Mail/Queue/Container.php'; @@ -37,7 +37,7 @@ * from a PEAR_DB database * * @author Radek Maciaszek <chief@php.net> -* @version $Id: db.php,v 1.15 2004/07/27 08:58:45 quipo Exp $ +* @version $Id: db.php,v 1.16 2004/08/17 14:30:53 quipo Exp $ * @package Mail_Queue * @access public */ @@ -232,7 +232,7 @@ return new Mail_Queue_Error('Expected: Mail_Queue_Body class', __FILE__, __LINE__); } - $count = $mail->try(); + $count = $mail->_try(); $query = sprintf("UPDATE %s SET try_sent = %d WHERE id = %d", $this->mail_table, $count, http://cvs.php.net/diff.php/pear/Mail_Queue/Queue/Container/mdb.php?r1=1.12&r2=1.13&ty=u Index: pear/Mail_Queue/Queue/Container/mdb.php diff -u pear/Mail_Queue/Queue/Container/mdb.php:1.12 pear/Mail_Queue/Queue/Container/mdb.php:1.13 --- pear/Mail_Queue/Queue/Container/mdb.php:1.12 Tue Jul 20 06:17:17 2004 +++ pear/Mail_Queue/Queue/Container/mdb.php Tue Aug 17 10:30:53 2004 @@ -16,7 +16,7 @@ // | Author: Lorenzo Alberton <l.alberton at quipo.it> | // +----------------------------------------------------------------------+ // -// $Id: mdb.php,v 1.12 2004/07/20 10:17:17 quipo Exp $ +// $Id: mdb.php,v 1.13 2004/08/17 14:30:53 quipo Exp $ /** * Storage driver for fetching mail queue data from a PEAR::MDB database @@ -25,7 +25,7 @@ * by the PEAR MDB abstraction layer. * * @author Lorenzo Alberton <l.alberton at quipo.it> - * @version $Id: mdb.php,v 1.12 2004/07/20 10:17:17 quipo Exp $ + * @version $Id: mdb.php,v 1.13 2004/08/17 14:30:53 quipo Exp $ * @package Mail_Queue */ require_once 'MDB.php'; @@ -325,7 +325,7 @@ $this->pearErrorMode, E_USER_ERROR, __FILE__, __LINE__, 'Expected: Mail_Queue_Body class'); } - $count = $mail->try(); + $count = $mail->_try(); $query = 'UPDATE ' . $this->mail_table .' SET try_sent = ' . $this->db->getIntegerValue($count) .' WHERE id = ' . $this->db->getIntegerValue($mail->getId()); http://cvs.php.net/diff.php/pear/Mail_Queue/Queue/Container/mdb2.php?r1=1.2&r2=1.3&ty=u Index: pear/Mail_Queue/Queue/Container/mdb2.php diff -u pear/Mail_Queue/Queue/Container/mdb2.php:1.2 pear/Mail_Queue/Queue/Container/mdb2.php:1.3 --- pear/Mail_Queue/Queue/Container/mdb2.php:1.2 Tue Jul 27 04:59:25 2004 +++ pear/Mail_Queue/Queue/Container/mdb2.php Tue Aug 17 10:30:53 2004 @@ -16,7 +16,7 @@ // | Author: Lorenzo Alberton <l.alberton at quipo.it> | // +----------------------------------------------------------------------+ // -// $Id: mdb2.php,v 1.2 2004/07/27 08:59:25 quipo Exp $ +// $Id: mdb2.php,v 1.3 2004/08/17 14:30:53 quipo Exp $ /** * Storage driver for fetching mail queue data from a PEAR::MDB2 database @@ -25,7 +25,7 @@ * by the PEAR MDB2 abstraction layer. * * @author Lorenzo Alberton <l.alberton at quipo.it> - * @version $Id: mdb2.php,v 1.2 2004/07/27 08:59:25 quipo Exp $ + * @version $Id: mdb2.php,v 1.3 2004/08/17 14:30:53 quipo Exp $ * @package Mail_Queue */ require_once 'MDB2.php'; @@ -214,7 +214,7 @@ return new Mail_Queue_Error('Expected: Mail_Queue_Body class', __FILE__, __LINE__); } - $count = $mail->try(); + $count = $mail->_try(); $query = 'UPDATE ' . $this->mail_table .' SET try_sent = ' . $this->db->quote($count, 'integer') .' WHERE id = ' . $this->db->quote($mail->getId(), 'integer');