|
+// +----------------------------------------------------------------------+
+//
+// $Id: Weeks.php,v 1.3 2005/10/22 10:28:49 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Weeks.php,v 1.3 2005/10/22 10:28:49 quipo Exp $
+ */
+
+/**
+ * Allows Calendar include path to be redefined
+ * @ignore
+ */
+if (!defined('CALENDAR_ROOT')) {
+ define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
+}
+
+/**
+ * Load Calendar base class
+ */
+require_once CALENDAR_ROOT.'Calendar.php';
+
+/**
+ * Load base month
+ */
+require_once CALENDAR_ROOT.'Month.php';
+
+/**
+ * Represents a Month and builds Weeks
+ *
+ * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Month'.DIRECTORY_SEPARATOR.'Weeks.php';
+ * $Month = & new Calendar_Month_Weeks(2003, 10); // Oct 2003
+ * $Month->build(); // Build Calendar_Day objects
+ * while ($Week = & $Month->fetch()) {
+ * echo $Week->thisWeek().'
';
+ * }
+ *
+ * @package Calendar
+ * @access public
+ */
+class Calendar_Month_Weeks extends Calendar_Month
+{
+ /**
+ * Instance of Calendar_Table_Helper
+ * @var Calendar_Table_Helper
+ * @access private
+ */
+ var $tableHelper;
+
+ /**
+ * First day of the week
+ * @access private
+ * @var string
+ */
+ var $firstDay;
+
+ /**
+ * Constructs Calendar_Month_Weeks
+ * @param int year e.g. 2003
+ * @param int month e.g. 5
+ * @param int (optional) first day of week (e.g. 0 for Sunday, 2 for Tuesday etc.)
+ * @access public
+ */
+ function Calendar_Month_Weeks($y, $m, $firstDay=null)
+ {
+ Calendar_Month::Calendar_Month($y, $m, $firstDay);
+ }
+
+ /**
+ * Builds Calendar_Week objects for the Month. Note that Calendar_Week
+ * builds Calendar_Day object in tabular form (with Calendar_Day->empty)
+ * @param array (optional) Calendar_Week objects representing selected dates
+ * @return boolean
+ * @access public
+ */
+ function build($sDates=array())
+ {
+ require_once CALENDAR_ROOT.'Table/Helper.php';
+ $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
+ require_once CALENDAR_ROOT.'Week.php';
+ $numWeeks = $this->tableHelper->getNumWeeks();
+ for ($i=1, $d=1; $i<=$numWeeks; $i++,
+ $d+=$this->cE->getDaysInWeek(
+ $this->thisYear(),
+ $this->thisMonth(),
+ $this->thisDay()) ) {
+ $this->children[$i] = new Calendar_Week(
+ $this->year, $this->month, $d, $this->tableHelper->getFirstDay());
+ }
+ //used to set empty days
+ $this->children[1]->setFirst(true);
+ $this->children[$numWeeks]->setLast(true);
+
+ // Handle selected weeks here
+ if (count($sDates) > 0) {
+ $this->setSelection($sDates);
+ }
+ return true;
+ }
+
+ /**
+ * Called from build()
+ * @param array
+ * @return void
+ * @access private
+ */
+ function setSelection($sDates)
+ {
+ foreach ($sDates as $sDate) {
+ if ($this->year == $sDate->thisYear()
+ && $this->month == $sDate->thisMonth())
+ {
+ $key = $sDate->thisWeek('n_in_month');
+ if (isset($this->children[$key])) {
+ $this->children[$key]->setSelected();
+ }
+ }
+ }
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Year.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Year.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Year.php (revision 20119)
@@ -0,0 +1,113 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: Year.php,v 1.4 2005/10/22 10:25:39 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Year.php,v 1.4 2005/10/22 10:25:39 quipo Exp $
+ */
+
+/**
+ * Allows Calendar include path to be redefined
+ * @ignore
+ */
+if (!defined('CALENDAR_ROOT')) {
+ define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
+}
+
+/**
+ * Load Calendar base class
+ */
+require_once CALENDAR_ROOT.'Calendar.php';
+
+/**
+ * Represents a Year and builds Months
+ *
+ * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Year.php';
+ * $Year = & new Calendar_Year(2003, 10, 21); // 21st Oct 2003
+ * $Year->build(); // Build Calendar_Month objects
+ * while ($Month = & $Year->fetch()) {
+ * echo $Month->thisMonth().'
';
+ * }
+ *
+ * @package Calendar
+ * @access public
+ */
+class Calendar_Year extends Calendar
+{
+ /**
+ * Constructs Calendar_Year
+ * @param int year e.g. 2003
+ * @access public
+ */
+ function Calendar_Year($y)
+ {
+ Calendar::Calendar($y);
+ }
+
+ /**
+ * Builds the Months of the Year.
+ * Note: by defining the constant CALENDAR_MONTH_STATE you can
+ * control what class of Calendar_Month is built e.g.;
+ *
+ * require_once 'Calendar/Calendar_Year.php';
+ * define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKDAYS); // Use Calendar_Month_Weekdays
+ * // define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKS); // Use Calendar_Month_Weeks
+ * // define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH); // Use Calendar_Month
+ *
+ * It defaults to building Calendar_Month objects.
+ * @param array (optional) array of Calendar_Month objects representing selected dates
+ * @param int (optional) first day of week (e.g. 0 for Sunday, 2 for Tuesday etc.)
+ * @return boolean
+ * @access public
+ */
+ function build($sDates = array(), $firstDay = null)
+ {
+ require_once CALENDAR_ROOT.'Factory.php';
+ $this->firstDay = $this->defineFirstDayOfWeek($firstDay);
+ $monthsInYear = $this->cE->getMonthsInYear($this->thisYear());
+ for ($i=1; $i <= $monthsInYear; $i++) {
+ $this->children[$i] = Calendar_Factory::create('Month', $this->year, $i);
+ }
+ if (count($sDates) > 0) {
+ $this->setSelection($sDates);
+ }
+ return true;
+ }
+
+ /**
+ * Called from build()
+ * @param array
+ * @return void
+ * @access private
+ */
+ function setSelection($sDates) {
+ foreach ($sDates as $sDate) {
+ if ($this->year == $sDate->thisYear()) {
+ $key = $sDate->thisMonth();
+ if (isset($this->children[$key])) {
+ $sDate->setSelected();
+ $this->children[$key] = $sDate;
+ }
+ }
+ }
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Minute.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Minute.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Minute.php (revision 20119)
@@ -0,0 +1,114 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: Minute.php,v 1.1 2004/05/24 22:25:42 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Minute.php,v 1.1 2004/05/24 22:25:42 quipo Exp $
+ */
+
+/**
+ * Allows Calendar include path to be redefined
+ * @ignore
+ */
+if (!defined('CALENDAR_ROOT')) {
+ define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
+}
+
+/**
+ * Load Calendar base class
+ */
+require_once CALENDAR_ROOT.'Calendar.php';
+
+/**
+ * Represents a Minute and builds Seconds
+ *
+ * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Minute.php';
+ * $Minute = & new Calendar_Minute(2003, 10, 21, 15, 31); // Oct 21st 2003, 3:31pm
+ * $Minute->build(); // Build Calendar_Second objects
+ * while ($Second = & $Minute->fetch()) {
+ * echo $Second->thisSecond().'
';
+ * }
+ *
+ * @package Calendar
+ * @access public
+ */
+class Calendar_Minute extends Calendar
+{
+ /**
+ * Constructs Minute
+ * @param int year e.g. 2003
+ * @param int month e.g. 5
+ * @param int day e.g. 11
+ * @param int hour e.g. 13
+ * @param int minute e.g. 31
+ * @access public
+ */
+ function Calendar_Minute($y, $m, $d, $h, $i)
+ {
+ Calendar::Calendar($y, $m, $d, $h, $i);
+ }
+
+ /**
+ * Builds the Calendar_Second objects
+ * @param array (optional) Calendar_Second objects representing selected dates
+ * @return boolean
+ * @access public
+ */
+ function build($sDates=array())
+ {
+ require_once CALENDAR_ROOT.'Second.php';
+ $sIM = $this->cE->getSecondsInMinute($this->year, $this->month,
+ $this->day, $this->hour, $this->minute);
+ for ($i=0; $i < $sIM; $i++) {
+ $this->children[$i] = new Calendar_Second($this->year, $this->month,
+ $this->day, $this->hour, $this->minute, $i);
+ }
+ if (count($sDates) > 0) {
+ $this->setSelection($sDates);
+ }
+ return true;
+ }
+
+ /**
+ * Called from build()
+ * @param array
+ * @return void
+ * @access private
+ */
+ function setSelection($sDates)
+ {
+ foreach ($sDates as $sDate) {
+ if ($this->year == $sDate->thisYear()
+ && $this->month == $sDate->thisMonth()
+ && $this->day == $sDate->thisDay()
+ && $this->hour == $sDate->thisHour()
+ && $this->minute == $sDate->thisMinute())
+ {
+ $key = (int)$sDate->thisSecond();
+ if (isset($this->children[$key])) {
+ $sDate->setSelected();
+ $this->children[$key] = $sDate;
+ }
+ }
+ }
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Table/Helper.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Table/Helper.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Table/Helper.php (revision 20119)
@@ -0,0 +1,280 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: Helper.php,v 1.5 2005/10/22 09:51:53 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Helper.php,v 1.5 2005/10/22 09:51:53 quipo Exp $
+ */
+
+/**
+ * Used by Calendar_Month_Weekdays, Calendar_Month_Weeks and Calendar_Week to
+ * help with building the calendar in tabular form
+ * @package Calendar
+ * @access protected
+ */
+class Calendar_Table_Helper
+{
+ /**
+ * Instance of the Calendar object being helped.
+ * @var object
+ * @access private
+ */
+ var $calendar;
+
+ /**
+ * Instance of the Calendar_Engine
+ * @var object
+ * @access private
+ */
+ var $cE;
+
+ /**
+ * First day of the week
+ * @access private
+ * @var string
+ */
+ var $firstDay;
+
+ /**
+ * The seven days of the week named
+ * @access private
+ * @var array
+ */
+ var $weekDays;
+
+ /**
+ * Days of the week ordered with $firstDay at the beginning
+ * @access private
+ * @var array
+ */
+ var $daysOfWeek = array();
+
+ /**
+ * Days of the month built from days of the week
+ * @access private
+ * @var array
+ */
+ var $daysOfMonth = array();
+
+ /**
+ * Number of weeks in month
+ * @var int
+ * @access private
+ */
+ var $numWeeks = null;
+
+ /**
+ * Number of emtpy days before real days begin in month
+ * @var int
+ * @access private
+ */
+ var $emptyBefore = 0;
+
+ /**
+ * Constructs Calendar_Table_Helper
+ * @param object Calendar_Month_Weekdays, Calendar_Month_Weeks, Calendar_Week
+ * @param int (optional) first day of the week e.g. 1 for Monday
+ * @access protected
+ */
+ function Calendar_Table_Helper(& $calendar, $firstDay=null)
+ {
+ $this->calendar = & $calendar;
+ $this->cE = & $calendar->getEngine();
+ if (is_null($firstDay)) {
+ $firstDay = $this->cE->getFirstDayOfWeek(
+ $this->calendar->thisYear(),
+ $this->calendar->thisMonth(),
+ $this->calendar->thisDay()
+ );
+ }
+ $this->firstDay = $firstDay;
+ $this->setFirstDay();
+ $this->setDaysOfMonth();
+ }
+
+ /**
+ * Constructs $this->daysOfWeek based on $this->firstDay
+ * @return void
+ * @access private
+ */
+ function setFirstDay()
+ {
+ $weekDays = $this->cE->getWeekDays(
+ $this->calendar->thisYear(),
+ $this->calendar->thisMonth(),
+ $this->calendar->thisDay()
+ );
+ $endDays = array();
+ $tmpDays = array();
+ $begin = false;
+ foreach ($weekDays as $day) {
+ if ($begin) {
+ $endDays[] = $day;
+ } else if ($day === $this->firstDay) {
+ $begin = true;
+ $endDays[] = $day;
+ } else {
+ $tmpDays[] = $day;
+ }
+ }
+ $this->daysOfWeek = array_merge($endDays, $tmpDays);
+ }
+
+ /**
+ * Constructs $this->daysOfMonth
+ * @return void
+ * @access private
+ */
+ function setDaysOfMonth()
+ {
+ $this->daysOfMonth = $this->daysOfWeek;
+ $daysInMonth = $this->cE->getDaysInMonth(
+ $this->calendar->thisYear(), $this->calendar->thisMonth());
+ $firstDayInMonth = $this->cE->getFirstDayInMonth(
+ $this->calendar->thisYear(), $this->calendar->thisMonth());
+ $this->emptyBefore=0;
+ foreach ($this->daysOfMonth as $dayOfWeek) {
+ if ($firstDayInMonth == $dayOfWeek) {
+ break;
+ }
+ $this->emptyBefore++;
+ }
+ $this->numWeeks = ceil(
+ ($daysInMonth + $this->emptyBefore)
+ /
+ $this->cE->getDaysInWeek(
+ $this->calendar->thisYear(),
+ $this->calendar->thisMonth(),
+ $this->calendar->thisDay()
+ )
+ );
+ for ($i=1; $i < $this->numWeeks; $i++) {
+ $this->daysOfMonth =
+ array_merge($this->daysOfMonth, $this->daysOfWeek);
+ }
+ }
+
+ /**
+ * Returns the first day of the month
+ * @see Calendar_Engine_Interface::getFirstDayOfWeek()
+ * @return int
+ * @access protected
+ */
+ function getFirstDay()
+ {
+ return $this->firstDay;
+ }
+
+ /**
+ * Returns the order array of days in a week
+ * @return int
+ * @access protected
+ */
+ function getDaysOfWeek()
+ {
+ return $this->daysOfWeek;
+ }
+
+ /**
+ * Returns the number of tabular weeks in a month
+ * @return int
+ * @access protected
+ */
+ function getNumWeeks()
+ {
+ return $this->numWeeks;
+ }
+
+ /**
+ * Returns the number of real days + empty days
+ * @return int
+ * @access protected
+ */
+ function getNumTableDaysInMonth()
+ {
+ return count($this->daysOfMonth);
+ }
+
+ /**
+ * Returns the number of empty days before the real days begin
+ * @return int
+ * @access protected
+ */
+ function getEmptyDaysBefore()
+ {
+ return $this->emptyBefore;
+ }
+
+ /**
+ * Returns the index of the last real day in the month
+ * @todo Potential performance optimization with static
+ * @return int
+ * @access protected
+ */
+ function getEmptyDaysAfter()
+ {
+ // Causes bug when displaying more than one month
+// static $index;
+// if (!isset($index)) {
+ $index = $this->getEmptyDaysBefore() + $this->cE->getDaysInMonth(
+ $this->calendar->thisYear(), $this->calendar->thisMonth());
+// }
+ return $index;
+ }
+
+ /**
+ * Returns the index of the last real day in the month, relative to the
+ * beginning of the tabular week it is part of
+ * @return int
+ * @access protected
+ */
+ function getEmptyDaysAfterOffset()
+ {
+ $eAfter = $this->getEmptyDaysAfter();
+ return $eAfter - (
+ $this->cE->getDaysInWeek(
+ $this->calendar->thisYear(),
+ $this->calendar->thisMonth(),
+ $this->calendar->thisDay()
+ ) * ($this->numWeeks-1) );
+ }
+
+ /**
+ * Returns the timestamp of the first day of the current week
+ */
+ function getWeekStart($y, $m, $d, $firstDay=1)
+ {
+ $dow = $this->cE->getDayOfWeek($y, $m, $d);
+ if ($dow > $firstDay) {
+ $d -= ($dow - $firstDay);
+ }
+ if ($dow < $firstDay) {
+ $d -= (
+ $this->cE->getDaysInWeek(
+ $this->calendar->thisYear(),
+ $this->calendar->thisMonth(),
+ $this->calendar->thisDay()
+ ) - $firstDay + $dow);
+ }
+ return $this->cE->dateToStamp($y, $m, $d);
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/docs/Readme
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/Readme (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/Readme (revision 20119)
@@ -0,0 +1,3 @@
+Readme
+
+See the PEAR manual at http://pear.php.net/manual/en/package.datetime.calendar.php for details.
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/1.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/1.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/1.php (revision 20119)
@@ -0,0 +1,92 @@
+' );
+echo ( 'The time is now: '.date('Y M d H:i:s',$c->getTimestamp()).'
' );
+
+$i = 1;
+echo ( 'First Iteration
' );
+echo ( 'The first iteration is more "expensive", the calendar data
+ structures having to be built.
' );
+$start = getmicrotime();
+$c->build();
+while ( $e = $c->fetch() ) {
+ $class = strtolower(get_class($e));
+ $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
+ "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
+ $method = 'this'.str_replace('calendar_','',$class);
+ echo ( "".$e->{$method}()." : " );
+ if ( ($i % 10) == 0 ) {
+ echo ( '
' );
+ }
+ $i++;
+}
+echo ( 'Took: '.(getmicrotime()-$start).' seconds
' );
+
+$i = 1;
+echo ( 'Second Iteration
' );
+echo ( 'This second iteration is faster, the data structures
+ being re-used
' );
+$start = getmicrotime();
+while ( $e = $c->fetch() ) {
+ $class = strtolower(get_class($e));
+ $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
+ "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
+ $method = 'this'.str_replace('calendar_','',$class);
+ echo ( "".$e->{$method}()." : " );
+ if ( ($i % 10) == 0 ) {
+ echo ( '
' );
+ }
+ $i++;
+}
+echo ( 'Took: '.(getmicrotime()-$start).' seconds
' );
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/2.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/2.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/2.php (revision 20119)
@@ -0,0 +1,142 @@
+build();
+
+// Construct strings for next/previous links
+$PMonth = $Month->prevMonth('object'); // Get previous month as object
+$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
+$NMonth = $Month->nextMonth('object');
+$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
+?>
+
+
+
+ Calendar
+
+
+
+
+Build with Calendar_Month_Weeks::build() then Calendar_Week::build()
+
+
+getTimeStamp()); ?>
+
+
+| M |
+T |
+W |
+T |
+F |
+S |
+S |
+
+fetch()) {
+ echo "\n";
+ // Build the days in the week, passing the selected days
+ $Week->build($selectedDays);
+ while ($Day = $Week->fetch()) {
+
+ // Build a link string for each day
+ $link = $_SERVER['PHP_SELF'].
+ '?y='.$Day->thisYear().
+ '&m='.$Day->thisMonth().
+ '&d='.$Day->thisDay();
+
+ // Check to see if day is selected
+ if ($Day->isSelected()) {
+ echo '| '.$Day->thisDay().' | '."\n";
+ // Check to see if day is empty
+ } else if ($Day->isEmpty()) {
+ echo ''.$Day->thisDay().' | '."\n";
+ } else {
+ echo ''.$Day->thisDay().' | '."\n";
+ }
+ }
+ echo '
'."\n";
+}
+?>
+
+|
+<<
+ |
+ |
+
+ >>
+ |
+
+
+Took: '.(getmicrotime()-$start).' seconds';
+?>
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/3.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/3.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/3.php (revision 20119)
@@ -0,0 +1,134 @@
+prevMonth('object'); // Get previous month as object
+$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
+$NMonth = $Month->nextMonth('object');
+$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
+?>
+
+
+
+ Calendar
+
+
+
+
+
+build($selectedDays);
+?>
+Built with Calendar_Month_Weekday::build()
+
+
+getTimeStamp())); ?>
+
+
+| M |
+T |
+W |
+T |
+F |
+S |
+S |
+
+fetch() ) {
+
+ // Build a link string for each day
+ $link = $_SERVER['PHP_SELF'].
+ '?y='.$Day->thisYear().
+ '&m='.$Day->thisMonth().
+ '&d='.$Day->thisDay();
+
+ // isFirst() to find start of week
+ if ( $Day->isFirst() )
+ echo ( "\n" );
+
+ if ( $Day->isSelected() ) {
+ echo ( "| ".$Day->thisDay()." | \n" );
+ } else if ( $Day->isEmpty() ) {
+ echo ( " | \n" );
+ } else {
+ echo ( "".$Day->thisDay()." | \n" );
+ }
+
+ // isLast() to find end of week
+ if ( $Day->isLast() )
+ echo ( "
\n" );
+}
+?>
+
+|
+<<
+ |
+ |
+
+ >>
+ |
+
+
+Took: '.(getmicrotime()-$start).' seconds' );
+?>
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/4.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/4.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/4.php (revision 20119)
@@ -0,0 +1,49 @@
+Result: '.$Unit->thisYear().'-'.$Unit->thisMonth().'-'.$Unit->thisDay().
+ ' '.$Unit->thisHour().':'.$Unit->thisMinute().':'.$Unit->thisSecond();
+if ($Unit->isValid()) {
+ echo ' is valid!';
+} else {
+ $V= & $Unit->getValidator();
+ echo ' is invalid:';
+ while ($error = $V->fetch()) {
+ echo $error->toString() .'
';
+ }
+}
+?>
+Enter a date / time to validate:
+
+Note: Error messages can be controlled with the constants CALENDAR_VALUE_TOOSMALL and CALENDAR_VALUE_TOOLARGE - see Calendar_Validator.php
+
+Took: '.(getmicrotime()-$start).' seconds'; ?>
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/11.phps
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/11.phps (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/11.phps (revision 20119)
@@ -0,0 +1,109 @@
+entry = $entry;
+ }
+ function getEntry() {
+ return $this->entry;
+ }
+}
+
+// Create a day to view the hours for
+$Day = & new Calendar_Day(2003,10,24);
+
+// A sample query to get the data for today (NOT ACTUALLY USED HERE)
+$sql = "
+ SELECT
+ *
+ FROM
+ diary
+ WHERE
+ eventtime >= '".$Day->thisDay(TRUE)."'
+ AND
+ eventtime < '".$Day->nextDay(TRUE)."';";
+
+// An array simulating data from a database
+$result = array (
+ array('eventtime'=>mktime(9,0,0,10,24,2003),'entry'=>'Meeting with sales team'),
+ array('eventtime'=>mktime(11,0,0,10,24,2003),'entry'=>'Conference call with Widget Inc.'),
+ array('eventtime'=>mktime(15,0,0,10,24,2003),'entry'=>'Presentation to board of directors')
+ );
+
+// An array to place selected hours in
+$selection = array();
+
+// Loop through the "database result"
+foreach ( $result as $row ) {
+ $Hour = new Calendar_Hour(2000,1,1,1); // Create Hour with dummy values
+ $Hour->setTimeStamp($row['eventtime']); // Set the real time with setTimeStamp
+
+ // Create the decorator, passing it the Hour
+ $DiaryEvent = new DiaryEvent($Hour);
+
+ // Attach the payload
+ $DiaryEvent->setEntry($row['entry']);
+
+ // Add the decorator to the selection
+ $selection[] = $DiaryEvent;
+}
+
+// Build the hours in that day, passing the selection
+$Day->build($selection);
+?>
+
+
+
+ Passing a Selection Payload with a Decorator
+
+
+Passing a Selection "Payload" using a Decorator
+
+Your Schedule for thisDay(TRUE)) ); ?>
+
+| Time |
+Entry |
+
+fetch() ) {
+
+ $hour = $Hour->thisHour();
+ $minute = $Hour->thisMinute();
+
+ // Office hours only...
+ if ( $hour >= 8 && $hour <= 18 ) {
+ echo ( "\n" );
+ echo ( "| $hour:$minute | \n" );
+
+ // If the hour is selected, call the decorator method...
+ if ( $Hour->isSelected() ) {
+ echo ( "".$Hour->getEntry()." | \n" );
+ } else {
+ echo ( " | \n" );
+ }
+ echo ( "
\n" );
+ }
+}
+?>
+
+The query to fetch this data, with help from PEAR::Calendar, might be;
+
+
+
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/5.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/5.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/5.php (revision 20119)
@@ -0,0 +1,132 @@
+
+
+
+
+ Select and Update
+
+
+Select and Update
+isValid() ) {
+ $V= & $Second->getValidator();
+ echo ('Validation failed:
' );
+ while ( $error = $V->fetch() ) {
+ echo ( $error->toString() .'
' );
+ }
+ } else {
+ echo ('Validation success.
' );
+ echo ( 'New timestamp is: '.$Second->getTimeStamp().' which could be used to update a database, for example');
+ }
+} else {
+$Year = new Calendar_Year($_POST['y']);
+$Month = new Calendar_Month($_POST['y'],$_POST['m']);
+$Day = new Calendar_Day($_POST['y'],$_POST['m'],$_POST['d']);
+$Hour = new Calendar_Hour($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h']);
+$Minute = new Calendar_Minute($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i']);
+$Second = new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
+?>
+
Set the alarm clock
+
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/15.phps
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/15.phps (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/15.phps (revision 20119)
@@ -0,0 +1,58 @@
+getValidator();
+if (!$Validator->isValidWeek()) {
+ die ('Please enter a valid week!');
+}
+*/
+?>
+
+
+
+ Paging Weeks
+
+
+Paging Weeks
+Week: thisWeek().' '.date('F Y',$Week->thisMonth(true)); ?>
+build();
+while ($Day = $Week->fetch()) {
+ echo ''.date('jS F',$Day->thisDay(true))."
\n";
+}
+$days = $Week->fetchAll();
+
+$prevWeek = $Week->prevWeek('array');
+$prevWeekLink = $_SERVER['PHP_SELF'].
+ '?y='.$prevWeek['year'].
+ '&m='.$prevWeek['month'].
+ '&d='.$prevWeek['day'];
+
+$nextWeek = $Week->nextWeek('array');
+$nextWeekLink = $_SERVER['PHP_SELF'].
+ '?y='.$nextWeek['year'].
+ '&m='.$nextWeek['month'].
+ '&d='.$nextWeek['day'];
+?>
+<< | >>
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/9.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/9.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/9.php (revision 20119)
@@ -0,0 +1,16 @@
+getTimeStamp()));
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/17.phps
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/17.phps (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/17.phps (revision 20119)
@@ -0,0 +1,71 @@
+Calling: Calendar_Decorator_Textual::monthNames('long');";
+print_r(Calendar_Decorator_Textual::monthNames('long'));
+echo '';
+
+echo "
Calling: Calendar_Decorator_Textual::weekdayNames('two');";
+print_r(Calendar_Decorator_Textual::weekdayNames('two'));
+echo '';
+
+echo "
Creating: new Calendar_Day(date('Y'), date('n'), date('d'));
";
+$Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
+
+// Decorate
+$Textual = & new Calendar_Decorator_Textual($Calendar);
+
+echo '
Previous month is: '.$Textual->prevMonthName('two').'
';
+echo 'This month is: '.$Textual->thisMonthName('short').'
';
+echo 'Next month is: '.$Textual->nextMonthName().'
';
+echo 'Previous day is: '.$Textual->prevDayName().'
';
+echo 'This day is: '.$Textual->thisDayName('short').'
';
+echo 'Next day is: '.$Textual->nextDayName('one').'
';
+
+echo "Creating: new Calendar_Month_Weekdays(date('Y'), date('n'), 6); - Saturday is first day of week
";
+$Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
+
+// Decorate
+$Textual = & new Calendar_Decorator_Textual($Calendar);
+?>
+Rendering calendar....
+
+thisMonthName().' '.$Textual->thisYear(); ?>
+
+orderedWeekdays('short');
+foreach ($dayheaders as $dayheader) {
+ echo '| '.$dayheader.' | ';
+}
+?>
+
+build();
+while ($Day = $Calendar->fetch()) {
+ if ($Day->isFirst()) {
+ echo "\n";
+ }
+ if ($Day->isEmpty()) {
+ echo '| | ';
+ } else {
+ echo ''.$Day->thisDay().' | ';
+ }
+ if ($Day->isLast()) {
+ echo "
\n";
+ }
+}
+?>
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/19.phps
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/19.phps (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/19.phps (revision 20119)
@@ -0,0 +1,24 @@
+setFirstDay(0); // Make Sunday first Day
+
+echo 'Yesterday: '.$WeekDay->prevWeekDay().'
';
+echo 'Today: '.$WeekDay->thisWeekDay().'
';
+echo 'Tomorrow: '.$WeekDay->nextWeekDay().'
';
+
+$WeekDay->build();
+echo 'Hours today:
';
+while ( $Hour = $WeekDay->fetch() ) {
+ echo $Hour->thisHour().'
';
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/10.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/10.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/10.php (revision 20119)
@@ -0,0 +1,93 @@
+build();
+?>
+
+
+
+
+ A Simple Decorator
+
+
+A Simple Decorator
+
+thisMonth() ); ?>
+fetch() ) {
+ if ( $Day->isFirst() ) {
+ echo ( "\n\n" );
+ }
+ if ( $Day->isEmpty() ) {
+ echo ( "| | " );
+ } else {
+ echo ( "".$Day->thisDay()." | " );
+ }
+ if ( $Day->isLast() ) {
+ echo ( "\n
\n" );
+ }
+}
+?>
+
+| Prev |
+ |
+Next |
+
+
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/11.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/11.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/11.php (revision 20119)
@@ -0,0 +1,109 @@
+entry = $entry;
+ }
+ function getEntry() {
+ return $this->entry;
+ }
+}
+
+// Create a day to view the hours for
+$Day = & new Calendar_Day(2003,10,24);
+
+// A sample query to get the data for today (NOT ACTUALLY USED HERE)
+$sql = "
+ SELECT
+ *
+ FROM
+ diary
+ WHERE
+ eventtime >= '".$Day->thisDay(TRUE)."'
+ AND
+ eventtime < '".$Day->nextDay(TRUE)."';";
+
+// An array simulating data from a database
+$result = array (
+ array('eventtime'=>mktime(9,0,0,10,24,2003),'entry'=>'Meeting with sales team'),
+ array('eventtime'=>mktime(11,0,0,10,24,2003),'entry'=>'Conference call with Widget Inc.'),
+ array('eventtime'=>mktime(15,0,0,10,24,2003),'entry'=>'Presentation to board of directors')
+ );
+
+// An array to place selected hours in
+$selection = array();
+
+// Loop through the "database result"
+foreach ( $result as $row ) {
+ $Hour = new Calendar_Hour(2000,1,1,1); // Create Hour with dummy values
+ $Hour->setTimeStamp($row['eventtime']); // Set the real time with setTimeStamp
+
+ // Create the decorator, passing it the Hour
+ $DiaryEvent = new DiaryEvent($Hour);
+
+ // Attach the payload
+ $DiaryEvent->setEntry($row['entry']);
+
+ // Add the decorator to the selection
+ $selection[] = $DiaryEvent;
+}
+
+// Build the hours in that day, passing the selection
+$Day->build($selection);
+?>
+
+
+
+ Passing a Selection Payload with a Decorator
+
+
+Passing a Selection "Payload" using a Decorator
+
+Your Schedule for thisDay(TRUE)) ); ?>
+
+| Time |
+Entry |
+
+fetch() ) {
+
+ $hour = $Hour->thisHour();
+ $minute = $Hour->thisMinute();
+
+ // Office hours only...
+ if ( $hour >= 8 && $hour <= 18 ) {
+ echo ( "\n" );
+ echo ( "| $hour:$minute | \n" );
+
+ // If the hour is selected, call the decorator method...
+ if ( $Hour->isSelected() ) {
+ echo ( "".$Hour->getEntry()." | \n" );
+ } else {
+ echo ( " | \n" );
+ }
+ echo ( "
\n" );
+ }
+}
+?>
+
+The query to fetch this data, with help from PEAR::Calendar, might be;
+
+
+
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/12.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/12.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/12.php (revision 20119)
@@ -0,0 +1,116 @@
+build();
+?>
+
+
+
+ <?php echo ( $Year->thisYear() ); ?>
+
+
+
+
+
+thisYear() ); ?>
+
+
+
+fetch() ) {
+
+ switch ( $i ) {
+ case 0:
+ echo ( "\n" );
+ break;
+ case 3:
+ case 6:
+ case 9:
+ echo ( "
\n\n" );
+ break;
+ case 12:
+ echo ( "
\n" );
+ break;
+ }
+
+ echo ( "\n\n" );
+ echo ( "".date('F',$Month->thisMonth(TRUE))."" );
+ echo ( "\n| M | T | W | T | F | S | S | \n " );
+ $Month->build();
+ while ( $Day = $Month->fetch() ) {
+ if ( $Day->isFirst() ) {
+ echo ( "\n" );
+ }
+ if ( $Day->isEmpty() ) {
+ echo ( "| | \n" );
+ } else {
+ echo ( "".$Day->thisDay()." | \n" );
+ }
+ if ( $Day->isLast() ) {
+ echo ( " \n" );
+ }
+ }
+ echo ( " \n | \n" );
+
+ $i++;
+}
+?>
+
+Took:
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/1.phps
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/1.phps (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/1.phps (revision 20119)
@@ -0,0 +1,92 @@
+' );
+echo ( 'The time is now: '.date('Y M d H:i:s',$c->getTimestamp()).'
' );
+
+$i = 1;
+echo ( 'First Iteration
' );
+echo ( 'The first iteration is more "expensive", the calendar data
+ structures having to be built.
' );
+$start = getmicrotime();
+$c->build();
+while ( $e = $c->fetch() ) {
+ $class = strtolower(get_class($e));
+ $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
+ "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
+ $method = 'this'.str_replace('calendar_','',$class);
+ echo ( "".$e->{$method}()." : " );
+ if ( ($i % 10) == 0 ) {
+ echo ( '
' );
+ }
+ $i++;
+}
+echo ( 'Took: '.(getmicrotime()-$start).' seconds
' );
+
+$i = 1;
+echo ( 'Second Iteration
' );
+echo ( 'This second iteration is faster, the data structures
+ being re-used
' );
+$start = getmicrotime();
+while ( $e = $c->fetch() ) {
+ $class = strtolower(get_class($e));
+ $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
+ "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
+ $method = 'this'.str_replace('calendar_','',$class);
+ echo ( "".$e->{$method}()." : " );
+ if ( ($i % 10) == 0 ) {
+ echo ( '
' );
+ }
+ $i++;
+}
+echo ( 'Took: '.(getmicrotime()-$start).' seconds
' );
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/13.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/13.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/13.php (revision 20119)
@@ -0,0 +1,99 @@
+getTimestamp());
+
+echo ( 'Using PEAR::Date engine
' );
+echo ( 'Viewing: '.@$_GET['view'].'
' );
+echo ( 'The time is now: '.$date->format('%Y %a %e %T').'
' );
+
+$i = 1;
+echo ( 'First Iteration
' );
+echo ( 'The first iteration is more "expensive", the calendar data
+ structures having to be built.
' );
+$start = getmicrotime();
+$c->build();
+while ( $e = $c->fetch() ) {
+ $class = strtolower(get_class($e));
+ $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
+ "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
+ $method = 'this'.str_replace('calendar_','',$class);
+ echo ( "".$e->{$method}()." : " );
+ if ( ($i % 10) == 0 ) {
+ echo ( '
' );
+ }
+ $i++;
+}
+echo ( 'Took: '.(getmicrotime()-$start).' seconds
' );
+
+$i = 1;
+echo ( 'Second Iteration
' );
+echo ( 'This second iteration is faster, the data structures
+ being re-used
' );
+$start = getmicrotime();
+while ( $e = $c->fetch() ) {
+ $class = strtolower(get_class($e));
+ $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
+ "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
+ $method = 'this'.str_replace('calendar_','',$class);
+ echo ( "".$e->{$method}()." : " );
+ if ( ($i % 10) == 0 ) {
+ echo ( '
' );
+ }
+ $i++;
+}
+echo ( 'Took: '.(getmicrotime()-$start).' seconds
' );
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/14.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/14.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/14.php (revision 20119)
@@ -0,0 +1,141 @@
+build($selectedDays);
+
+// Construct strings for next/previous links
+$PMonth = $month->prevMonth('object'); // Get previous month as object
+$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
+$NMonth = $month->nextMonth('object');
+$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
+
+$thisDate = new Date($month->thisMonth('timestamp'));
+?>
+
+
+
+ Calendar using PEAR::Date Engine
+
+
+
+
+
+Calendar using PEAR::Date Engine
+
+
+format('%B %Y'); ?>
+
+
+| M |
+T |
+W |
+T |
+F |
+S |
+S |
+
+fetch()) {
+ // Build a link string for each day
+ $link = $_SERVER['PHP_SELF'].
+ '?y='.$day->thisYear().
+ '&m='.$day->thisMonth().
+ '&d='.$day->thisDay();
+
+ // isFirst() to find start of week
+ if ($day->isFirst())
+ echo "\n";
+
+ if ($day->isSelected()) {
+ echo '| '.$day->thisDay().' | '."\n";
+ } else if ($day->isEmpty()) {
+ echo ' | '."\n";
+ } else {
+ echo ''.$day->thisDay().' | '."\n";
+ }
+
+ // isLast() to find end of week
+ if ($day->isLast()) {
+ echo "
\n";
+ }
+}
+?>
+
+|
+<<
+ |
+ |
+
+ >>
+ |
+
+
+Took: '.(getmicrotime()-$start).' seconds';
+?>
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/index.html
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/index.html (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/index.html (revision 20119)
@@ -0,0 +1,50 @@
+
+
+
+ PEAR::Calendar Examples
+
+
+
+
+PEAR::Calendar Examples
+$Id: index.html,v 1.6 2004/08/17 09:10:53 hfuecks Exp $
+
+- 1.php [src] - shows basic usage, passing all the way down from
Calendar_Year to Calendar_Second - more of a quick test it's working
+- 2.php [src] - shows how to build a tabular month using
Calendar_Month_Weeks, Calendar_Week, Calendar_Day as well as selecting some dates.
+- 3.php [src] - shows how to build a tabular month using
Calendar_Month_Weekdays and Calendar_Day, as well as selecting some dates (this method is faster).
+- 4.php [src] - shows how to use PEAR::Calendar for validation.
+- 5.php [src] - shows PEAR::Calendar in use to help generate a form.
+- 6.php [src] - a month and day "planner" calendar, which can be rendered both as HTML and WML.
+- 7.php [src] - a simple SOAP Calendar Server, using PEAR::SOAP and PEAR::Calendar
+- 8.php [src] - a WSDL SOAP client for the SOAP Calendar Server
+- 9.php [src] - quick example of i18n with
setlocale (not working on SF)
+- 10.php [src] - an example of extending
Calendar_Decorator to modify output
+- 11.php [src] - attaching a "payload" (e.g. results of a DB query) to a calendar using
Calendar_Decorator to allow the payload to be available inside the main loop.
+- 12.php [src] - a complete year with months.
+- 13.php [src] - same as 1.php but using
Calendar_Engine_PearDate, (see PEAR::Date).
+- 14.php [src] - same as 3.php but using
Calendar_Engine_PearDate
+- 15.php [src] - paging through weeks
+- 16.php [src] - example of
Calendar_Decorator_Uri. Note you should prefer Calendar_Util_Uri (see below) in most cases, for performance
+- 17.php [src] - example of
Calendar_Decorator_Textual. Note you should prefer Calendar_Util_Textual (see below) in most cases, for performance
+- 18.php [src] - example of
Calendar_Decorator_Wrapper.
+- 19.php [src] - example of
Calendar_Decorator_Weekday.
+- 20.php [src] - shows how to attach a "payload" spanning multiple days, with more than one entry per day
+- 21.php [src] - same as 12.php but using
Calendar_Month_Weeks instead of Calendar_Month_Weekdays to allow the week in the year or week in the month to be displayed.
+- 22.php [src] - demonstrates use of
Calendar_Util_Uri.
+- 23.php [src] - demonstrates use of
Calendar_Util_Textual.
+- 24.php [src] -
Calendar_Decorator_Weekday combined with Calendar_Decorator_Wrapper to decorate days in the month.
+
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/15.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/15.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/15.php (revision 20119)
@@ -0,0 +1,58 @@
+getValidator();
+if (!$Validator->isValidWeek()) {
+ die ('Please enter a valid week!');
+}
+*/
+?>
+
+
+
+ Paging Weeks
+
+
+Paging Weeks
+Week: thisWeek().' '.date('F Y',$Week->thisMonth(true)); ?>
+build();
+while ($Day = $Week->fetch()) {
+ echo ''.date('jS F',$Day->thisDay(true))."
\n";
+}
+$days = $Week->fetchAll();
+
+$prevWeek = $Week->prevWeek('array');
+$prevWeekLink = $_SERVER['PHP_SELF'].
+ '?y='.$prevWeek['year'].
+ '&m='.$prevWeek['month'].
+ '&d='.$prevWeek['day'];
+
+$nextWeek = $Week->nextWeek('array');
+$nextWeekLink = $_SERVER['PHP_SELF'].
+ '?y='.$nextWeek['year'].
+ '&m='.$nextWeek['month'].
+ '&d='.$nextWeek['day'];
+?>
+<< | >>
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/3.phps
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/3.phps (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/3.phps (revision 20119)
@@ -0,0 +1,134 @@
+prevMonth('object'); // Get previous month as object
+$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
+$NMonth = $Month->nextMonth('object');
+$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
+?>
+
+
+
+ Calendar
+
+
+
+
+
+build($selectedDays);
+?>
+Built with Calendar_Month_Weekday::build()
+
+
+getTimeStamp())); ?>
+
+
+| M |
+T |
+W |
+T |
+F |
+S |
+S |
+
+fetch() ) {
+
+ // Build a link string for each day
+ $link = $_SERVER['PHP_SELF'].
+ '?y='.$Day->thisYear().
+ '&m='.$Day->thisMonth().
+ '&d='.$Day->thisDay();
+
+ // isFirst() to find start of week
+ if ( $Day->isFirst() )
+ echo ( "\n" );
+
+ if ( $Day->isSelected() ) {
+ echo ( "| ".$Day->thisDay()." | \n" );
+ } else if ( $Day->isEmpty() ) {
+ echo ( " | \n" );
+ } else {
+ echo ( "".$Day->thisDay()." | \n" );
+ }
+
+ // isLast() to find end of week
+ if ( $Day->isLast() )
+ echo ( "
\n" );
+}
+?>
+
+|
+<<
+ |
+ |
+
+ >>
+ |
+
+
+Took: '.(getmicrotime()-$start).' seconds' );
+?>
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/16.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/16.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/16.php (revision 20119)
@@ -0,0 +1,31 @@
+The current month is '
+ .$Calendar->thisMonth().' of year '.$Calendar->thisYear().'');
+
+$Uri = & new Calendar_Decorator_Uri($Calendar);
+$Uri->setFragments('jahr','monat');
+// $Uri->setSeperator('/'); // Default is &
+// $Uri->setScalar(); // Omit variable names
+echo ( "Previous Uri:\t".$Uri->prev('month')."\n" );
+echo ( "This Uri:\t".$Uri->this('month')."\n" );
+echo ( "Next Uri:\t".$Uri->next('month')."\n" );
+?>
+
+Prev :
+Next
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/17.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/17.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/17.php (revision 20119)
@@ -0,0 +1,71 @@
+Calling: Calendar_Decorator_Textual::monthNames('long');";
+print_r(Calendar_Decorator_Textual::monthNames('long'));
+echo '';
+
+echo "
Calling: Calendar_Decorator_Textual::weekdayNames('two');";
+print_r(Calendar_Decorator_Textual::weekdayNames('two'));
+echo '';
+
+echo "
Creating: new Calendar_Day(date('Y'), date('n'), date('d'));
";
+$Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
+
+// Decorate
+$Textual = & new Calendar_Decorator_Textual($Calendar);
+
+echo '
Previous month is: '.$Textual->prevMonthName('two').'
';
+echo 'This month is: '.$Textual->thisMonthName('short').'
';
+echo 'Next month is: '.$Textual->nextMonthName().'
';
+echo 'Previous day is: '.$Textual->prevDayName().'
';
+echo 'This day is: '.$Textual->thisDayName('short').'
';
+echo 'Next day is: '.$Textual->nextDayName('one').'
';
+
+echo "Creating: new Calendar_Month_Weekdays(date('Y'), date('n'), 6); - Saturday is first day of week
";
+$Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
+
+// Decorate
+$Textual = & new Calendar_Decorator_Textual($Calendar);
+?>
+Rendering calendar....
+
+thisMonthName().' '.$Textual->thisYear(); ?>
+
+orderedWeekdays('short');
+foreach ($dayheaders as $dayheader) {
+ echo '| '.$dayheader.' | ';
+}
+?>
+
+build();
+while ($Day = $Calendar->fetch()) {
+ if ($Day->isFirst()) {
+ echo "\n";
+ }
+ if ($Day->isEmpty()) {
+ echo '| | ';
+ } else {
+ echo ''.$Day->thisDay().' | ';
+ }
+ if ($Day->isLast()) {
+ echo "
\n";
+ }
+}
+?>
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/5.phps
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/5.phps (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/5.phps (revision 20119)
@@ -0,0 +1,132 @@
+
+
+
+
+ Select and Update
+
+
+Select and Update
+isValid() ) {
+ $V= & $Second->getValidator();
+ echo ('Validation failed:
' );
+ while ( $error = $V->fetch() ) {
+ echo ( $error->toString() .'
' );
+ }
+ } else {
+ echo ('Validation success.
' );
+ echo ( 'New timestamp is: '.$Second->getTimeStamp().' which could be used to update a database, for example');
+ }
+} else {
+$Year = new Calendar_Year($_POST['y']);
+$Month = new Calendar_Month($_POST['y'],$_POST['m']);
+$Day = new Calendar_Day($_POST['y'],$_POST['m'],$_POST['d']);
+$Hour = new Calendar_Hour($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h']);
+$Minute = new Calendar_Minute($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i']);
+$Second = new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
+?>
+
Set the alarm clock
+
+Note: Error messages can be controlled with the constants CALENDAR_VALUE_TOOSMALL and CALENDAR_VALUE_TOOLARGE - see Calendar_Validator.php
+
+Took: '.(getmicrotime()-$start).' seconds'; ?>
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/6.phps
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/6.phps (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/6.phps (revision 20119)
@@ -0,0 +1,210 @@
+' );
+?>
+
+
+Personal Planner Rendered with WML
+
+Viewing getTimeStamp()) ); ?>
+
+
+Back to Month View
+"/>
+
+
+
+build();
+ while ( $Hour = & $Day->fetch() ) {
+ echo ( "\n" );
+ echo ( "| ".date('g a',$Hour->getTimeStamp())." | Free time! | \n" );
+ echo ( "
\n" );
+ }
+?>
+
+
+getTimeStamp()) ); ?>
+
+
+| M | T | W | T | F | S | S |
+
+build($selection);
+while ( $Day = $Month->fetch() ) {
+ if ( $Day->isFirst() ) {
+ echo ( "\n" );
+ }
+ if ( $Day->isEmpty() ) {
+ echo ( " | \n" );
+ } else if ( $Day->isSelected() ) {
+ echo ( "".$Day->thisDay()."\nthisYear()."&m=".$Day->thisMonth()."&d=".$Day->thisDay().
+ "&mime=wml\" />\n | \n" );
+ } else {
+ echo ( "".$Day->thisDay()."\nthisYear()."&m=".$Day->thisMonth()."&d=".$Day->thisDay().
+ "&mime=wml\" /> | \n" );
+ }
+ if ( $Day->isLast() ) {
+ echo ( "
\n" );
+ }
+}
+?>
+
+|
+
+<<
+"/>
+
+ |
+ | | | | |
+
+
+>>
+"/>
+
+ |
+
+
+
+
+Back to HTML
+Took: '.(getmicrotime()-$start).' seconds' ); ?>
+
+
+
+
+
+ HTML (+WML) Personal Planner
+
+
+Personal Planner Rendered with HTML
+To view in WML, click here or place a ?mime=wml at the end of any URL.
+Note that Opera supports WML natively and Mozilla / Firefox has the WMLBrowser
+plugin: wmlbrowser.mozdev.org
+
+Viewing getTimeStamp()) ); ?>
+
+
+Back to Month View
+
+
+build();
+ while ( $Hour = & $Day->fetch() ) {
+ echo ( "\n" );
+ echo ( "| ".date('g a',$Hour->getTimeStamp())." | Free time! | \n" );
+ echo ( "
\n" );
+ }
+?>
+
+
+getTimeStamp()) ); ?>
+
+
+
+
+
+Took: '.(getmicrotime()-$start).' seconds' ); ?>
+
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/docs/examples/8.phps
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/docs/examples/8.phps (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/docs/examples/8.phps (revision 20119)
@@ -0,0 +1,70 @@
+") ) {
+ die('PHP 5 has problems with PEAR::SOAP Client (8.0RC3)
+ - remove @ before include below to see why');
+}
+
+if (!@include('SOAP'.DIRECTORY_SEPARATOR.'Client.php')) {
+ die('You must have PEAR::SOAP installed');
+}
+
+// Just to save manaul modification...
+$basePath = explode('/', $_SERVER['SCRIPT_NAME']);
+array_pop($basePath);
+$basePath = implode('/', $basePath);
+$url = 'http://'.$_SERVER['SERVER_NAME'].$basePath.'/7.php?wsdl';
+
+if (!isset($_GET['y'])) $_GET['y'] = date('Y');
+if (!isset($_GET['m'])) $_GET['m'] = date('n');
+
+$wsdl = new SOAP_WSDL ($url);
+
+echo ( ''.$wsdl->generateProxyCode().'
' );
+
+$calendarClient = $wsdl->getProxy();
+
+$month = $calendarClient->getMonth((int)$_GET['y'],(int)$_GET['m']);
+
+if ( PEAR::isError($month) ) {
+ die ( $month->toString() );
+}
+?>
+
+
+
+ Calendar over the Wire
+
+
+Calendar Over the Wire (featuring PEAR::SOAP)
+
+monthname );?>
+
+| M | T | W | T | F | S | S |
+
+days as $day ) {
+
+ if ( $day->isFirst === 1 )
+ echo ( "\n" );
+ if ( $day->isEmpty === 1 ) {
+ echo ( " | " );
+ } else {
+ echo ( "".$day->day." | " );
+ }
+ if ( $day->isLast === 1 )
+ echo ( "
\n" );
+}
+?>
+
+
+Enter Year and Month to View:
+
+
+
Index: /closed/version-2_5-dev/data/module/Calendar/Factory.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Factory.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Factory.php (revision 20119)
@@ -0,0 +1,145 @@
+ |
+// | Lorenzo Alberton |
+// +----------------------------------------------------------------------+
+//
+// $Id: Factory.php,v 1.3 2005/10/22 10:08:47 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Factory.php,v 1.3 2005/10/22 10:08:47 quipo Exp $
+ */
+
+/**
+ * Allows Calendar include path to be redefined
+ * @ignore
+ */
+if (!defined('CALENDAR_ROOT')) {
+ define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
+}
+
+/**
+ * Load Calendar base class
+ */
+require_once CALENDAR_ROOT.'Calendar.php';
+
+/**
+ * Contains a factory method to return a Singleton instance of a class
+ * implementing the Calendar_Engine_Interface.
+ * For Month objects, to control type of month returned, use CALENDAR_MONTH_STATE
+ * constact e.g.;
+ *
+ * require_once 'Calendar/Factory.php';
+ * define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKDAYS); // Use Calendar_Month_Weekdays
+ * // define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKS); // Use Calendar_Month_Weeks
+ * // define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH); // Use Calendar_Month
+ *
+ * It defaults to building Calendar_Month objects.
+ * Use the constract CALENDAR_FIRST_DAY_OF_WEEK to control the first day of the week
+ * for Month or Week objects (e.g. 0 = Sunday, 6 = Saturday)
+ * @package Calendar
+ * @access protected
+ */
+class Calendar_Factory
+{
+ /**
+ * Creates a calendar object given the type and units
+ * @param string class of calendar object to create
+ * @param int year
+ * @param int month
+ * @param int day
+ * @param int hour
+ * @param int minute
+ * @param int second
+ * @return object subclass of Calendar
+ * @access public
+ * @static
+ */
+ function create($type, $y = 2000, $m = 1, $d = 1, $h = 0, $i = 0, $s = 0)
+ {
+ $firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1;
+ switch ($type) {
+ case 'Day':
+ require_once CALENDAR_ROOT.'Day.php';
+ return new Calendar_Day($y,$m,$d);
+ case 'Month':
+ // Set default state for which month type to build
+ if (!defined('CALENDAR_MONTH_STATE')) {
+ define('CALENDAR_MONTH_STATE', CALENDAR_USE_MONTH);
+ }
+ switch (CALENDAR_MONTH_STATE) {
+ case CALENDAR_USE_MONTH_WEEKDAYS:
+ require_once CALENDAR_ROOT.'Month/Weekdays.php';
+ $class = 'Calendar_Month_Weekdays';
+ break;
+ case CALENDAR_USE_MONTH_WEEKS:
+ require_once CALENDAR_ROOT.'Month/Weeks.php';
+ $class = 'Calendar_Month_Weeks';
+ break;
+ case CALENDAR_USE_MONTH:
+ default:
+ require_once CALENDAR_ROOT.'Month.php';
+ $class = 'Calendar_Month';
+ break;
+ }
+ return new $class($y, $m, $firstDay);
+ case 'Week':
+ require_once CALENDAR_ROOT.'Week.php';
+ return new Calendar_Week($y, $m, $d, $firstDay);
+ case 'Hour':
+ require_once CALENDAR_ROOT.'Hour.php';
+ return new Calendar_Hour($y, $m, $d, $h);
+ case 'Minute':
+ require_once CALENDAR_ROOT.'Minute.php';
+ return new Calendar_Minute($y, $m, $d, $h, $i);
+ case 'Second':
+ require_once CALENDAR_ROOT.'Second.php';
+ return new Calendar_Second($y,$m,$d,$h,$i,$s);
+ case 'Year':
+ require_once CALENDAR_ROOT.'Year.php';
+ return new Calendar_Year($y);
+ default:
+ require_once 'PEAR.php';
+ PEAR::raiseError(
+ 'Calendar_Factory::create() unrecognised type: '.$type, null, PEAR_ERROR_TRIGGER,
+ E_USER_NOTICE, 'Calendar_Factory::create()');
+ return false;
+ }
+ }
+ /**
+ * Creates an instance of a calendar object, given a type and timestamp
+ * @param string type of object to create
+ * @param mixed timestamp (depending on Calendar engine being used)
+ * @return object subclass of Calendar
+ * @access public
+ * @static
+ */
+ function & createByTimestamp($type, $stamp)
+ {
+ $cE = & Calendar_Engine_Factory::getEngine();
+ $y = $cE->stampToYear($stamp);
+ $m = $cE->stampToMonth($stamp);
+ $d = $cE->stampToDay($stamp);
+ $h = $cE->stampToHour($stamp);
+ $i = $cE->stampToMinute($stamp);
+ $s = $cE->stampToSecond($stamp);
+ $cal = Calendar_Factory::create($type, $y, $m, $d, $h, $i, $s);
+ return $cal;
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Calendar.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Calendar.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Calendar.php (revision 20119)
@@ -0,0 +1,685 @@
+ |
+// | Lorenzo Alberton |
+// +----------------------------------------------------------------------+
+//
+// $Id: Calendar.php,v 1.3 2005/10/22 10:07:11 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Calendar.php,v 1.3 2005/10/22 10:07:11 quipo Exp $
+ */
+
+/**
+ * Allows Calendar include path to be redefined
+ */
+if (!defined('CALENDAR_ROOT')) {
+ define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
+}
+
+/**
+ * Constant which defines the calculation engine to use
+ */
+if (!defined('CALENDAR_ENGINE')) {
+ define('CALENDAR_ENGINE', 'UnixTS');
+}
+
+/**
+ * Define Calendar Month states
+ */
+define('CALENDAR_USE_MONTH', 1);
+define('CALENDAR_USE_MONTH_WEEKDAYS', 2);
+define('CALENDAR_USE_MONTH_WEEKS', 3);
+
+/**
+ * Contains a factory method to return a Singleton instance of a class
+ * implementing the Calendar_Engine_Interface.
+ * Note: this class must be modified to "register" alternative
+ * Calendar_Engines. The engine used can be controlled with the constant
+ * CALENDAR_ENGINE
+ * @see Calendar_Engine_Interface
+ * @package Calendar
+ * @access protected
+ */
+class Calendar_Engine_Factory
+{
+ /**
+ * Returns an instance of the engine
+ * @return object instance of a calendar calculation engine
+ * @access protected
+ */
+ function & getEngine()
+ {
+ static $engine = false;
+ switch (CALENDAR_ENGINE) {
+ case 'PearDate':
+ $class = 'Calendar_Engine_PearDate';
+ break;
+ case 'UnixTS':
+ default:
+ $class = 'Calendar_Engine_UnixTS';
+ break;
+ }
+ if (!$engine) {
+ if (!class_exists($class)) {
+ require_once CALENDAR_ROOT.'Engine'.DIRECTORY_SEPARATOR.CALENDAR_ENGINE.'.php';
+ }
+ $engine = new $class;
+ }
+ return $engine;
+ }
+}
+
+/**
+ * Base class for Calendar API. This class should not be instantiated
+ * directly.
+ * @abstract
+ * @package Calendar
+ */
+class Calendar
+{
+ /**
+ * Instance of class implementing calendar engine interface
+ * @var object
+ * @access private
+ */
+ var $cE;
+
+ /**
+ * Instance of Calendar_Validator (lazy initialized when isValid() or
+ * getValidor() is called
+ * @var Calendar_Validator
+ * @access private
+ */
+ var $validator;
+
+ /**
+ * Year for this calendar object e.g. 2003
+ * @access private
+ * @var int
+ */
+ var $year;
+
+ /**
+ * Month for this calendar object e.g. 9
+ * @access private
+ * @var int
+ */
+ var $month;
+
+ /**
+ * Day of month for this calendar object e.g. 23
+ * @access private
+ * @var int
+ */
+ var $day;
+
+ /**
+ * Hour of day for this calendar object e.g. 13
+ * @access private
+ * @var int
+ */
+ var $hour;
+
+ /**
+ * Minute of hour this calendar object e.g. 46
+ * @access private
+ * @var int
+ */
+ var $minute;
+
+ /**
+ * Second of minute this calendar object e.g. 34
+ * @access private
+ * @var int
+ */
+ var $second;
+
+ /**
+ * Marks this calendar object as selected (e.g. 'today')
+ * @access private
+ * @var boolean
+ */
+ var $selected = false;
+
+ /**
+ * Collection of child calendar objects created from subclasses
+ * of Calendar. Type depends on the object which created them.
+ * @access private
+ * @var array
+ */
+ var $children = array();
+
+ /**
+ * Constructs the Calendar
+ * @param int year
+ * @param int month
+ * @param int day
+ * @param int hour
+ * @param int minute
+ * @param int second
+ * @access protected
+ */
+ function Calendar($y = 2000, $m = 1, $d = 1, $h = 0, $i = 0, $s = 0)
+ {
+ static $cE = null;
+ if (!isset($cE)) {
+ $cE = & Calendar_Engine_Factory::getEngine();
+ }
+ $this->cE = & $cE;
+ $this->year = (int)$y;
+ $this->month = (int)$m;
+ $this->day = (int)$d;
+ $this->hour = (int)$h;
+ $this->minute = (int)$i;
+ $this->second = (int)$s;
+ }
+
+ /**
+ * Defines the calendar by a timestamp (Unix or ISO-8601), replacing values
+ * passed to the constructor
+ * @param int|string Unix or ISO-8601 timestamp
+ * @return void
+ * @access public
+ */
+ function setTimestamp($ts)
+ {
+ $this->year = $this->cE->stampToYear($ts);
+ $this->month = $this->cE->stampToMonth($ts);
+ $this->day = $this->cE->stampToDay($ts);
+ $this->hour = $this->cE->stampToHour($ts);
+ $this->minute = $this->cE->stampToMinute($ts);
+ $this->second = $this->cE->stampToSecond($ts);
+ }
+
+ /**
+ * Returns a timestamp from the current date / time values. Format of
+ * timestamp depends on Calendar_Engine implementation being used
+ * @return int|string timestamp
+ * @access public
+ */
+ function getTimestamp()
+ {
+ return $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day,
+ $this->hour, $this->minute, $this->second);
+ }
+
+ /**
+ * Defines calendar object as selected (e.g. for today)
+ * @param boolean state whether Calendar subclass
+ * @return void
+ * @access public
+ */
+ function setSelected($state = true)
+ {
+ $this->selected = $state;
+ }
+
+ /**
+ * True if the calendar subclass object is selected (e.g. today)
+ * @return boolean
+ * @access public
+ */
+ function isSelected()
+ {
+ return $this->selected;
+ }
+
+ /**
+ * Adjusts the date (helper method)
+ * @return void
+ * @access public
+ */
+ function adjust()
+ {
+ $stamp = $this->getTimeStamp();
+ $this->year = $this->cE->stampToYear($stamp);
+ $this->month = $this->cE->stampToMonth($stamp);
+ $this->day = $this->cE->stampToDay($stamp);
+ $this->hour = $this->cE->stampToHour($stamp);
+ $this->minute = $this->cE->stampToMinute($stamp);
+ $this->second = $this->cE->stampToSecond($stamp);
+ }
+
+ /**
+ * Returns the date as an associative array (helper method)
+ * @param mixed timestamp (leave empty for current timestamp)
+ * @return array
+ * @access public
+ */
+ function toArray($stamp=null)
+ {
+ if (is_null($stamp)) {
+ $stamp = $this->getTimeStamp();
+ }
+ return array(
+ 'year' => $this->cE->stampToYear($stamp),
+ 'month' => $this->cE->stampToMonth($stamp),
+ 'day' => $this->cE->stampToDay($stamp),
+ 'hour' => $this->cE->stampToHour($stamp),
+ 'minute' => $this->cE->stampToMinute($stamp),
+ 'second' => $this->cE->stampToSecond($stamp)
+ );
+ }
+
+ /**
+ * Returns the value as an associative array (helper method)
+ * @param string type of date object that return value represents
+ * @param string $format ['int' | 'array' | 'timestamp' | 'object']
+ * @param mixed timestamp (depending on Calendar engine being used)
+ * @param int integer default value (i.e. give me the answer quick)
+ * @return mixed
+ * @access private
+ */
+ function returnValue($returnType, $format, $stamp, $default)
+ {
+ switch (strtolower($format)) {
+ case 'int':
+ return $default;
+ case 'array':
+ return $this->toArray($stamp);
+ break;
+ case 'object':
+ require_once CALENDAR_ROOT.'Factory.php';
+ return Calendar_Factory::createByTimestamp($returnType,$stamp);
+ break;
+ case 'timestamp':
+ default:
+ return $stamp;
+ break;
+ }
+ }
+
+ /**
+ * Abstract method for building the children of a calendar object.
+ * Implemented by Calendar subclasses
+ * @param array containing Calendar objects to select (optional)
+ * @return boolean
+ * @access public
+ * @abstract
+ */
+ function build($sDates = array())
+ {
+ require_once 'PEAR.php';
+ PEAR::raiseError(
+ 'Calendar::build is abstract', null, PEAR_ERROR_TRIGGER,
+ E_USER_NOTICE, 'Calendar::build()');
+ return false;
+ }
+
+ /**
+ * Abstract method for selected data objects called from build
+ * @param array
+ * @return boolean
+ * @access public
+ * @abstract
+ */
+ function setSelection($sDates)
+ {
+ require_once 'PEAR.php';
+ PEAR::raiseError(
+ 'Calendar::setSelection is abstract', null, PEAR_ERROR_TRIGGER,
+ E_USER_NOTICE, 'Calendar::setSelection()');
+ return false;
+ }
+
+ /**
+ * Iterator method for fetching child Calendar subclass objects
+ * (e.g. a minute from an hour object). On reaching the end of
+ * the collection, returns false and resets the collection for
+ * further iteratations.
+ * @return mixed either an object subclass of Calendar or false
+ * @access public
+ */
+ function fetch()
+ {
+ $child = each($this->children);
+ if ($child) {
+ return $child['value'];
+ } else {
+ reset($this->children);
+ return false;
+ }
+ }
+
+ /**
+ * Fetches all child from the current collection of children
+ * @return array
+ * @access public
+ */
+ function fetchAll()
+ {
+ return $this->children;
+ }
+
+ /**
+ * Get the number Calendar subclass objects stored in the internal
+ * collection.
+ * @return int
+ * @access public
+ */
+ function size()
+ {
+ return count($this->children);
+ }
+
+ /**
+ * Determine whether this date is valid, with the bounds determined by
+ * the Calendar_Engine. The call is passed on to
+ * Calendar_Validator::isValid
+ * @return boolean
+ * @access public
+ */
+ function isValid()
+ {
+ $validator = & $this->getValidator();
+ return $validator->isValid();
+ }
+
+ /**
+ * Returns an instance of Calendar_Validator
+ * @return Calendar_Validator
+ * @access public
+ */
+ function & getValidator()
+ {
+ if (!isset($this->validator)) {
+ require_once CALENDAR_ROOT.'Validator.php';
+ $this->validator = & new Calendar_Validator($this);
+ }
+ return $this->validator;
+ }
+
+ /**
+ * Returns a reference to the current Calendar_Engine being used. Useful
+ * for Calendar_Table_Helper and Calendar_Validator
+ * @return object implementing Calendar_Engine_Inteface
+ * @access protected
+ */
+ function & getEngine()
+ {
+ return $this->cE;
+ }
+
+ /**
+ * Set the CALENDAR_FIRST_DAY_OF_WEEK constant to the $firstDay value
+ * if the constant is not set yet.
+ * @throws E_USER_WARNING this method throws a WARNING if the
+ * CALENDAR_FIRST_DAY_OF_WEEK constant is already defined and
+ * the $firstDay parameter is set to a different value
+ * @param integer $firstDay first day of the week (0=sunday, 1=monday, ...)
+ * @return integer
+ * @access protected
+ */
+ function defineFirstDayOfWeek($firstDay = null)
+ {
+ if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
+ if (!is_null($firstDay) && ($firstDay != CALENDAR_FIRST_DAY_OF_WEEK)) {
+ $msg = 'CALENDAR_FIRST_DAY_OF_WEEK constant already defined.'
+ .' The $firstDay parameter will be ignored.';
+ trigger_error($msg, E_USER_WARNING);
+ }
+ return CALENDAR_FIRST_DAY_OF_WEEK;
+ }
+ if (is_null($firstDay)) {
+ $firstDay = $this->cE->getFirstDayOfWeek(
+ $this->thisYear(),
+ $this->thisMonth(),
+ $this->thisDay()
+ );
+ }
+ define ('CALENDAR_FIRST_DAY_OF_WEEK', $firstDay);
+ return CALENDAR_FIRST_DAY_OF_WEEK;
+ }
+
+ /**
+ * Returns the value for the previous year
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 2002 or timestamp
+ * @access public
+ */
+ function prevYear($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp($this->year-1, 1, 1, 0, 0, 0);
+ return $this->returnValue('Year', $format, $ts, $this->year-1);
+ }
+
+ /**
+ * Returns the value for this year
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 2003 or timestamp
+ * @access public
+ */
+ function thisYear($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp($this->year, 1, 1, 0, 0, 0);
+ return $this->returnValue('Year', $format, $ts, $this->year);
+ }
+
+ /**
+ * Returns the value for next year
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 2004 or timestamp
+ * @access public
+ */
+ function nextYear($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp($this->year+1, 1, 1, 0, 0, 0);
+ return $this->returnValue('Year', $format, $ts, $this->year+1);
+ }
+
+ /**
+ * Returns the value for the previous month
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 4 or Unix timestamp
+ * @access public
+ */
+ function prevMonth($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp($this->year, $this->month-1, 1, 0, 0, 0);
+ return $this->returnValue('Month', $format, $ts, $this->cE->stampToMonth($ts));
+ }
+
+ /**
+ * Returns the value for this month
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 5 or timestamp
+ * @access public
+ */
+ function thisMonth($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp($this->year, $this->month, 1, 0, 0, 0);
+ return $this->returnValue('Month', $format, $ts, $this->month);
+ }
+
+ /**
+ * Returns the value for next month
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 6 or timestamp
+ * @access public
+ */
+ function nextMonth($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp($this->year, $this->month+1, 1, 0, 0, 0);
+ return $this->returnValue('Month', $format, $ts, $this->cE->stampToMonth($ts));
+ }
+
+ /**
+ * Returns the value for the previous day
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 10 or timestamp
+ * @access public
+ */
+ function prevDay($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day-1, 0, 0, 0);
+ return $this->returnValue('Day', $format, $ts, $this->cE->stampToDay($ts));
+ }
+
+ /**
+ * Returns the value for this day
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 11 or timestamp
+ * @access public
+ */
+ function thisDay($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day, 0, 0, 0);
+ return $this->returnValue('Day', $format, $ts, $this->day);
+ }
+
+ /**
+ * Returns the value for the next day
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 12 or timestamp
+ * @access public
+ */
+ function nextDay($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day+1, 0, 0, 0);
+ return $this->returnValue('Day', $format, $ts, $this->cE->stampToDay($ts));
+ }
+
+ /**
+ * Returns the value for the previous hour
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 13 or timestamp
+ * @access public
+ */
+ function prevHour($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day, $this->hour-1, 0, 0);
+ return $this->returnValue('Hour', $format, $ts, $this->cE->stampToHour($ts));
+ }
+
+ /**
+ * Returns the value for this hour
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 14 or timestamp
+ * @access public
+ */
+ function thisHour($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day, $this->hour, 0, 0);
+ return $this->returnValue('Hour', $format, $ts, $this->hour);
+ }
+
+ /**
+ * Returns the value for the next hour
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 14 or timestamp
+ * @access public
+ */
+ function nextHour($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day, $this->hour+1, 0, 0);
+ return $this->returnValue('Hour', $format, $ts, $this->cE->stampToHour($ts));
+ }
+
+ /**
+ * Returns the value for the previous minute
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 23 or timestamp
+ * @access public
+ */
+ function prevMinute($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day,
+ $this->hour, $this->minute-1, 0);
+ return $this->returnValue('Minute', $format, $ts, $this->cE->stampToMinute($ts));
+ }
+
+ /**
+ * Returns the value for this minute
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 24 or timestamp
+ * @access public
+ */
+ function thisMinute($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day,
+ $this->hour, $this->minute, 0);
+ return $this->returnValue('Minute', $format, $ts, $this->minute);
+ }
+
+ /**
+ * Returns the value for the next minute
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 25 or timestamp
+ * @access public
+ */
+ function nextMinute($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day,
+ $this->hour, $this->minute+1, 0);
+ return $this->returnValue('Minute', $format, $ts, $this->cE->stampToMinute($ts));
+ }
+
+ /**
+ * Returns the value for the previous second
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 43 or timestamp
+ * @access public
+ */
+ function prevSecond($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day,
+ $this->hour, $this->minute, $this->second-1);
+ return $this->returnValue('Second', $format, $ts, $this->cE->stampToSecond($ts));
+ }
+
+ /**
+ * Returns the value for this second
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 44 or timestamp
+ * @access public
+ */
+ function thisSecond($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day,
+ $this->hour, $this->minute, $this->second);
+ return $this->returnValue('Second', $format, $ts, $this->second);
+ }
+
+ /**
+ * Returns the value for the next second
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 45 or timestamp
+ * @access public
+ */
+ function nextSecond($format = 'int')
+ {
+ $ts = $this->cE->dateToStamp(
+ $this->year, $this->month, $this->day,
+ $this->hour, $this->minute, $this->second+1);
+ return $this->returnValue('Second', $format, $ts, $this->cE->stampToSecond($ts));
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Second.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Second.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Second.php (revision 20119)
@@ -0,0 +1,98 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: Second.php,v 1.1 2004/05/24 22:25:42 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Second.php,v 1.1 2004/05/24 22:25:42 quipo Exp $
+ */
+
+/**
+ * Allows Calendar include path to be redefined
+ * @ignore
+ */
+if (!defined('CALENDAR_ROOT')) {
+ define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
+}
+
+/**
+ * Load Calendar base class
+ */
+require_once CALENDAR_ROOT.'Calendar.php';
+
+/**
+ * Represents a Second
+ * Note: Seconds do not build other objects
+ * so related methods are overridden to return NULL
+ * @package Calendar
+ */
+class Calendar_Second extends Calendar
+{
+ /**
+ * Constructs Second
+ * @param int year e.g. 2003
+ * @param int month e.g. 5
+ * @param int day e.g. 11
+ * @param int hour e.g. 13
+ * @param int minute e.g. 31
+ * @param int second e.g. 45
+ */
+ function Calendar_Second($y, $m, $d, $h, $i, $s)
+ {
+ Calendar::Calendar($y, $m, $d, $h, $i, $s);
+ }
+
+ /**
+ * Overwrite build
+ * @return NULL
+ */
+ function build()
+ {
+ return null;
+ }
+
+ /**
+ * Overwrite fetch
+ * @return NULL
+ */
+ function fetch()
+ {
+ return null;
+ }
+
+ /**
+ * Overwrite fetchAll
+ * @return NULL
+ */
+ function fetchAll()
+ {
+ return null;
+ }
+
+ /**
+ * Overwrite size
+ * @return NULL
+ */
+ function size()
+ {
+ return null;
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/README
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/README (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/README (revision 20119)
@@ -0,0 +1,7 @@
+These tests require Simple Test: http://www.lastcraft.com/simple_test.php
+
+Ideally they would use PEAR::PHPUnit but the current version has bugs and
+lacks alot of the functionality (e.g. Mock Objects) which Simple Test
+provides.
+
+Modifying the simple_include.php script for your simple test install dir
Index: /closed/version-2_5-dev/data/module/Calendar/tests/table_helper_tests.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/table_helper_tests.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/table_helper_tests.php (revision 20119)
@@ -0,0 +1,19 @@
+GroupTest('Table Helper Tests');
+ $this->addTestFile('helper_test.php');
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TableHelperTests();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/calendar_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/calendar_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/calendar_test.php (revision 20119)
@@ -0,0 +1,115 @@
+UnitTestCase($name);
+ }
+ function setUp() {
+ $this->cal = new Calendar(2003,10,25,13,32,43);
+ }
+ function tearDown() {
+ unset($this->cal);
+ }
+ function testPrevYear () {
+ $this->assertEqual(2002,$this->cal->prevYear());
+ }
+ function testPrevYear_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2002,
+ 'month' => 1,
+ 'day' => 1,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevYear('array'));
+ }
+ function testThisYear () {
+ $this->assertEqual(2003,$this->cal->thisYear());
+ }
+ function testNextYear () {
+ $this->assertEqual(2004,$this->cal->nextYear());
+ }
+ function testPrevMonth () {
+ $this->assertEqual(9,$this->cal->prevMonth());
+ }
+ function testPrevMonth_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 9,
+ 'day' => 1,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevMonth('array'));
+ }
+ function testThisMonth () {
+ $this->assertEqual(10,$this->cal->thisMonth());
+ }
+ function testNextMonth () {
+ $this->assertEqual(11,$this->cal->nextMonth());
+ }
+ function testPrevDay () {
+ $this->assertEqual(24,$this->cal->prevDay());
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 10,
+ 'day' => 24,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testThisDay () {
+ $this->assertEqual(25,$this->cal->thisDay());
+ }
+ function testNextDay () {
+ $this->assertEqual(26,$this->cal->nextDay());
+ }
+ function testPrevHour () {
+ $this->assertEqual(12,$this->cal->prevHour());
+ }
+ function testThisHour () {
+ $this->assertEqual(13,$this->cal->thisHour());
+ }
+ function testNextHour () {
+ $this->assertEqual(14,$this->cal->nextHour());
+ }
+ function testPrevMinute () {
+ $this->assertEqual(31,$this->cal->prevMinute());
+ }
+ function testThisMinute () {
+ $this->assertEqual(32,$this->cal->thisMinute());
+ }
+ function testNextMinute () {
+ $this->assertEqual(33,$this->cal->nextMinute());
+ }
+ function testPrevSecond () {
+ $this->assertEqual(42,$this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(43,$this->cal->thisSecond());
+ }
+ function testNextSecond () {
+ $this->assertEqual(44,$this->cal->nextSecond());
+ }
+ function testSetTimeStamp() {
+ $stamp = mktime(13,32,43,10,25,2003);
+ $this->cal->setTimeStamp($stamp);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(13,32,43,10,25,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/second_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/second_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/second_test.php (revision 20119)
@@ -0,0 +1,34 @@
+UnitTestCase('Test of Second');
+ }
+ function setUp() {
+ $this->cal = new Calendar_Second(2003,10,25,13,32,43);
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 10,
+ 'day' => 24,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfSecond();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/week_firstday_0_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/week_firstday_0_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/week_firstday_0_test.php (revision 20119)
@@ -0,0 +1,241 @@
+UnitTestCase('Test of Week - Week Starting on Sunday');
+ }
+ function setUp() {
+ $this->cal = Calendar_Factory::create('Week', 2003, 10, 9);
+ //print_r($this->cal);
+ }
+ function testPrevDay () {
+ $this->assertEqual(8, $this->cal->prevDay());
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 10,
+ 'day' => 8,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testThisDay () {
+ $this->assertEqual(9, $this->cal->thisDay());
+ }
+ function testNextDay () {
+ $this->assertEqual(10, $this->cal->nextDay());
+ }
+ function testPrevHour () {
+ $this->assertEqual(23, $this->cal->prevHour());
+ }
+ function testThisHour () {
+ $this->assertEqual(0, $this->cal->thisHour());
+ }
+ function testNextHour () {
+ $this->assertEqual(1, $this->cal->nextHour());
+ }
+ function testPrevMinute () {
+ $this->assertEqual(59, $this->cal->prevMinute());
+ }
+ function testThisMinute () {
+ $this->assertEqual(0, $this->cal->thisMinute());
+ }
+ function testNextMinute () {
+ $this->assertEqual(1, $this->cal->nextMinute());
+ }
+ function testPrevSecond () {
+ $this->assertEqual(59, $this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(0, $this->cal->thisSecond());
+ }
+ function testNextSecond () {
+ $this->assertEqual(1, $this->cal->nextSecond());
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(0,0,0,10,9,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+ function testNewTimeStamp() {
+ $stamp = mktime(0,0,0,7,28,2004);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual('29 2004', date('W Y', $this->cal->prevWeek(true)));
+ $this->assertEqual('30 2004', date('W Y', $this->cal->thisWeek(true)));
+ $this->assertEqual('31 2004', date('W Y', $this->cal->nextWeek(true)));
+ }
+ function testPrevWeekInMonth() {
+ $this->assertEqual(1, $this->cal->prevWeek());
+ $stamp = mktime(0,0,0,2,3,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(0, $this->cal->prevWeek());
+ }
+ function testThisWeekInMonth() {
+ $this->assertEqual(2, $this->cal->thisWeek());
+ $stamp = mktime(0,0,0,2,3,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(1, $this->cal->thisWeek());
+ $stamp = mktime(0,0,0,1,1,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(1, $this->cal->thisWeek());
+ $stamp = mktime(0,0,0,1,3,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(2, $this->cal->thisWeek());
+ }
+ function testNextWeekInMonth() {
+ $this->assertEqual(3, $this->cal->nextWeek());
+ $stamp = mktime(0,0,0,2,3,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(2, $this->cal->nextWeek());
+ }
+ function testPrevWeekInYear() {
+ $this->assertEqual(date('W', $this->cal->prevWeek('timestamp')), $this->cal->prevWeek('n_in_year'));
+ $stamp = mktime(0,0,0,1,1,2004);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(date('W', $this->cal->nextWeek('timestamp')), $this->cal->nextWeek('n_in_year'));
+ }
+ function testThisWeekInYear() {
+ $this->assertEqual(date('W', $this->cal->thisWeek('timestamp')), $this->cal->thisWeek('n_in_year'));
+ $stamp = mktime(0,0,0,1,1,2004);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(date('W', $this->cal->thisWeek('timestamp')), $this->cal->thisWeek('n_in_year'));
+ }
+ function testFirstWeekInYear() {
+ $stamp = mktime(0,0,0,1,4,2004);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(1, $this->cal->thisWeek('n_in_year'));
+ }
+ function testNextWeekInYear() {
+ $this->assertEqual(date('W', $this->cal->nextWeek('timestamp')), $this->cal->nextWeek('n_in_year'));
+ }
+ function testPrevWeekArray() {
+ $testArray = array(
+ 'year'=>2003,
+ 'month'=>9,
+ 'day'=>28,
+ 'hour'=>0,
+ 'minute'=>0,
+ 'second'=>0
+ );
+ $this->assertEqual($testArray, $this->cal->prevWeek('array'));
+ }
+ function testThisWeekArray() {
+ $testArray = array(
+ 'year'=>2003,
+ 'month'=>10,
+ 'day'=>5,
+ 'hour'=>0,
+ 'minute'=>0,
+ 'second'=>0
+ );
+ $this->assertEqual($testArray, $this->cal->thisWeek('array'));
+ }
+ function testNextWeekArray() {
+ $testArray = array(
+ 'year'=>2003,
+ 'month'=>10,
+ 'day'=>12,
+ 'hour'=>0,
+ 'minute'=>0,
+ 'second'=>0
+ );
+ $this->assertEqual($testArray, $this->cal->nextWeek('array'));
+ }
+ function testPrevWeekObject() {
+ $testWeek = Calendar_Factory::create('Week', 2003,9,28);
+ $Week = $this->cal->prevWeek('object');
+ $this->assertEqual($testWeek->getTimeStamp(),$Week->getTimeStamp());
+ }
+ function testThisWeekObject() {
+ $testWeek = Calendar_Factory::create('Week', 2003,10,5);
+ $Week = $this->cal->thisWeek('object');
+ $this->assertEqual($testWeek->getTimeStamp(),$Week->getTimeStamp());
+ }
+ function testNextWeekObject() {
+ $testWeek = Calendar_Factory::create('Week', 2003,10,12);
+ $Week = $this->cal->nextWeek('object');
+ $this->assertEqual($testWeek->getTimeStamp(),$Week->getTimeStamp());
+ }
+}
+
+class TestOfWeek_firstday_0_Build extends TestOfWeek_firstday_0 {
+ function TestOfWeek_firstday_0_Build() {
+ $this->UnitTestCase('Test of Week::build() - FirstDay = Sunday');
+ }
+ function testSize() {
+ $this->cal->build();
+ $this->assertEqual(7, $this->cal->size());
+ }
+
+ function testFetch() {
+ $this->cal->build();
+ $i=0;
+ while ($Child = $this->cal->fetch()) {
+ $i++;
+ }
+ $this->assertEqual(7, $i);
+ }
+ function testFetchAll() {
+ $this->cal->build();
+ $children = array();
+ $i = 1;
+ while ( $Child = $this->cal->fetch() ) {
+ $children[$i]=$Child;
+ $i++;
+ }
+ $this->assertEqual($children,$this->cal->fetchAll());
+ }
+
+ function testSelection() {
+ require_once(CALENDAR_ROOT . 'Day.php');
+ $selection = array(Calendar_Factory::create('Day', 2003, 10, 6));
+ $this->cal->build($selection);
+ $i = 1;
+ while ($Child = $this->cal->fetch()) {
+ if ($i == 2) {
+ break; //06-10-2003 is the 2nd day of the week
+ }
+ $i++;
+ }
+ $this->assertTrue($Child->isSelected());
+ }
+ function testSelectionCornerCase() {
+ require_once(CALENDAR_ROOT . 'Day.php');
+ $selectedDays = array(
+ Calendar_Factory::create('Day', 2003, 12, 28),
+ Calendar_Factory::create('Day', 2003, 12, 29),
+ Calendar_Factory::create('Day', 2003, 12, 30),
+ Calendar_Factory::create('Day', 2003, 12, 31),
+ Calendar_Factory::create('Day', 2004, 01, 01),
+ Calendar_Factory::create('Day', 2004, 01, 02),
+ Calendar_Factory::create('Day', 2004, 01, 03)
+ );
+ $this->cal = Calendar_Factory::create('Week', 2003, 12, 31, 0);
+ $this->cal->build($selectedDays);
+ while ($Day = $this->cal->fetch()) {
+ $this->assertTrue($Day->isSelected());
+ }
+ $this->cal = Calendar_Factory::create('Week', 2004, 1, 1, 0);
+ $this->cal->build($selectedDays);
+ while ($Day = $this->cal->fetch()) {
+ $this->assertTrue($Day->isSelected());
+ }
+ }
+}
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfWeek_firstday_0();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfWeek_firstday_0_Build();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/util_textual_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/util_textual_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/util_textual_test.php (revision 20119)
@@ -0,0 +1,191 @@
+UnitTestCase('Test of Calendar_Util_Textual');
+ }
+ function setUp() {
+ $this->mockengine = new Mock_Calendar_Engine($this);
+ $this->mockcal = new Mock_Calendar_Second($this);
+ $this->mockcal->setReturnValue('prevYear',2002);
+ $this->mockcal->setReturnValue('thisYear',2003);
+ $this->mockcal->setReturnValue('nextYear',2004);
+ $this->mockcal->setReturnValue('prevMonth',9);
+ $this->mockcal->setReturnValue('thisMonth',10);
+ $this->mockcal->setReturnValue('nextMonth',11);
+ $this->mockcal->setReturnValue('prevDay',14);
+ $this->mockcal->setReturnValue('thisDay',15);
+ $this->mockcal->setReturnValue('nextDay',16);
+ $this->mockcal->setReturnValue('prevHour',12);
+ $this->mockcal->setReturnValue('thisHour',13);
+ $this->mockcal->setReturnValue('nextHour',14);
+ $this->mockcal->setReturnValue('prevMinute',29);
+ $this->mockcal->setReturnValue('thisMinute',30);
+ $this->mockcal->setReturnValue('nextMinute',31);
+ $this->mockcal->setReturnValue('prevSecond',44);
+ $this->mockcal->setReturnValue('thisSecond',45);
+ $this->mockcal->setReturnValue('nextSecond',46);
+ $this->mockcal->setReturnValue('getEngine',$this->mockengine);
+ $this->mockcal->setReturnValue('getTimestamp',12345);
+ }
+ function tearDown() {
+ unset ( $this->engine );
+ unset ( $this->mockcal );
+ }
+ function testMonthNamesLong() {
+ $monthNames = array(
+ 1=>'January',
+ 2=>'February',
+ 3=>'March',
+ 4=>'April',
+ 5=>'May',
+ 6=>'June',
+ 7=>'July',
+ 8=>'August',
+ 9=>'September',
+ 10=>'October',
+ 11=>'November',
+ 12=>'December',
+ );
+ $this->assertEqual($monthNames,Calendar_Util_Textual::monthNames());
+ }
+ function testMonthNamesShort() {
+ $monthNames = array(
+ 1=>'Jan',
+ 2=>'Feb',
+ 3=>'Mar',
+ 4=>'Apr',
+ 5=>'May',
+ 6=>'Jun',
+ 7=>'Jul',
+ 8=>'Aug',
+ 9=>'Sep',
+ 10=>'Oct',
+ 11=>'Nov',
+ 12=>'Dec',
+ );
+ $this->assertEqual($monthNames,Calendar_Util_Textual::monthNames('short'));
+ }
+ function testMonthNamesTwo() {
+ $monthNames = array(
+ 1=>'Ja',
+ 2=>'Fe',
+ 3=>'Ma',
+ 4=>'Ap',
+ 5=>'Ma',
+ 6=>'Ju',
+ 7=>'Ju',
+ 8=>'Au',
+ 9=>'Se',
+ 10=>'Oc',
+ 11=>'No',
+ 12=>'De',
+ );
+ $this->assertEqual($monthNames,Calendar_Util_Textual::monthNames('two'));
+ }
+ function testMonthNamesOne() {
+ $monthNames = array(
+ 1=>'J',
+ 2=>'F',
+ 3=>'M',
+ 4=>'A',
+ 5=>'M',
+ 6=>'J',
+ 7=>'J',
+ 8=>'A',
+ 9=>'S',
+ 10=>'O',
+ 11=>'N',
+ 12=>'D',
+ );
+ $this->assertEqual($monthNames,Calendar_Util_Textual::monthNames('one'));
+ }
+ function testWeekdayNamesLong() {
+ $weekdayNames = array(
+ 0=>'Sunday',
+ 1=>'Monday',
+ 2=>'Tuesday',
+ 3=>'Wednesday',
+ 4=>'Thursday',
+ 5=>'Friday',
+ 6=>'Saturday',
+ );
+ $this->assertEqual($weekdayNames,Calendar_Util_Textual::weekdayNames());
+ }
+ function testWeekdayNamesShort() {
+ $weekdayNames = array(
+ 0=>'Sun',
+ 1=>'Mon',
+ 2=>'Tue',
+ 3=>'Wed',
+ 4=>'Thu',
+ 5=>'Fri',
+ 6=>'Sat',
+ );
+ $this->assertEqual($weekdayNames,Calendar_Util_Textual::weekdayNames('short'));
+ }
+ function testWeekdayNamesTwo() {
+ $weekdayNames = array(
+ 0=>'Su',
+ 1=>'Mo',
+ 2=>'Tu',
+ 3=>'We',
+ 4=>'Th',
+ 5=>'Fr',
+ 6=>'Sa',
+ );
+ $this->assertEqual($weekdayNames,Calendar_Util_Textual::weekdayNames('two'));
+ }
+ function testWeekdayNamesOne() {
+ $weekdayNames = array(
+ 0=>'S',
+ 1=>'M',
+ 2=>'T',
+ 3=>'W',
+ 4=>'T',
+ 5=>'F',
+ 6=>'S',
+ );
+ $this->assertEqual($weekdayNames,Calendar_Util_Textual::weekdayNames('one'));
+ }
+ function testPrevMonthNameShort() {
+ $this->assertEqual('Sep',Calendar_Util_Textual::prevMonthName($this->mockcal,'short'));
+ }
+ function testThisMonthNameShort() {
+ $this->assertEqual('Oct',Calendar_Util_Textual::thisMonthName($this->mockcal,'short'));
+ }
+ function testNextMonthNameShort() {
+ $this->assertEqual('Nov',Calendar_Util_Textual::nextMonthName($this->mockcal,'short'));
+ }
+ function testThisDayNameShort() {
+ $this->assertEqual('Wed',Calendar_Util_Textual::thisDayName($this->mockcal,'short'));
+ }
+ function testOrderedWeekdaysShort() {
+ $weekdayNames = array(
+ 0=>'Sun',
+ 1=>'Mon',
+ 2=>'Tue',
+ 3=>'Wed',
+ 4=>'Thu',
+ 5=>'Fri',
+ 6=>'Sat',
+ );
+ $this->assertEqual($weekdayNames,Calendar_Util_Textual::orderedWeekdays($this->mockcal,'short'));
+ }
+
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfUtilTextual();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/validator_unit_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/validator_unit_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/validator_unit_test.php (revision 20119)
@@ -0,0 +1,210 @@
+UnitTestCase('Test of Validator');
+ }
+ function setUp() {
+ $this->mockengine = new Mock_Calendar_Engine($this);
+ $this->mockengine->setReturnValue('getMinYears',1970);
+ $this->mockengine->setReturnValue('getMaxYears',2037);
+ $this->mockengine->setReturnValue('getMonthsInYear',12);
+ $this->mockengine->setReturnValue('getDaysInMonth',30);
+ $this->mockengine->setReturnValue('getHoursInDay',24);
+ $this->mockengine->setReturnValue('getMinutesInHour',60);
+ $this->mockengine->setReturnValue('getSecondsInMinute',60);
+ $this->mockcal = new Mock_Calendar_Second($this);
+ $this->mockcal->setReturnValue('getEngine',$this->mockengine);
+ }
+ function tearDown() {
+ unset ($this->mockengine);
+ unset ($this->mocksecond);
+ }
+ function testIsValidYear() {
+ $this->mockcal->setReturnValue('thisYear',2000);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertTrue($Validator->isValidYear());
+ }
+ function testIsValidYearTooSmall() {
+ $this->mockcal->setReturnValue('thisYear',1969);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidYear());
+ }
+ function testIsValidYearTooLarge() {
+ $this->mockcal->setReturnValue('thisYear',2038);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidYear());
+ }
+ function testIsValidMonth() {
+ $this->mockcal->setReturnValue('thisMonth',10);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertTrue($Validator->isValidMonth());
+ }
+ function testIsValidMonthTooSmall() {
+ $this->mockcal->setReturnValue('thisMonth',0);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidMonth());
+ }
+ function testIsValidMonthTooLarge() {
+ $this->mockcal->setReturnValue('thisMonth',13);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidMonth());
+ }
+ function testIsValidDay() {
+ $this->mockcal->setReturnValue('thisDay',10);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertTrue($Validator->isValidDay());
+ }
+ function testIsValidDayTooSmall() {
+ $this->mockcal->setReturnValue('thisDay',0);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidDay());
+ }
+ function testIsValidDayTooLarge() {
+ $this->mockcal->setReturnValue('thisDay',31);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidDay());
+ }
+ function testIsValidHour() {
+ $this->mockcal->setReturnValue('thisHour',10);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertTrue($Validator->isValidHour());
+ }
+ function testIsValidHourTooSmall() {
+ $this->mockcal->setReturnValue('thisHour',-1);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidHour());
+ }
+ function testIsValidHourTooLarge() {
+ $this->mockcal->setReturnValue('thisHour',24);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidHour());
+ }
+ function testIsValidMinute() {
+ $this->mockcal->setReturnValue('thisMinute',30);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertTrue($Validator->isValidMinute());
+ }
+ function testIsValidMinuteTooSmall() {
+ $this->mockcal->setReturnValue('thisMinute',-1);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidMinute());
+ }
+ function testIsValidMinuteTooLarge() {
+ $this->mockcal->setReturnValue('thisMinute',60);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidMinute());
+ }
+ function testIsValidSecond() {
+ $this->mockcal->setReturnValue('thisSecond',30);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertTrue($Validator->isValidSecond());
+ }
+ function testIsValidSecondTooSmall() {
+ $this->mockcal->setReturnValue('thisSecond',-1);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidSecond());
+ }
+ function testIsValidSecondTooLarge() {
+ $this->mockcal->setReturnValue('thisSecond',60);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValidSecond());
+ }
+ function testIsValid() {
+ $this->mockcal->setReturnValue('thisYear',2000);
+ $this->mockcal->setReturnValue('thisMonth',5);
+ $this->mockcal->setReturnValue('thisDay',15);
+ $this->mockcal->setReturnValue('thisHour',13);
+ $this->mockcal->setReturnValue('thisMinute',30);
+ $this->mockcal->setReturnValue('thisSecond',40);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertTrue($Validator->isValid());
+ }
+ function testIsValidAllWrong() {
+ $this->mockcal->setReturnValue('thisYear',2038);
+ $this->mockcal->setReturnValue('thisMonth',13);
+ $this->mockcal->setReturnValue('thisDay',31);
+ $this->mockcal->day = 31;
+ $this->mockcal->setReturnValue('thisHour',24);
+ $this->mockcal->setReturnValue('thisMinute',60);
+ $this->mockcal->setReturnValue('thisSecond',60);
+ $Validator = & new Calendar_Validator($this->mockcal);
+ $this->assertFalse($Validator->isValid());
+ $i = 0;
+ while ( $Validator->fetch() ) {
+ $i++;
+ }
+ $this->assertEqual($i,6);
+ }
+}
+
+class TestOfValidatorLive extends UnitTestCase {
+ function TestOfValidatorLive() {
+ $this->UnitTestCase('Test of Validator Live');
+ }
+ function testYear() {
+ $Unit = new Calendar_Year(2038);
+ $Validator = & $Unit->getValidator();
+ $this->assertFalse($Validator->isValidYear());
+ }
+ function testMonth() {
+ $Unit = new Calendar_Month(2000,13);
+ $Validator = & $Unit->getValidator();
+ $this->assertFalse($Validator->isValidMonth());
+ }
+/*
+ function testWeek() {
+ $Unit = new Calendar_Week(2000,12,7);
+ $Validator = & $Unit->getValidator();
+ $this->assertFalse($Validator->isValidWeek());
+ }
+*/
+ function testDay() {
+ $Unit = new Calendar_Day(2000,12,32);
+ $Validator = & $Unit->getValidator();
+ $this->assertFalse($Validator->isValidDay());
+ }
+ function testHour() {
+ $Unit = new Calendar_Hour(2000,12,20,24);
+ $Validator = & $Unit->getValidator();
+ $this->assertFalse($Validator->isValidHour());
+ }
+ function testMinute() {
+ $Unit = new Calendar_Minute(2000,12,20,23,60);
+ $Validator = & $Unit->getValidator();
+ $this->assertFalse($Validator->isValidMinute());
+ }
+ function testSecond() {
+ $Unit = new Calendar_Second(2000,12,20,23,59,60);
+ $Validator = & $Unit->getValidator();
+ $this->assertFalse($Validator->isValidSecond());
+ }
+ function testAllBad() {
+ $Unit = new Calendar_Second(2000,13,32,24,60,60);
+ $this->assertFalse($Unit->isValid());
+ $Validator = & $Unit->getValidator();
+ $i = 0;
+ while ( $Validator->fetch() ) {
+ $i++;
+ }
+ $this->assertEqual($i,5);
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfValidator();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfValidatorLive();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/month_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/month_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/month_test.php (revision 20119)
@@ -0,0 +1,119 @@
+UnitTestCase('Test of Month');
+ }
+ function setUp() {
+ $this->cal = new Calendar_Month(2003,10);
+ }
+ function testPrevMonth_Object() {
+ $this->assertEqual(new Calendar_Month(2003, 9), $this->cal->prevMonth('object'));
+ }
+ function testPrevDay () {
+ $this->assertEqual(30,$this->cal->prevDay());
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 9,
+ 'day' => 30,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testThisDay () {
+ $this->assertEqual(1,$this->cal->thisDay());
+ }
+ function testNextDay () {
+ $this->assertEqual(2,$this->cal->nextDay());
+ }
+ function testPrevHour () {
+ $this->assertEqual(23,$this->cal->prevHour());
+ }
+ function testThisHour () {
+ $this->assertEqual(0,$this->cal->thisHour());
+ }
+ function testNextHour () {
+ $this->assertEqual(1,$this->cal->nextHour());
+ }
+ function testPrevMinute () {
+ $this->assertEqual(59,$this->cal->prevMinute());
+ }
+ function testThisMinute () {
+ $this->assertEqual(0,$this->cal->thisMinute());
+ }
+ function testNextMinute () {
+ $this->assertEqual(1,$this->cal->nextMinute());
+ }
+ function testPrevSecond () {
+ $this->assertEqual(59,$this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(0,$this->cal->thisSecond());
+ }
+ function testNextSecond () {
+ $this->assertEqual(1,$this->cal->nextSecond());
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(0,0,0,10,1,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+}
+
+class TestOfMonthBuild extends TestOfMonth {
+ function TestOfMonthBuild() {
+ $this->UnitTestCase('Test of Month::build()');
+ }
+ function testSize() {
+ $this->cal->build();
+ $this->assertEqual(31,$this->cal->size());
+ }
+ function testFetch() {
+ $this->cal->build();
+ $i=0;
+ while ( $Child = $this->cal->fetch() ) {
+ $i++;
+ }
+ $this->assertEqual(31,$i);
+ }
+ function testFetchAll() {
+ $this->cal->build();
+ $children = array();
+ $i = 1;
+ while ( $Child = $this->cal->fetch() ) {
+ $children[$i]=$Child;
+ $i++;
+ }
+ $this->assertEqual($children,$this->cal->fetchAll());
+ }
+ function testSelection() {
+ require_once(CALENDAR_ROOT . 'Day.php');
+ $selection = array(new Calendar_Day(2003,10,25));
+ $this->cal->build($selection);
+ $i = 1;
+ while ( $Child = $this->cal->fetch() ) {
+ if ( $i == 25 )
+ break;
+ $i++;
+ }
+ $this->assertTrue($Child->isSelected());
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfMonth();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfMonthBuild();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/all_tests.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/all_tests.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/all_tests.php (revision 20119)
@@ -0,0 +1,34 @@
+GroupTest('All PEAR::Calendar Tests');
+ $this->AddTestCase(new CalendarTests());
+ $this->AddTestCase(new CalendarTabularTests());
+ $this->AddTestCase(new ValidatorTests());
+ $this->AddTestCase(new CalendarEngineTests());
+ $this->AddTestCase(new TableHelperTests());
+ $this->AddTestCase(new DecoratorTests());
+ $this->AddTestCase(new UtilTests());
+ }
+}
+
+$test = &new AllTests();
+$test->run(new HtmlReporter());
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/calendar_tests.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/calendar_tests.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/calendar_tests.php (revision 20119)
@@ -0,0 +1,25 @@
+GroupTest('Calendar Tests');
+ $this->addTestFile('calendar_test.php');
+ $this->addTestFile('year_test.php');
+ $this->addTestFile('month_test.php');
+ $this->addTestFile('day_test.php');
+ $this->addTestFile('hour_test.php');
+ $this->addTestFile('minute_test.php');
+ $this->addTestFile('second_test.php');
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new CalendarTests();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/year_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/year_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/year_test.php (revision 20119)
@@ -0,0 +1,142 @@
+UnitTestCase('Test of Year');
+ }
+ function setUp() {
+ $this->cal = new Calendar_Year(2003);
+ }
+ function testPrevYear_Object() {
+ $this->assertEqual(new Calendar_Year(2002), $this->cal->prevYear('object'));
+ }
+ function testThisYear_Object() {
+ $this->assertEqual(new Calendar_Year(2003), $this->cal->thisYear('object'));
+ }
+ function testPrevMonth () {
+ $this->assertEqual(12,$this->cal->prevMonth());
+ }
+ function testPrevMonth_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2002,
+ 'month' => 12,
+ 'day' => 1,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevMonth('array'));
+ }
+ function testThisMonth () {
+ $this->assertEqual(1,$this->cal->thisMonth());
+ }
+ function testNextMonth () {
+ $this->assertEqual(2,$this->cal->nextMonth());
+ }
+ function testPrevDay () {
+ $this->assertEqual(31,$this->cal->prevDay());
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2002,
+ 'month' => 12,
+ 'day' => 31,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testThisDay () {
+ $this->assertEqual(1,$this->cal->thisDay());
+ }
+ function testNextDay () {
+ $this->assertEqual(2,$this->cal->nextDay());
+ }
+ function testPrevHour () {
+ $this->assertEqual(23,$this->cal->prevHour());
+ }
+ function testThisHour () {
+ $this->assertEqual(0,$this->cal->thisHour());
+ }
+ function testNextHour () {
+ $this->assertEqual(1,$this->cal->nextHour());
+ }
+ function testPrevMinute () {
+ $this->assertEqual(59,$this->cal->prevMinute());
+ }
+ function testThisMinute () {
+ $this->assertEqual(0,$this->cal->thisMinute());
+ }
+ function testNextMinute () {
+ $this->assertEqual(1,$this->cal->nextMinute());
+ }
+ function testPrevSecond () {
+ $this->assertEqual(59,$this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(0,$this->cal->thisSecond());
+ }
+ function testNextSecond () {
+ $this->assertEqual(1,$this->cal->nextSecond());
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(0,0,0,1,1,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+}
+
+class TestOfYearBuild extends TestOfYear {
+ function TestOfYearBuild() {
+ $this->UnitTestCase('Test of Year::build()');
+ }
+ function testSize() {
+ $this->cal->build();
+ $this->assertEqual(12,$this->cal->size());
+ }
+ function testFetch() {
+ $this->cal->build();
+ $i=0;
+ while ( $Child = $this->cal->fetch() ) {
+ $i++;
+ }
+ $this->assertEqual(12,$i);
+ }
+ function testFetchAll() {
+ $this->cal->build();
+ $children = array();
+ $i = 1;
+ while ( $Child = $this->cal->fetch() ) {
+ $children[$i]=$Child;
+ $i++;
+ }
+ $this->assertEqual($children,$this->cal->fetchAll());
+ }
+ function testSelection() {
+ require_once(CALENDAR_ROOT . 'Month.php');
+ $selection = array(new Calendar_Month(2003,10));
+ $this->cal->build($selection);
+ $i = 1;
+ while ( $Child = $this->cal->fetch() ) {
+ if ( $i == 10 )
+ break;
+ $i++;
+ }
+ $this->assertTrue($Child->isSelected());
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfYear();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfYearBuild();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/util_tests.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/util_tests.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/util_tests.php (revision 20119)
@@ -0,0 +1,20 @@
+GroupTest('Util Tests');
+ $this->addTestFile('util_uri_test.php');
+ $this->addTestFile('util_textual_test.php');
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new UtilTests();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/decorator_uri_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/decorator_uri_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/decorator_uri_test.php (revision 20119)
@@ -0,0 +1,37 @@
+UnitTestCase('Test of Calendar_Decorator_Uri');
+ }
+ function testFragments() {
+ $Uri = new Calendar_Decorator_Uri($this->mockcal);
+ $Uri->setFragments('year','month','day','hour','minute','second');
+ $this->assertEqual('year=&month=&day=&hour=&minute=&second=',$Uri->this('second'));
+ }
+ function testScalarFragments() {
+ $Uri = new Calendar_Decorator_Uri($this->mockcal);
+ $Uri->setFragments('year','month','day','hour','minute','second');
+ $Uri->setScalar();
+ $this->assertEqual('&&&&&',$Uri->this('second'));
+ }
+ function testSetSeperator() {
+ $Uri = new Calendar_Decorator_Uri($this->mockcal);
+ $Uri->setFragments('year','month','day','hour','minute','second');
+ $Uri->setSeparator('/');
+ $this->assertEqual('year=/month=/day=/hour=/minute=/second=',$Uri->this('second'));
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfDecoratorUri();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/decorator_tests.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/decorator_tests.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/decorator_tests.php (revision 20119)
@@ -0,0 +1,21 @@
+GroupTest('Decorator Tests');
+ $this->addTestFile('decorator_test.php');
+ $this->addTestFile('decorator_textual_test.php');
+ $this->addTestFile('decorator_uri_test.php');
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new DecoratorTests();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/calendar_tabular_tests.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/calendar_tabular_tests.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/calendar_tabular_tests.php (revision 20119)
@@ -0,0 +1,22 @@
+GroupTest('Calendar Tabular Tests');
+ $this->addTestFile('month_weekdays_test.php');
+ $this->addTestFile('month_weeks_test.php');
+ $this->addTestFile('week_test.php');
+ //$this->addTestFile('week_firstday_0_test.php'); //switch with the above
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new CalendarTabularTests();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/validator_tests.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/validator_tests.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/validator_tests.php (revision 20119)
@@ -0,0 +1,20 @@
+GroupTest('Validator Tests');
+ $this->addTestFile('validator_unit_test.php');
+ $this->addTestFile('validator_error_test.php');
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new ValidatorTests();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/peardate_engine_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/peardate_engine_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/peardate_engine_test.php (revision 20119)
@@ -0,0 +1,124 @@
+UnitTestCase('Test of Calendar_Engine_PearDate');
+ }
+ function setUp() {
+ $this->engine = new Calendar_Engine_PearDate();
+ }
+ function testGetSecondsInMinute() {
+ $this->assertEqual($this->engine->getSecondsInMinute(),60);
+ }
+ function testGetMinutesInHour() {
+ $this->assertEqual($this->engine->getMinutesInHour(),60);
+ }
+ function testGetHoursInDay() {
+ $this->assertEqual($this->engine->getHoursInDay(),24);
+ }
+ function testGetFirstDayOfWeek() {
+ $this->assertEqual($this->engine->getFirstDayOfWeek(),1);
+ }
+ function testGetWeekDays() {
+ $this->assertEqual($this->engine->getWeekDays(),array(0,1,2,3,4,5,6));
+ }
+ function testGetDaysInWeek() {
+ $this->assertEqual($this->engine->getDaysInWeek(),7);
+ }
+ function testGetWeekNInYear() {
+ $this->assertEqual($this->engine->getWeekNInYear(2003, 11, 3), 45);
+ }
+ function testGetWeekNInMonth() {
+ $this->assertEqual($this->engine->getWeekNInMonth(2003, 11, 3), 2);
+ }
+ function testGetWeeksInMonth0() {
+ $this->assertEqual($this->engine->getWeeksInMonth(2003, 11, 0), 6); //week starts on sunday
+ }
+ function testGetWeeksInMonth1() {
+ $this->assertEqual($this->engine->getWeeksInMonth(2003, 11, 1), 5); //week starts on monday
+ }
+ function testGetWeeksInMonth2() {
+ $this->assertEqual($this->engine->getWeeksInMonth(2003, 2, 6), 4); //week starts on saturday
+ }
+ function testGetWeeksInMonth3() {
+ // Unusual cases that can cause fails (shows up with example 21.php)
+ $this->assertEqual($this->engine->getWeeksInMonth(2004,2,1),5);
+ $this->assertEqual($this->engine->getWeeksInMonth(2004,8,1),6);
+ }
+ function testGetDayOfWeek() {
+ $this->assertEqual($this->engine->getDayOfWeek(2003, 11, 18), 2);
+ }
+ function testGetFirstDayInMonth() {
+ $this->assertEqual($this->engine->getFirstDayInMonth(2003,10),3);
+ }
+ function testGetDaysInMonth() {
+ $this->assertEqual($this->engine->getDaysInMonth(2003,10),31);
+ }
+ function testGetMinYears() {
+ $this->assertEqual($this->engine->getMinYears(),0);
+ }
+ function testGetMaxYears() {
+ $this->assertEqual($this->engine->getMaxYears(),9999);
+ }
+ function testDateToStamp() {
+ $stamp = '2003-10-15 13:30:45';
+ $this->assertEqual($this->engine->dateToStamp(2003,10,15,13,30,45),$stamp);
+ }
+ function testStampToSecond() {
+ $stamp = '2003-10-15 13:30:45';
+ $this->assertEqual($this->engine->stampToSecond($stamp),45);
+ }
+ function testStampToMinute() {
+ $stamp = '2003-10-15 13:30:45';
+ $this->assertEqual($this->engine->stampToMinute($stamp),30);
+ }
+ function testStampToHour() {
+ $stamp = '2003-10-15 13:30:45';
+ $this->assertEqual($this->engine->stampToHour($stamp),13);
+ }
+ function testStampToDay() {
+ $stamp = '2003-10-15 13:30:45';
+ $this->assertEqual($this->engine->stampToDay($stamp),15);
+ }
+ function testStampToMonth() {
+ $stamp = '2003-10-15 13:30:45';
+ $this->assertEqual($this->engine->stampToMonth($stamp),10);
+ }
+ function testStampToYear() {
+ $stamp = '2003-10-15 13:30:45';
+ $this->assertEqual($this->engine->stampToYear($stamp),2003);
+ }
+ function testAdjustDate() {
+ $stamp = '2004-01-01 13:30:45';
+ $y = $this->engine->stampToYear($stamp);
+ $m = $this->engine->stampToMonth($stamp);
+ $d = $this->engine->stampToDay($stamp);
+
+ //the first day of the month should be thursday
+ $this->assertEqual($this->engine->getDayOfWeek($y, $m, $d), 4);
+
+ $m--; // 2004-00-01 => 2003-12-01
+ $this->engine->adjustDate($y, $m, $d, $dummy, $dummy, $dummy);
+
+ $this->assertEqual($y, 2003);
+ $this->assertEqual($m, 12);
+ $this->assertEqual($d, 1);
+
+ // get last day and check if it's wednesday
+ $d = $this->engine->getDaysInMonth($y, $m);
+
+ $this->assertEqual($this->engine->getDayOfWeek($y, $m, $d), 3);
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfPearDateEngine();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/day_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/day_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/day_test.php (revision 20119)
@@ -0,0 +1,107 @@
+UnitTestCase('Test of Day');
+ }
+ function setUp() {
+ $this->cal = new Calendar_Day(2003,10,25);
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 10,
+ 'day' => 24,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testPrevHour () {
+ $this->assertEqual(23,$this->cal->prevHour());
+ }
+ function testThisHour () {
+ $this->assertEqual(0,$this->cal->thisHour());
+ }
+ function testNextHour () {
+ $this->assertEqual(1,$this->cal->nextHour());
+ }
+ function testPrevMinute () {
+ $this->assertEqual(59,$this->cal->prevMinute());
+ }
+ function testThisMinute () {
+ $this->assertEqual(0,$this->cal->thisMinute());
+ }
+ function testNextMinute () {
+ $this->assertEqual(1,$this->cal->nextMinute());
+ }
+ function testPrevSecond () {
+ $this->assertEqual(59,$this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(0,$this->cal->thisSecond());
+ }
+ function testNextSecond () {
+ $this->assertEqual(1,$this->cal->nextSecond());
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(0,0,0,10,25,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+}
+
+class TestOfDayBuild extends TestOfDay {
+ function TestOfDayBuild() {
+ $this->UnitTestCase('Test of Day::build()');
+ }
+ function testSize() {
+ $this->cal->build();
+ $this->assertEqual(24,$this->cal->size());
+ }
+ function testFetch() {
+ $this->cal->build();
+ $i=0;
+ while ( $Child = $this->cal->fetch() ) {
+ $i++;
+ }
+ $this->assertEqual(24,$i);
+ }
+ function testFetchAll() {
+ $this->cal->build();
+ $children = array();
+ $i = 0;
+ while ( $Child = $this->cal->fetch() ) {
+ $children[$i]=$Child;
+ $i++;
+ }
+ $this->assertEqual($children,$this->cal->fetchAll());
+ }
+ function testSelection() {
+ require_once(CALENDAR_ROOT . 'Hour.php');
+ $selection = array(new Calendar_Hour(2003,10,25,13));
+ $this->cal->build($selection);
+ $i = 0;
+ while ( $Child = $this->cal->fetch() ) {
+ if ( $i == 13 )
+ break;
+ $i++;
+ }
+ $this->assertTrue($Child->isSelected());
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfDay();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfDayBuild();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/calendar_include.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/calendar_include.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/calendar_include.php (revision 20119)
@@ -0,0 +1,28 @@
+
Index: /closed/version-2_5-dev/data/module/Calendar/tests/hour_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/hour_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/hour_test.php (revision 20119)
@@ -0,0 +1,98 @@
+UnitTestCase('Test of Hour');
+ }
+ function setUp() {
+ $this->cal = new Calendar_Hour(2003,10,25,13);
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 10,
+ 'day' => 24,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testPrevMinute () {
+ $this->assertEqual(59,$this->cal->prevMinute());
+ }
+ function testThisMinute () {
+ $this->assertEqual(0,$this->cal->thisMinute());
+ }
+ function testNextMinute () {
+ $this->assertEqual(1,$this->cal->nextMinute());
+ }
+ function testPrevSecond () {
+ $this->assertEqual(59,$this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(0,$this->cal->thisSecond());
+ }
+ function testNextSecond () {
+ $this->assertEqual(1,$this->cal->nextSecond());
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(13,0,0,10,25,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+}
+
+class TestOfHourBuild extends TestOfHour {
+ function TestOfHourBuild() {
+ $this->UnitTestCase('Test of Hour::build()');
+ }
+ function testSize() {
+ $this->cal->build();
+ $this->assertEqual(60,$this->cal->size());
+ }
+ function testFetch() {
+ $this->cal->build();
+ $i=0;
+ while ( $Child = $this->cal->fetch() ) {
+ $i++;
+ }
+ $this->assertEqual(60,$i);
+ }
+ function testFetchAll() {
+ $this->cal->build();
+ $children = array();
+ $i = 0;
+ while ( $Child = $this->cal->fetch() ) {
+ $children[$i]=$Child;
+ $i++;
+ }
+ $this->assertEqual($children,$this->cal->fetchAll());
+ }
+ function testSelection() {
+ require_once(CALENDAR_ROOT . 'Minute.php');
+ $selection = array(new Calendar_Minute(2003,10,25,13,32));
+ $this->cal->build($selection);
+ $i = 0;
+ while ( $Child = $this->cal->fetch() ) {
+ if ( $i == 32 )
+ break;
+ $i++;
+ }
+ $this->assertTrue($Child->isSelected());
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfHour();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfHourBuild();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/unixts_engine_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/unixts_engine_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/unixts_engine_test.php (revision 20119)
@@ -0,0 +1,104 @@
+UnitTestCase('Test of Calendar_Engine_UnixTs');
+ }
+ function setUp() {
+ $this->engine = new Calendar_Engine_UnixTs();
+ }
+ function testGetSecondsInMinute() {
+ $this->assertEqual($this->engine->getSecondsInMinute(),60);
+ }
+ function testGetMinutesInHour() {
+ $this->assertEqual($this->engine->getMinutesInHour(),60);
+ }
+ function testGetHoursInDay() {
+ $this->assertEqual($this->engine->getHoursInDay(),24);
+ }
+ function testGetFirstDayOfWeek() {
+ $this->assertEqual($this->engine->getFirstDayOfWeek(),1);
+ }
+ function testGetWeekDays() {
+ $this->assertEqual($this->engine->getWeekDays(),array(0,1,2,3,4,5,6));
+ }
+ function testGetDaysInWeek() {
+ $this->assertEqual($this->engine->getDaysInWeek(),7);
+ }
+ function testGetWeekNInYear() {
+ $this->assertEqual($this->engine->getWeekNInYear(2003, 11, 3), 45);
+ }
+ function testGetWeekNInMonth() {
+ $this->assertEqual($this->engine->getWeekNInMonth(2003, 11, 3), 2);
+ }
+ function testGetWeeksInMonth0() {
+ $this->assertEqual($this->engine->getWeeksInMonth(2003, 11, 0), 6); //week starts on sunday
+ }
+ function testGetWeeksInMonth1() {
+ $this->assertEqual($this->engine->getWeeksInMonth(2003, 11, 1), 5); //week starts on monday
+ }
+ function testGetWeeksInMonth2() {
+ $this->assertEqual($this->engine->getWeeksInMonth(2003, 2, 6), 4); //week starts on saturday
+ }
+ function testGetWeeksInMonth3() {
+ // Unusual cases that can cause fails (shows up with example 21.php)
+ $this->assertEqual($this->engine->getWeeksInMonth(2004,2,1),5);
+ $this->assertEqual($this->engine->getWeeksInMonth(2004,8,1),6);
+ }
+ function testGetDayOfWeek() {
+ $this->assertEqual($this->engine->getDayOfWeek(2003, 11, 18), 2);
+ }
+ function testGetFirstDayInMonth() {
+ $this->assertEqual($this->engine->getFirstDayInMonth(2003,10),3);
+ }
+ function testGetDaysInMonth() {
+ $this->assertEqual($this->engine->getDaysInMonth(2003,10),31);
+ }
+ function testGetMinYears() {
+ $test = strpos(PHP_OS, 'WIN') >= 0 ? 1970 : 1902;
+ $this->assertEqual($this->engine->getMinYears(),$test);
+ }
+ function testGetMaxYears() {
+ $this->assertEqual($this->engine->getMaxYears(),2037);
+ }
+ function testDateToStamp() {
+ $stamp = mktime(0,0,0,10,15,2003);
+ $this->assertEqual($this->engine->dateToStamp(2003,10,15,0,0,0),$stamp);
+ }
+ function testStampToSecond() {
+ $stamp = mktime(13,30,45,10,15,2003);
+ $this->assertEqual($this->engine->stampToSecond($stamp),45);
+ }
+ function testStampToMinute() {
+ $stamp = mktime(13,30,45,10,15,2003);
+ $this->assertEqual($this->engine->stampToMinute($stamp),30);
+ }
+ function testStampToHour() {
+ $stamp = mktime(13,30,45,10,15,2003);
+ $this->assertEqual($this->engine->stampToHour($stamp),13);
+ }
+ function testStampToDay() {
+ $stamp = mktime(13,30,45,10,15,2003);
+ $this->assertEqual($this->engine->stampToDay($stamp),15);
+ }
+ function testStampToMonth() {
+ $stamp = mktime(13,30,45,10,15,2003);
+ $this->assertEqual($this->engine->stampToMonth($stamp),10);
+ }
+ function testStampToYear() {
+ $stamp = mktime(13,30,45,10,15,2003);
+ $this->assertEqual($this->engine->stampToYear($stamp),2003);
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfUnixTsEngine();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/helper_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/helper_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/helper_test.php (revision 20119)
@@ -0,0 +1,83 @@
+UnitTestCase('Test of Calendar_Table_Helper');
+ }
+ function setUp() {
+ $this->mockengine = new Mock_Calendar_Engine($this);
+ $this->mockengine->setReturnValue('getMinYears',1970);
+ $this->mockengine->setReturnValue('getMaxYears',2037);
+ $this->mockengine->setReturnValue('getMonthsInYear',12);
+ $this->mockengine->setReturnValue('getDaysInMonth',31);
+ $this->mockengine->setReturnValue('getHoursInDay',24);
+ $this->mockengine->setReturnValue('getMinutesInHour',60);
+ $this->mockengine->setReturnValue('getSecondsInMinute',60);
+ $this->mockengine->setReturnValue('getWeekDays',array(0,1,2,3,4,5,6));
+ $this->mockengine->setReturnValue('getDaysInWeek',7);
+ $this->mockengine->setReturnValue('getFirstDayOfWeek',1);
+ $this->mockengine->setReturnValue('getFirstDayInMonth',3);
+ $this->mockcal = new Mock_Calendar_Second($this);
+ $this->mockcal->setReturnValue('thisYear',2003);
+ $this->mockcal->setReturnValue('thisMonth',10);
+ $this->mockcal->setReturnValue('thisDay',15);
+ $this->mockcal->setReturnValue('thisHour',13);
+ $this->mockcal->setReturnValue('thisMinute',30);
+ $this->mockcal->setReturnValue('thisSecond',45);
+ $this->mockcal->setReturnValue('getEngine',$this->mockengine);
+ }
+ function testGetFirstDay() {
+ for ( $i = 0; $i <= 7; $i++ ) {
+ $Helper = & new Calendar_Table_Helper($this->mockcal,$i);
+ $this->assertEqual($Helper->getFirstDay(),$i);
+ }
+ }
+ function testGetDaysOfWeekMonday() {
+ $Helper = & new Calendar_Table_Helper($this->mockcal);
+ $this->assertEqual($Helper->getDaysOfWeek(),array(1,2,3,4,5,6,0));
+ }
+ function testGetDaysOfWeekSunday() {
+ $Helper = & new Calendar_Table_Helper($this->mockcal,0);
+ $this->assertEqual($Helper->getDaysOfWeek(),array(0,1,2,3,4,5,6));
+ }
+ function testGetDaysOfWeekThursday() {
+ $Helper = & new Calendar_Table_Helper($this->mockcal,4);
+ $this->assertEqual($Helper->getDaysOfWeek(),array(4,5,6,0,1,2,3));
+ }
+ function testGetNumWeeks() {
+ $Helper = & new Calendar_Table_Helper($this->mockcal);
+ $this->assertEqual($Helper->getNumWeeks(),5);
+ }
+ function testGetNumTableDaysInMonth() {
+ $Helper = & new Calendar_Table_Helper($this->mockcal);
+ $this->assertEqual($Helper->getNumTableDaysInMonth(),35);
+ }
+ function testGetEmptyDaysBefore() {
+ $Helper = & new Calendar_Table_Helper($this->mockcal);
+ $this->assertEqual($Helper->getEmptyDaysBefore(),2);
+ }
+ function testGetEmptyDaysAfter() {
+ $Helper = & new Calendar_Table_Helper($this->mockcal);
+ $this->assertEqual($Helper->getEmptyDaysAfter(),33);
+ }
+ function testGetEmptyDaysAfterOffset() {
+ $Helper = & new Calendar_Table_Helper($this->mockcal);
+ $this->assertEqual($Helper->getEmptyDaysAfterOffset(),5);
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfTableHelper();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/month_weekdays_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/month_weekdays_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/month_weekdays_test.php (revision 20119)
@@ -0,0 +1,130 @@
+UnitTestCase('Test of Month Weekdays');
+ }
+ function setUp() {
+ $this->cal = new Calendar_Month_Weekdays(2003,10);
+ }
+ function testPrevDay () {
+ $this->assertEqual(30,$this->cal->prevDay());
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 9,
+ 'day' => 30,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testThisDay () {
+ $this->assertEqual(1,$this->cal->thisDay());
+ }
+ function testNextDay () {
+ $this->assertEqual(2,$this->cal->nextDay());
+ }
+ function testPrevHour () {
+ $this->assertEqual(23,$this->cal->prevHour());
+ }
+ function testThisHour () {
+ $this->assertEqual(0,$this->cal->thisHour());
+ }
+ function testNextHour () {
+ $this->assertEqual(1,$this->cal->nextHour());
+ }
+ function testPrevMinute () {
+ $this->assertEqual(59,$this->cal->prevMinute());
+ }
+ function testThisMinute () {
+ $this->assertEqual(0,$this->cal->thisMinute());
+ }
+ function testNextMinute () {
+ $this->assertEqual(1,$this->cal->nextMinute());
+ }
+ function testPrevSecond () {
+ $this->assertEqual(59,$this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(0,$this->cal->thisSecond());
+ }
+ function testNextSecond () {
+ $this->assertEqual(1,$this->cal->nextSecond());
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(0,0,0,10,1,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+}
+
+class TestOfMonthWeekdaysBuild extends TestOfMonthWeekdays {
+ function TestOfMonthWeekdaysBuild() {
+ $this->UnitTestCase('Test of Month_Weekdays::build()');
+ }
+ function testSize() {
+ $this->cal->build();
+ $this->assertEqual(35,$this->cal->size());
+ }
+ function testFetch() {
+ $this->cal->build();
+ $i=0;
+ while ( $Child = $this->cal->fetch() ) {
+ $i++;
+ }
+ $this->assertEqual(35,$i);
+ }
+ function testFetchAll() {
+ $this->cal->build();
+ $children = array();
+ $i = 1;
+ while ( $Child = $this->cal->fetch() ) {
+ $children[$i]=$Child;
+ $i++;
+ }
+ $this->assertEqual($children,$this->cal->fetchAll());
+ }
+ function testSelection() {
+ require_once(CALENDAR_ROOT . 'Day.php');
+ $selection = array(new Calendar_Day(2003,10,25));
+ $this->cal->build($selection);
+ $i = 1;
+ while ( $Child = $this->cal->fetch() ) {
+ if ( $i == 27 )
+ break;
+ $i++;
+ }
+ $this->assertTrue($Child->isSelected());
+ }
+ function testEmptyCount() {
+ $this->cal->build();
+ $empty = 0;
+ while ( $Child = $this->cal->fetch() ) {
+ if ( $Child->isEmpty() )
+ $empty++;
+ }
+ $this->assertEqual(4,$empty);
+ }
+ function testEmptyDaysBefore_AfterAdjust() {
+ $this->cal = new Calendar_Month_Weekdays(2004,0);
+ $this->cal->build();
+ $this->assertEqual(0,$this->cal->tableHelper->getEmptyDaysBefore());
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfMonthWeekdays();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfMonthWeekdaysBuild();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/calendar_engine_tests.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/calendar_engine_tests.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/calendar_engine_tests.php (revision 20119)
@@ -0,0 +1,20 @@
+GroupTest('Calendar Engine Tests');
+ $this->addTestFile('peardate_engine_test.php');
+ $this->addTestFile('unixts_engine_test.php');
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new CalendarEngineTests();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/decorator_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/decorator_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/decorator_test.php (revision 20119)
@@ -0,0 +1,268 @@
+UnitTestCase('Test of Calendar_Decorator');
+ }
+ function setUp() {
+ $this->mockengine = new Mock_Calendar_Engine($this);
+ $this->mockcal = new Mock_Calendar_Second($this);
+ $this->mockcal->setReturnValue('prevYear',2002);
+ $this->mockcal->setReturnValue('thisYear',2003);
+ $this->mockcal->setReturnValue('nextYear',2004);
+ $this->mockcal->setReturnValue('prevMonth',9);
+ $this->mockcal->setReturnValue('thisMonth',10);
+ $this->mockcal->setReturnValue('nextMonth',11);
+ $this->mockcal->setReturnValue('prevDay',14);
+ $this->mockcal->setReturnValue('thisDay',15);
+ $this->mockcal->setReturnValue('nextDay',16);
+ $this->mockcal->setReturnValue('prevHour',12);
+ $this->mockcal->setReturnValue('thisHour',13);
+ $this->mockcal->setReturnValue('nextHour',14);
+ $this->mockcal->setReturnValue('prevMinute',29);
+ $this->mockcal->setReturnValue('thisMinute',30);
+ $this->mockcal->setReturnValue('nextMinute',31);
+ $this->mockcal->setReturnValue('prevSecond',44);
+ $this->mockcal->setReturnValue('thisSecond',45);
+ $this->mockcal->setReturnValue('nextSecond',46);
+ $this->mockcal->setReturnValue('getEngine',$this->mockengine);
+ $this->mockcal->setReturnValue('getTimestamp',12345);
+
+ }
+ function tearDown() {
+ unset ( $this->engine );
+ unset ( $this->mockcal );
+ }
+ function testPrevYear() {
+ $this->mockcal->expectOnce('prevYear',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(2002,$Decorator->prevYear());
+ }
+ function testThisYear() {
+ $this->mockcal->expectOnce('thisYear',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(2003,$Decorator->thisYear());
+ }
+ function testNextYear() {
+ $this->mockcal->expectOnce('nextYear',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(2004,$Decorator->nextYear());
+ }
+ function testPrevMonth() {
+ $this->mockcal->expectOnce('prevMonth',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(9,$Decorator->prevMonth());
+ }
+ function testThisMonth() {
+ $this->mockcal->expectOnce('thisMonth',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(10,$Decorator->thisMonth());
+ }
+ function testNextMonth() {
+ $this->mockcal->expectOnce('nextMonth',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(11,$Decorator->nextMonth());
+ }
+ function testPrevWeek() {
+ $mockweek = & new Mock_Calendar_Week($this);
+ $mockweek->setReturnValue('prevWeek',1);
+ $mockweek->expectOnce('prevWeek',array('n_in_month'));
+ $Decorator =& new Calendar_Decorator($mockweek);
+ $this->assertEqual(1,$Decorator->prevWeek());
+ }
+ function testThisWeek() {
+ $mockweek = & new Mock_Calendar_Week($this);
+ $mockweek->setReturnValue('thisWeek',2);
+ $mockweek->expectOnce('thisWeek',array('n_in_month'));
+ $Decorator =& new Calendar_Decorator($mockweek);
+ $this->assertEqual(2,$Decorator->thisWeek());
+ }
+ function testNextWeek() {
+ $mockweek = & new Mock_Calendar_Week($this);
+ $mockweek->setReturnValue('nextWeek',3);
+ $mockweek->expectOnce('nextWeek',array('n_in_month'));
+ $Decorator =& new Calendar_Decorator($mockweek);
+ $this->assertEqual(3,$Decorator->nextWeek());
+ }
+ function testPrevDay() {
+ $this->mockcal->expectOnce('prevDay',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(14,$Decorator->prevDay());
+ }
+ function testThisDay() {
+ $this->mockcal->expectOnce('thisDay',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(15,$Decorator->thisDay());
+ }
+ function testNextDay() {
+ $this->mockcal->expectOnce('nextDay',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(16,$Decorator->nextDay());
+ }
+ function testPrevHour() {
+ $this->mockcal->expectOnce('prevHour',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(12,$Decorator->prevHour());
+ }
+ function testThisHour() {
+ $this->mockcal->expectOnce('thisHour',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(13,$Decorator->thisHour());
+ }
+ function testNextHour() {
+ $this->mockcal->expectOnce('nextHour',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(14,$Decorator->nextHour());
+ }
+ function testPrevMinute() {
+ $this->mockcal->expectOnce('prevMinute',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(29,$Decorator->prevMinute());
+ }
+ function testThisMinute() {
+ $this->mockcal->expectOnce('thisMinute',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(30,$Decorator->thisMinute());
+ }
+ function testNextMinute() {
+ $this->mockcal->expectOnce('nextMinute',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(31,$Decorator->nextMinute());
+ }
+ function testPrevSecond() {
+ $this->mockcal->expectOnce('prevSecond',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(44,$Decorator->prevSecond());
+ }
+ function testThisSecond() {
+ $this->mockcal->expectOnce('thisSecond',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(45,$Decorator->thisSecond());
+ }
+ function testNextSecond() {
+ $this->mockcal->expectOnce('nextSecond',array('int'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(46,$Decorator->nextSecond());
+ }
+ function testGetEngine() {
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertIsA($Decorator->getEngine(),'Mock_Calendar_Engine');
+ }
+ function testSetTimestamp() {
+ $this->mockcal->expectOnce('setTimestamp',array('12345'));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $Decorator->setTimestamp('12345');
+ }
+ function testGetTimestamp() {
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual(12345,$Decorator->getTimestamp());
+ }
+ function testSetSelected() {
+ $this->mockcal->expectOnce('setSelected',array(true));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $Decorator->setSelected();
+ }
+ function testIsSelected() {
+ $this->mockcal->setReturnValue('isSelected',true);
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertTrue($Decorator->isSelected());
+ }
+ function testAdjust() {
+ $this->mockcal->expectOnce('adjust',array());
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $Decorator->adjust();
+ }
+ function testToArray() {
+ $this->mockcal->expectOnce('toArray',array(12345));
+ $testArray = array('foo'=>'bar');
+ $this->mockcal->setReturnValue('toArray',$testArray);
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual($testArray,$Decorator->toArray(12345));
+ }
+ function testReturnValue() {
+ $this->mockcal->expectOnce('returnValue',array('a','b','c','d'));
+ $this->mockcal->setReturnValue('returnValue','foo');
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $this->assertEqual('foo',$Decorator->returnValue('a','b','c','d'));
+ }
+ function testSetFirst() {
+ $mockday = & new Mock_Calendar_Day($this);
+ $mockday->expectOnce('setFirst',array(true));
+ $Decorator =& new Calendar_Decorator($mockday);
+ $Decorator->setFirst();
+ }
+ function testSetLast() {
+ $mockday = & new Mock_Calendar_Day($this);
+ $mockday->expectOnce('setLast',array(true));
+ $Decorator =& new Calendar_Decorator($mockday);
+ $Decorator->setLast();
+ }
+ function testIsFirst() {
+ $mockday = & new Mock_Calendar_Day($this);
+ $mockday->setReturnValue('isFirst',TRUE);
+ $Decorator =& new Calendar_Decorator($mockday);
+ $this->assertTrue($Decorator->isFirst());
+ }
+ function testIsLast() {
+ $mockday = & new Mock_Calendar_Day($this);
+ $mockday->setReturnValue('isLast',TRUE);
+ $Decorator =& new Calendar_Decorator($mockday);
+ $this->assertTrue($Decorator->isLast());
+ }
+ function testSetEmpty() {
+ $mockday = & new Mock_Calendar_Day($this);
+ $mockday->expectOnce('setEmpty',array(true));
+ $Decorator =& new Calendar_Decorator($mockday);
+ $Decorator->setEmpty();
+ }
+ function testIsEmpty() {
+ $mockday = & new Mock_Calendar_Day($this);
+ $mockday->setReturnValue('isEmpty',TRUE);
+ $Decorator =& new Calendar_Decorator($mockday);
+ $this->assertTrue($Decorator->isEmpty());
+ }
+ function testBuild() {
+ $testArray=array('foo'=>'bar');
+ $this->mockcal->expectOnce('build',array($testArray));
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $Decorator->build($testArray);
+ }
+ function testFetch() {
+ $this->mockcal->expectOnce('fetch',array());
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $Decorator->fetch();
+ }
+ function testFetchAll() {
+ $this->mockcal->expectOnce('fetchAll',array());
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $Decorator->fetchAll();
+ }
+ function testSize() {
+ $this->mockcal->expectOnce('size',array());
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $Decorator->size();
+ }
+ function testIsValid() {
+ $this->mockcal->expectOnce('isValid',array());
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $Decorator->isValid();
+ }
+ function testGetValidator() {
+ $this->mockcal->expectOnce('getValidator',array());
+ $Decorator =& new Calendar_Decorator($this->mockcal);
+ $Decorator->getValidator();
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/month_weeks_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/month_weeks_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/month_weeks_test.php (revision 20119)
@@ -0,0 +1,125 @@
+UnitTestCase('Test of Month Weeks');
+ }
+ function setUp() {
+ $this->cal = new Calendar_Month_Weeks(2003,10);
+ }
+ function testPrevDay () {
+ $this->assertEqual(30,$this->cal->prevDay());
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 9,
+ 'day' => 30,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testThisDay () {
+ $this->assertEqual(1,$this->cal->thisDay());
+ }
+ function testNextDay () {
+ $this->assertEqual(2,$this->cal->nextDay());
+ }
+ function testPrevHour () {
+ $this->assertEqual(23,$this->cal->prevHour());
+ }
+ function testThisHour () {
+ $this->assertEqual(0,$this->cal->thisHour());
+ }
+ function testNextHour () {
+ $this->assertEqual(1,$this->cal->nextHour());
+ }
+ function testPrevMinute () {
+ $this->assertEqual(59,$this->cal->prevMinute());
+ }
+ function testThisMinute () {
+ $this->assertEqual(0,$this->cal->thisMinute());
+ }
+ function testNextMinute () {
+ $this->assertEqual(1,$this->cal->nextMinute());
+ }
+ function testPrevSecond () {
+ $this->assertEqual(59,$this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(0,$this->cal->thisSecond());
+ }
+ function testNextSecond () {
+ $this->assertEqual(1,$this->cal->nextSecond());
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(0,0,0,10,1,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+}
+
+class TestOfMonthWeeksBuild extends TestOfMonthWeeks {
+ function TestOfMonthWeeksBuild() {
+ $this->UnitTestCase('Test of Month_Weeks::build()');
+ }
+ function testSize() {
+ $this->cal->build();
+ $this->assertEqual(5,$this->cal->size());
+ }
+
+ function testFetch() {
+ $this->cal->build();
+ $i=0;
+ while ( $Child = $this->cal->fetch() ) {
+ $i++;
+ }
+ $this->assertEqual(5,$i);
+ }
+/* Recusive dependency issue with SimpleTest
+ function testFetchAll() {
+ $this->cal->build();
+ $children = array();
+ $i = 1;
+ while ( $Child = $this->cal->fetch() ) {
+ $children[$i]=$Child;
+ $i++;
+ }
+ $this->assertEqual($children,$this->cal->fetchAll());
+ }
+*/
+ function testSelection() {
+ require_once(CALENDAR_ROOT . 'Week.php');
+ $selection = array(new Calendar_Week(2003, 10, 12));
+ $this->cal->build($selection);
+ $i = 1;
+ while ($Child = $this->cal->fetch()) {
+ if ($i == 2) {
+ break; //12-10-2003 is the 2nd day of the week
+ }
+ $i++;
+ }
+ $this->assertTrue($Child->isSelected());
+ }
+ function testEmptyDaysBefore_AfterAdjust() {
+ $this->cal = new Calendar_Month_Weeks(2004,0);
+ $this->cal->build();
+ $this->assertEqual(0,$this->cal->tableHelper->getEmptyDaysBefore());
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfMonthWeeks();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfMonthWeeksBuild();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/decorator_textual_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/decorator_textual_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/decorator_textual_test.php (revision 20119)
@@ -0,0 +1,174 @@
+UnitTestCase('Test of Calendar_Decorator_Textual');
+ }
+ function testMonthNamesLong() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $monthNames = array(
+ 1=>'January',
+ 2=>'February',
+ 3=>'March',
+ 4=>'April',
+ 5=>'May',
+ 6=>'June',
+ 7=>'July',
+ 8=>'August',
+ 9=>'September',
+ 10=>'October',
+ 11=>'November',
+ 12=>'December',
+ );
+ $this->assertEqual($monthNames,$Textual->monthNames());
+ }
+ function testMonthNamesShort() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $monthNames = array(
+ 1=>'Jan',
+ 2=>'Feb',
+ 3=>'Mar',
+ 4=>'Apr',
+ 5=>'May',
+ 6=>'Jun',
+ 7=>'Jul',
+ 8=>'Aug',
+ 9=>'Sep',
+ 10=>'Oct',
+ 11=>'Nov',
+ 12=>'Dec',
+ );
+ $this->assertEqual($monthNames,$Textual->monthNames('short'));
+ }
+ function testMonthNamesTwo() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $monthNames = array(
+ 1=>'Ja',
+ 2=>'Fe',
+ 3=>'Ma',
+ 4=>'Ap',
+ 5=>'Ma',
+ 6=>'Ju',
+ 7=>'Ju',
+ 8=>'Au',
+ 9=>'Se',
+ 10=>'Oc',
+ 11=>'No',
+ 12=>'De',
+ );
+ $this->assertEqual($monthNames,$Textual->monthNames('two'));
+ }
+ function testMonthNamesOne() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $monthNames = array(
+ 1=>'J',
+ 2=>'F',
+ 3=>'M',
+ 4=>'A',
+ 5=>'M',
+ 6=>'J',
+ 7=>'J',
+ 8=>'A',
+ 9=>'S',
+ 10=>'O',
+ 11=>'N',
+ 12=>'D',
+ );
+ $this->assertEqual($monthNames,$Textual->monthNames('one'));
+ }
+ function testWeekdayNamesLong() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $weekdayNames = array(
+ 0=>'Sunday',
+ 1=>'Monday',
+ 2=>'Tuesday',
+ 3=>'Wednesday',
+ 4=>'Thursday',
+ 5=>'Friday',
+ 6=>'Saturday',
+ );
+ $this->assertEqual($weekdayNames,$Textual->weekdayNames());
+ }
+ function testWeekdayNamesShort() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $weekdayNames = array(
+ 0=>'Sun',
+ 1=>'Mon',
+ 2=>'Tue',
+ 3=>'Wed',
+ 4=>'Thu',
+ 5=>'Fri',
+ 6=>'Sat',
+ );
+ $this->assertEqual($weekdayNames,$Textual->weekdayNames('short'));
+ }
+ function testWeekdayNamesTwo() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $weekdayNames = array(
+ 0=>'Su',
+ 1=>'Mo',
+ 2=>'Tu',
+ 3=>'We',
+ 4=>'Th',
+ 5=>'Fr',
+ 6=>'Sa',
+ );
+ $this->assertEqual($weekdayNames,$Textual->weekdayNames('two'));
+ }
+ function testWeekdayNamesOne() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $weekdayNames = array(
+ 0=>'S',
+ 1=>'M',
+ 2=>'T',
+ 3=>'W',
+ 4=>'T',
+ 5=>'F',
+ 6=>'S',
+ );
+ $this->assertEqual($weekdayNames,$Textual->weekdayNames('one'));
+ }
+ function testPrevMonthNameShort() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $this->assertEqual('Sep',$Textual->prevMonthName('short'));
+ }
+ function testThisMonthNameShort() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $this->assertEqual('Oct',$Textual->thisMonthName('short'));
+ }
+ function testNextMonthNameShort() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $this->assertEqual('Nov',$Textual->nextMonthName('short'));
+ }
+ function testThisDayNameShort() {
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $this->assertEqual('Wed',$Textual->thisDayName('short'));
+ }
+ function testOrderedWeekdaysShort() {
+ $weekdayNames = array(
+ 0=>'Sun',
+ 1=>'Mon',
+ 2=>'Tue',
+ 3=>'Wed',
+ 4=>'Thu',
+ 5=>'Fri',
+ 6=>'Sat',
+ );
+ $Textual = new Calendar_Decorator_Textual($this->mockcal);
+ $this->assertEqual($weekdayNames,$Textual->orderedWeekdays('short'));
+ }
+
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfDecoratorTextual();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/week_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/week_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/week_test.php (revision 20119)
@@ -0,0 +1,241 @@
+UnitTestCase('Test of Week');
+ }
+ function setUp() {
+ $this->cal = Calendar_Factory::create('Week', 2003, 10, 9);
+ //print_r($this->cal);
+ }
+ function testPrevDay () {
+ $this->assertEqual(8, $this->cal->prevDay());
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 10,
+ 'day' => 8,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testThisDay () {
+ $this->assertEqual(9, $this->cal->thisDay());
+ }
+ function testNextDay () {
+ $this->assertEqual(10, $this->cal->nextDay());
+ }
+ function testPrevHour () {
+ $this->assertEqual(23, $this->cal->prevHour());
+ }
+ function testThisHour () {
+ $this->assertEqual(0, $this->cal->thisHour());
+ }
+ function testNextHour () {
+ $this->assertEqual(1, $this->cal->nextHour());
+ }
+ function testPrevMinute () {
+ $this->assertEqual(59, $this->cal->prevMinute());
+ }
+ function testThisMinute () {
+ $this->assertEqual(0, $this->cal->thisMinute());
+ }
+ function testNextMinute () {
+ $this->assertEqual(1, $this->cal->nextMinute());
+ }
+ function testPrevSecond () {
+ $this->assertEqual(59, $this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(0, $this->cal->thisSecond());
+ }
+ function testNextSecond () {
+ $this->assertEqual(1, $this->cal->nextSecond());
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(0,0,0,10,9,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+ function testNewTimeStamp() {
+ $stamp = mktime(0,0,0,7,28,2004);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual('30 2004', date('W Y', $this->cal->prevWeek(true)));
+ $this->assertEqual('31 2004', date('W Y', $this->cal->thisWeek(true)));
+ $this->assertEqual('32 2004', date('W Y', $this->cal->nextWeek(true)));
+ }
+ function testPrevWeekInMonth() {
+ $this->assertEqual(1, $this->cal->prevWeek());
+ $stamp = mktime(0,0,0,2,3,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(0, $this->cal->prevWeek());
+ }
+ function testThisWeekInMonth() {
+ $this->assertEqual(2, $this->cal->thisWeek());
+ $stamp = mktime(0,0,0,2,3,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(1, $this->cal->thisWeek());
+ $stamp = mktime(0,0,0,1,1,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(1, $this->cal->thisWeek());
+ $stamp = mktime(0,0,0,1,3,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(2, $this->cal->thisWeek());
+ }
+ function testNextWeekInMonth() {
+ $this->assertEqual(3, $this->cal->nextWeek());
+ $stamp = mktime(0,0,0,2,3,2005);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(2, $this->cal->nextWeek());
+ }
+ function testPrevWeekInYear() {
+ $this->assertEqual(date('W', $this->cal->prevWeek('timestamp')), $this->cal->prevWeek('n_in_year'));
+ $stamp = mktime(0,0,0,1,1,2004);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(date('W', $this->cal->nextWeek('timestamp')), $this->cal->nextWeek('n_in_year'));
+ }
+ function testThisWeekInYear() {
+ $this->assertEqual(date('W', $this->cal->thisWeek('timestamp')), $this->cal->thisWeek('n_in_year'));
+ $stamp = mktime(0,0,0,1,1,2004);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(date('W', $this->cal->thisWeek('timestamp')), $this->cal->thisWeek('n_in_year'));
+ }
+ function testFirstWeekInYear() {
+ $stamp = mktime(0,0,0,1,4,2004);
+ $this->cal->setTimestamp($stamp);
+ $this->assertEqual(1, $this->cal->thisWeek('n_in_year'));
+ }
+ function testNextWeekInYear() {
+ $this->assertEqual(date('W', $this->cal->nextWeek('timestamp')), $this->cal->nextWeek('n_in_year'));
+ }
+ function testPrevWeekArray() {
+ $testArray = array(
+ 'year'=>2003,
+ 'month'=>9,
+ 'day'=>29,
+ 'hour'=>0,
+ 'minute'=>0,
+ 'second'=>0
+ );
+ $this->assertEqual($testArray, $this->cal->prevWeek('array'));
+ }
+ function testThisWeekArray() {
+ $testArray = array(
+ 'year'=>2003,
+ 'month'=>10,
+ 'day'=>6,
+ 'hour'=>0,
+ 'minute'=>0,
+ 'second'=>0
+ );
+ $this->assertEqual($testArray, $this->cal->thisWeek('array'));
+ }
+ function testNextWeekArray() {
+ $testArray = array(
+ 'year'=>2003,
+ 'month'=>10,
+ 'day'=>13,
+ 'hour'=>0,
+ 'minute'=>0,
+ 'second'=>0
+ );
+ $this->assertEqual($testArray, $this->cal->nextWeek('array'));
+ }
+ function testPrevWeekObject() {
+ $testWeek = Calendar_Factory::create('Week', 2003, 9, 29); //week starts on monday
+ $Week = $this->cal->prevWeek('object');
+ $this->assertEqual($testWeek->getTimeStamp(), $Week->getTimeStamp());
+ }
+ function testThisWeekObject() {
+ $testWeek = Calendar_Factory::create('Week', 2003, 10, 6); //week starts on monday
+ $Week = $this->cal->thisWeek('object');
+ $this->assertEqual($testWeek->getTimeStamp(), $Week->getTimeStamp());
+ }
+ function testNextWeekObject() {
+ $testWeek = Calendar_Factory::create('Week', 2003, 10, 13); //week starts on monday
+ $Week = $this->cal->nextWeek('object');
+ $this->assertEqual($testWeek->getTimeStamp(), $Week->getTimeStamp());
+ }
+}
+
+class TestOfWeekBuild extends TestOfWeek {
+ function TestOfWeekBuild() {
+ $this->UnitTestCase('Test of Week::build()');
+ }
+ function testSize() {
+ $this->cal->build();
+ $this->assertEqual(7, $this->cal->size());
+ }
+
+ function testFetch() {
+ $this->cal->build();
+ $i=0;
+ while ($Child = $this->cal->fetch()) {
+ $i++;
+ }
+ $this->assertEqual(7, $i);
+ }
+ function testFetchAll() {
+ $this->cal->build();
+ $children = array();
+ $i = 1;
+ while ( $Child = $this->cal->fetch() ) {
+ $children[$i]=$Child;
+ $i++;
+ }
+ $this->assertEqual($children,$this->cal->fetchAll());
+ }
+
+ function testSelection() {
+ require_once(CALENDAR_ROOT . 'Day.php');
+ $selection = array(Calendar_Factory::create('Day', 2003, 10, 7));
+ $this->cal->build($selection);
+ $i = 1;
+ while ($Child = $this->cal->fetch()) {
+ if ($i == 2) {
+ break; //07-10-2003 is the 2nd day of the week (starting on monday)
+ }
+ $i++;
+ }
+ $this->assertTrue($Child->isSelected());
+ }
+ function testSelectionCornerCase() {
+ require_once(CALENDAR_ROOT . 'Day.php');
+ $selectedDays = array(
+ Calendar_Factory::create('Day', 2003, 12, 29),
+ Calendar_Factory::create('Day', 2003, 12, 30),
+ Calendar_Factory::create('Day', 2003, 12, 31),
+ Calendar_Factory::create('Day', 2004, 01, 01),
+ Calendar_Factory::create('Day', 2004, 01, 02),
+ Calendar_Factory::create('Day', 2004, 01, 03),
+ Calendar_Factory::create('Day', 2004, 01, 04)
+ );
+ $this->cal = Calendar_Factory::create('Week', 2003, 12, 31, 0);
+ $this->cal->build($selectedDays);
+ while ($Day = $this->cal->fetch()) {
+ $this->assertTrue($Day->isSelected());
+ }
+ $this->cal = Calendar_Factory::create('Week', 2004, 1, 1, 0);
+ $this->cal->build($selectedDays);
+ while ($Day = $this->cal->fetch()) {
+ $this->assertTrue($Day->isSelected());
+ }
+ }
+}
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfWeek();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfWeekBuild();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/util_uri_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/util_uri_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/util_uri_test.php (revision 20119)
@@ -0,0 +1,54 @@
+UnitTestCase('Test of Calendar_Util_Uri');
+ }
+
+ function setUp() {
+ $this->MockCal = & new Mock_Calendar_Day($this);
+ $this->MockCal->setReturnValue('getEngine',new Mock_Calendar_Engine($this));
+ }
+
+ function testFragments() {
+ $Uri = new Calendar_Util_Uri('y','m','d','h','m','s');
+ $Uri->setFragments('year','month','day','hour','minute','second');
+ $this->assertEqual(
+ 'year=&month=&day=&hour=&minute=&second=',
+ $Uri->this($this->MockCal, 'second')
+ );
+ }
+ function testScalarFragments() {
+ $Uri = new Calendar_Util_Uri('year','month','day','hour','minute','second');
+ $Uri->scalar = true;
+ $this->assertEqual(
+ '&&&&&',
+ $Uri->this($this->MockCal, 'second')
+ );
+ }
+ function testSetSeperator() {
+ $Uri = new Calendar_Util_Uri('year','month','day','hour','minute','second');
+ $Uri->separator = '/';
+ $this->assertEqual(
+ 'year=/month=/day=/hour=/minute=/second=',
+ $Uri->this($this->MockCal, 'second')
+ );
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfUtilUri();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/simple_include.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/simple_include.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/simple_include.php (revision 20119)
@@ -0,0 +1,10 @@
+
Index: /closed/version-2_5-dev/data/module/Calendar/tests/validator_error_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/validator_error_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/validator_error_test.php (revision 20119)
@@ -0,0 +1,34 @@
+UnitTestCase('Test of Validation Error');
+ }
+ function setUp() {
+ $this->vError = new Calendar_Validation_Error('foo',20,'bar');
+ }
+ function testGetUnit() {
+ $this->assertEqual($this->vError->getUnit(),'foo');
+ }
+ function testGetValue() {
+ $this->assertEqual($this->vError->getValue(),20);
+ }
+ function testGetMessage() {
+ $this->assertEqual($this->vError->getMessage(),'bar');
+ }
+ function testToString() {
+ $this->assertEqual($this->vError->toString(),'foo = 20 [bar]');
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfValidationError();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/tests/minute_test.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/tests/minute_test.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/tests/minute_test.php (revision 20119)
@@ -0,0 +1,99 @@
+UnitTestCase('Test of Minute');
+ }
+ function setUp() {
+ $this->cal = new Calendar_Minute(2003,10,25,13,32);
+ }
+ function testPrevDay_Array () {
+ $this->assertEqual(
+ array(
+ 'year' => 2003,
+ 'month' => 10,
+ 'day' => 24,
+ 'hour' => 0,
+ 'minute' => 0,
+ 'second' => 0),
+ $this->cal->prevDay('array'));
+ }
+ function testPrevSecond () {
+ $this->assertEqual(59,$this->cal->prevSecond());
+ }
+ function testThisSecond () {
+ $this->assertEqual(0,$this->cal->thisSecond());
+ }
+ function testThisSecond_Timestamp () {
+ $this->assertEqual($this->cal->cE->dateToStamp(
+ 2003, 10, 25, 13, 32, 0),
+ $this->cal->thisSecond('timestamp'));
+ }
+ function testNextSecond () {
+ $this->assertEqual(1,$this->cal->nextSecond());
+ }
+ function testNextSecond_Timestamp () {
+ $this->assertEqual($this->cal->cE->dateToStamp(
+ 2003, 10, 25, 13, 32, 1),
+ $this->cal->nextSecond('timestamp'));
+ }
+ function testGetTimeStamp() {
+ $stamp = mktime(13,32,0,10,25,2003);
+ $this->assertEqual($stamp,$this->cal->getTimeStamp());
+ }
+}
+
+class TestOfMinuteBuild extends TestOfMinute {
+ function TestOfMinuteBuild() {
+ $this->UnitTestCase('Test of Minute::build()');
+ }
+ function testSize() {
+ $this->cal->build();
+ $this->assertEqual(60,$this->cal->size());
+ }
+ function testFetch() {
+ $this->cal->build();
+ $i=0;
+ while ( $Child = $this->cal->fetch() ) {
+ $i++;
+ }
+ $this->assertEqual(60,$i);
+ }
+ function testFetchAll() {
+ $this->cal->build();
+ $children = array();
+ $i = 0;
+ while ( $Child = $this->cal->fetch() ) {
+ $children[$i]=$Child;
+ $i++;
+ }
+ $this->assertEqual($children,$this->cal->fetchAll());
+ }
+ function testSelection() {
+ require_once(CALENDAR_ROOT . 'Second.php');
+ $selection = array(new Calendar_Second(2003,10,25,13,32,43));
+ $this->cal->build($selection);
+ $i = 0;
+ while ( $Child = $this->cal->fetch() ) {
+ if ( $i == 43 )
+ break;
+ $i++;
+ }
+ $this->assertTrue($Child->isSelected());
+ }
+}
+
+if (!defined('TEST_RUNNING')) {
+ define('TEST_RUNNING', true);
+ $test = &new TestOfMinute();
+ $test->run(new HtmlReporter());
+ $test = &new TestOfMinuteBuild();
+ $test->run(new HtmlReporter());
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Day.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Day.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Day.php (revision 20119)
@@ -0,0 +1,197 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: Day.php,v 1.1 2004/05/24 22:25:42 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Day.php,v 1.1 2004/05/24 22:25:42 quipo Exp $
+ */
+
+/**
+ * Allows Calendar include path to be redefined
+ * @ignore
+ */
+if (!defined('CALENDAR_ROOT')) {
+ define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
+}
+
+/**
+ * Load Calendar base class
+ */
+require_once CALENDAR_ROOT.'Calendar.php';
+
+/**
+ * Represents a Day and builds Hours.
+ *
+ * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Day.php';
+ * $Day = & new Calendar_Day(2003, 10, 21); // Oct 21st 2003
+ * while ($Hour = & $Day->fetch()) {
+ * echo $Hour->thisHour().'
';
+ * }
+ *
+ * @package Calendar
+ * @access public
+ */
+class Calendar_Day extends Calendar
+{
+ /**
+ * Marks the Day at the beginning of a week
+ * @access private
+ * @var boolean
+ */
+ var $first = false;
+
+ /**
+ * Marks the Day at the end of a week
+ * @access private
+ * @var boolean
+ */
+ var $last = false;
+
+
+ /**
+ * Used for tabular calendars
+ * @access private
+ * @var boolean
+ */
+ var $empty = false;
+
+ /**
+ * Constructs Calendar_Day
+ * @param int year e.g. 2003
+ * @param int month e.g. 8
+ * @param int day e.g. 15
+ * @access public
+ */
+ function Calendar_Day($y, $m, $d)
+ {
+ Calendar::Calendar($y, $m, $d);
+ }
+
+ /**
+ * Builds the Hours of the Day
+ * @param array (optional) Caledar_Hour objects representing selected dates
+ * @return boolean
+ * @access public
+ */
+ function build($sDates = array())
+ {
+ require_once CALENDAR_ROOT.'Hour.php';
+
+ $hID = $this->cE->getHoursInDay($this->year, $this->month, $this->day);
+ for ($i=0; $i < $hID; $i++) {
+ $this->children[$i]=
+ new Calendar_Hour($this->year, $this->month, $this->day, $i);
+ }
+ if (count($sDates) > 0) {
+ $this->setSelection($sDates);
+ }
+ return true;
+ }
+
+ /**
+ * Called from build()
+ * @param array
+ * @return void
+ * @access private
+ */
+ function setSelection($sDates)
+ {
+ foreach ($sDates as $sDate) {
+ if ($this->year == $sDate->thisYear()
+ && $this->month == $sDate->thisMonth()
+ && $this->day == $sDate->thisDay())
+ {
+ $key = (int)$sDate->thisHour();
+ if (isset($this->children[$key])) {
+ $sDate->setSelected();
+ $this->children[$key] = $sDate;
+ }
+ }
+ }
+ }
+
+ /**
+ * Defines Day object as first in a week
+ * Only used by Calendar_Month_Weekdays::build()
+ * @param boolean state
+ * @return void
+ * @access private
+ */
+ function setFirst ($state = true)
+ {
+ $this->first = $state;
+ }
+
+ /**
+ * Defines Day object as last in a week
+ * Used only following Calendar_Month_Weekdays::build()
+ * @param boolean state
+ * @return void
+ * @access private
+ */
+ function setLast($state = true)
+ {
+ $this->last = $state;
+ }
+
+ /**
+ * Returns true if Day object is first in a Week
+ * Only relevant when Day is created by Calendar_Month_Weekdays::build()
+ * @return boolean
+ * @access public
+ */
+ function isFirst() {
+ return $this->first;
+ }
+
+ /**
+ * Returns true if Day object is last in a Week
+ * Only relevant when Day is created by Calendar_Month_Weekdays::build()
+ * @return boolean
+ * @access public
+ */
+ function isLast()
+ {
+ return $this->last;
+ }
+
+ /**
+ * Defines Day object as empty
+ * Only used by Calendar_Month_Weekdays::build()
+ * @param boolean state
+ * @return void
+ * @access private
+ */
+ function setEmpty ($state = true)
+ {
+ $this->empty = $state;
+ }
+
+ /**
+ * @return boolean
+ * @access public
+ */
+ function isEmpty()
+ {
+ return $this->empty;
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Hour.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Hour.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Hour.php (revision 20119)
@@ -0,0 +1,113 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: Hour.php,v 1.1 2004/05/24 22:25:42 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Hour.php,v 1.1 2004/05/24 22:25:42 quipo Exp $
+ */
+
+/**
+ * Allows Calendar include path to be redefined
+ * @ignore
+ */
+if (!defined('CALENDAR_ROOT')) {
+ define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
+}
+
+/**
+ * Load Calendar base class
+ */
+require_once CALENDAR_ROOT.'Calendar.php';
+
+/**
+ * Represents an Hour and builds Minutes
+ *
+ * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Hour.php';
+ * $Hour = & new Calendar_Hour(2003, 10, 21, 15); // Oct 21st 2003, 3pm
+ * $Hour->build(); // Build Calendar_Minute objects
+ * while ($Minute = & $Hour->fetch()) {
+ * echo $Minute->thisMinute().'
';
+ * }
+ *
+ * @package Calendar
+ * @access public
+ */
+class Calendar_Hour extends Calendar
+{
+ /**
+ * Constructs Calendar_Hour
+ * @param int year e.g. 2003
+ * @param int month e.g. 5
+ * @param int day e.g. 11
+ * @param int hour e.g. 13
+ * @access public
+ */
+ function Calendar_Hour($y, $m, $d, $h)
+ {
+ Calendar::Calendar($y, $m, $d, $h);
+ }
+
+ /**
+ * Builds the Minutes in the Hour
+ * @param array (optional) Calendar_Minute objects representing selected dates
+ * @return boolean
+ * @access public
+ */
+ function build($sDates=array())
+ {
+ require_once CALENDAR_ROOT.'Minute.php';
+ $mIH = $this->cE->getMinutesInHour($this->year, $this->month, $this->day,
+ $this->hour);
+ for ($i=0; $i < $mIH; $i++) {
+ $this->children[$i]=
+ new Calendar_Minute($this->year, $this->month, $this->day,
+ $this->hour, $i);
+ }
+ if (count($sDates) > 0) {
+ $this->setSelection($sDates);
+ }
+ return true;
+ }
+
+ /**
+ * Called from build()
+ * @param array
+ * @return void
+ * @access private
+ */
+ function setSelection($sDates)
+ {
+ foreach ($sDates as $sDate) {
+ if ($this->year == $sDate->thisYear()
+ && $this->month == $sDate->thisMonth()
+ && $this->day == $sDate->thisDay()
+ && $this->hour == $sDate->thisHour())
+ {
+ $key = (int)$sDate->thisMinute();
+ if (isset($this->children[$key])) {
+ $sDate->setSelected();
+ $this->children[$key] = $sDate;
+ }
+ }
+ }
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Engine/UnixTS.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Engine/UnixTS.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Engine/UnixTS.php (revision 20119)
@@ -0,0 +1,365 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: UnixTS.php,v 1.9 2004/08/20 20:00:55 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: UnixTS.php,v 1.9 2004/08/20 20:00:55 quipo Exp $
+ */
+/**
+ * Performs calendar calculations based on the PHP date() function and
+ * Unix timestamps (using PHP's mktime() function).
+ * @package Calendar
+ * @access protected
+ */
+class Calendar_Engine_UnixTS /* implements Calendar_Engine_Interface */
+{
+ /**
+ * Makes sure a given timestamp is only ever parsed once
+ *
+ * array (
+ * [0] => year (e.g 2003),
+ * [1] => month (e.g 9),
+ * [2] => day (e.g 6),
+ * [3] => hour (e.g 14),
+ * [4] => minute (e.g 34),
+ * [5] => second (e.g 45),
+ * [6] => num days in month (e.g. 31),
+ * [7] => week in year (e.g. 50),
+ * [8] => day in week (e.g. 0 for Sunday)
+ * )
+ *
+ * Uses a static variable to prevent date() being used twice
+ * for a date which is already known
+ * @param int Unix timestamp
+ * @return array
+ * @access protected
+ */
+ function stampCollection($stamp)
+ {
+ static $stamps = array();
+ if ( !isset($stamps[$stamp]) ) {
+ $date = @date('Y n j H i s t W w',$stamp);
+ $stamps[$stamp] = sscanf($date, "%d %d %d %d %d %d %d %d %d");
+ }
+ return $stamps[$stamp];
+ }
+
+ /**
+ * Returns a numeric year given a timestamp
+ * @param int Unix timestamp
+ * @return int year (e.g. 2003)
+ * @access protected
+ */
+ function stampToYear($stamp)
+ {
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return (int)$date[0];
+ }
+
+ /**
+ * Returns a numeric month given a timestamp
+ * @param int Unix timestamp
+ * @return int month (e.g. 9)
+ * @access protected
+ */
+ function stampToMonth($stamp)
+ {
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return (int)$date[1];
+ }
+
+ /**
+ * Returns a numeric day given a timestamp
+ * @param int Unix timestamp
+ * @return int day (e.g. 15)
+ * @access protected
+ */
+ function stampToDay($stamp)
+ {
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return (int)$date[2];
+ }
+
+ /**
+ * Returns a numeric hour given a timestamp
+ * @param int Unix timestamp
+ * @return int hour (e.g. 13)
+ * @access protected
+ */
+ function stampToHour($stamp)
+ {
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return (int)$date[3];
+ }
+
+ /**
+ * Returns a numeric minute given a timestamp
+ * @param int Unix timestamp
+ * @return int minute (e.g. 34)
+ * @access protected
+ */
+ function stampToMinute($stamp)
+ {
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return (int)$date[4];
+ }
+
+ /**
+ * Returns a numeric second given a timestamp
+ * @param int Unix timestamp
+ * @return int second (e.g. 51)
+ * @access protected
+ */
+ function stampToSecond($stamp)
+ {
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return (int)$date[5];
+ }
+
+ /**
+ * Returns a timestamp
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (13)
+ * @param int hour (13)
+ * @param int minute (34)
+ * @param int second (53)
+ * @return int Unix timestamp
+ * @access protected
+ */
+ function dateToStamp($y, $m, $d, $h=0, $i=0, $s=0)
+ {
+ static $dates = array();
+ if ( !isset($dates[$y][$m][$d][$h][$i][$s]) ) {
+ $dates[$y][$m][$d][$h][$i][$s] = @mktime($h, $i, $s, $m, $d, $y);
+ }
+ return $dates[$y][$m][$d][$h][$i][$s];
+ }
+
+ /**
+ * The upper limit on years that the Calendar Engine can work with
+ * @return int (2037)
+ * @access protected
+ */
+ function getMaxYears()
+ {
+ return 2037;
+ }
+
+ /**
+ * The lower limit on years that the Calendar Engine can work with
+ * @return int (1970 if it's Windows and 1902 for all other OSs)
+ * @access protected
+ */
+ function getMinYears()
+ {
+ return $min = strpos(PHP_OS, 'WIN') === false ? 1902 : 1970;
+ }
+
+ /**
+ * Returns the number of months in a year
+ * @return int (12)
+ * @access protected
+ */
+ function getMonthsInYear($y=null)
+ {
+ return 12;
+ }
+
+ /**
+ * Returns the number of days in a month, given year and month
+ * @param int year (2003)
+ * @param int month (9)
+ * @return int days in month
+ * @access protected
+ */
+ function getDaysInMonth($y, $m)
+ {
+ $stamp = Calendar_Engine_UnixTS::dateToStamp($y,$m,1);
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return $date[6];
+ }
+
+ /**
+ * Returns numeric representation of the day of the week in a month,
+ * given year and month
+ * @param int year (2003)
+ * @param int month (9)
+ * @return int from 0 to 6
+ * @access protected
+ */
+ function getFirstDayInMonth($y, $m)
+ {
+ $stamp = Calendar_Engine_UnixTS::dateToStamp($y,$m,1);
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return $date[8];
+ }
+
+ /**
+ * Returns the number of days in a week
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int (7)
+ * @access protected
+ */
+ function getDaysInWeek($y=NULL, $m=NULL, $d=NULL)
+ {
+ return 7;
+ }
+
+ /**
+ * Returns the number of the week in the year (ISO-8601), given a date
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int week number
+ * @access protected
+ */
+ function getWeekNInYear($y, $m, $d)
+ {
+ $stamp = Calendar_Engine_UnixTS::dateToStamp($y,$m,$d);
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return $date[7];
+ }
+
+ /**
+ * Returns the number of the week in the month, given a date
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @param int first day of the week (default: monday)
+ * @return int week number
+ * @access protected
+ */
+ function getWeekNInMonth($y, $m, $d, $firstDay=1)
+ {
+ $weekEnd = ($firstDay == 0) ? $this->getDaysInWeek()-1 : $firstDay-1;
+ $end_of_week = 1;
+ while (@date('w', @mktime(0, 0, 0, $m, $end_of_week, $y)) != $weekEnd) {
+ ++$end_of_week; //find first weekend of the month
+ }
+ $w = 1;
+ while ($d > $end_of_week) {
+ ++$w;
+ $end_of_week += $this->getDaysInWeek();
+ }
+ return $w;
+ }
+
+ /**
+ * Returns the number of weeks in the month
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int first day of the week (default: monday)
+ * @return int weeks number
+ * @access protected
+ */
+ function getWeeksInMonth($y, $m, $firstDay=1)
+ {
+ $FDOM = $this->getFirstDayInMonth($y, $m);
+ if ($FDOM == 0) {
+ $FDOM = $this->getDaysInWeek();
+ }
+ if ($FDOM > $firstDay) {
+ $daysInTheFirstWeek = $this->getDaysInWeek() - $FDOM + $firstDay;
+ $weeks = 1;
+ } else {
+ $daysInTheFirstWeek = $firstDay - $FDOM;
+ $weeks = 0;
+ }
+ $daysInTheFirstWeek %= $this->getDaysInWeek();
+ return (int)(ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) /
+ $this->getDaysInWeek()) + $weeks);
+ }
+
+ /**
+ * Returns the number of the day of the week (0=sunday, 1=monday...)
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int weekday number
+ * @access protected
+ */
+ function getDayOfWeek($y, $m, $d)
+ {
+ $stamp = Calendar_Engine_UnixTS::dateToStamp($y,$m,$d);
+ $date = Calendar_Engine_UnixTS::stampCollection($stamp);
+ return $date[8];
+ }
+
+ /**
+ * Returns a list of integer days of the week beginning 0
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return array (0,1,2,3,4,5,6) 1 = Monday
+ * @access protected
+ */
+ function getWeekDays($y=NULL, $m=NULL, $d=NULL)
+ {
+ return array(0, 1, 2, 3, 4, 5, 6);
+ }
+
+ /**
+ * Returns the default first day of the week
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int (default 1 = Monday)
+ * @access protected
+ */
+ function getFirstDayOfWeek($y=NULL, $m=NULL, $d=NULL)
+ {
+ return 1;
+ }
+
+ /**
+ * Returns the number of hours in a day
+ * @return int (24)
+ * @access protected
+ */
+ function getHoursInDay($y=null,$m=null,$d=null)
+ {
+ return 24;
+ }
+
+ /**
+ * Returns the number of minutes in an hour
+ * @return int (60)
+ * @access protected
+ */
+ function getMinutesInHour($y=null,$m=null,$d=null,$h=null)
+ {
+ return 60;
+ }
+
+ /**
+ * Returns the number of seconds in a minutes
+ * @return int (60)
+ * @access protected
+ */
+ function getSecondsInMinute($y=null,$m=null,$d=null,$h=null,$i=null)
+ {
+ return 60;
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Engine/Interface.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Engine/Interface.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Engine/Interface.php (revision 20119)
@@ -0,0 +1,293 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: Interface.php,v 1.5 2004/08/16 12:29:18 hfuecks Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Interface.php,v 1.5 2004/08/16 12:29:18 hfuecks Exp $
+ */
+/**
+ * The methods the classes implementing the Calendar_Engine must implement.
+ * Note this class is not used but simply to help development
+ * @package Calendar
+ * @access protected
+ */
+class Calendar_Engine_Interface
+{
+ /**
+ * Provides a mechansim to make sure parsing of timestamps
+ * into human dates is only performed once per timestamp.
+ * Typically called "internally" by methods like stampToYear.
+ * Return value can vary, depending on the specific implementation
+ * @param int timestamp (depending on implementation)
+ * @return mixed
+ * @access protected
+ */
+ function stampCollection($stamp)
+ {
+ }
+
+ /**
+ * Returns a numeric year given a timestamp
+ * @param int timestamp (depending on implementation)
+ * @return int year (e.g. 2003)
+ * @access protected
+ */
+ function stampToYear($stamp)
+ {
+ }
+
+ /**
+ * Returns a numeric month given a timestamp
+ * @param int timestamp (depending on implementation)
+ * @return int month (e.g. 9)
+ * @access protected
+ */
+ function stampToMonth($stamp)
+ {
+ }
+
+ /**
+ * Returns a numeric day given a timestamp
+ * @param int timestamp (depending on implementation)
+ * @return int day (e.g. 15)
+ * @access protected
+ */
+ function stampToDay($stamp)
+ {
+ }
+
+ /**
+ * Returns a numeric hour given a timestamp
+ * @param int timestamp (depending on implementation)
+ * @return int hour (e.g. 13)
+ * @access protected
+ */
+ function stampToHour($stamp)
+ {
+ }
+
+ /**
+ * Returns a numeric minute given a timestamp
+ * @param int timestamp (depending on implementation)
+ * @return int minute (e.g. 34)
+ * @access protected
+ */
+ function stampToMinute($stamp)
+ {
+ }
+
+ /**
+ * Returns a numeric second given a timestamp
+ * @param int timestamp (depending on implementation)
+ * @return int second (e.g. 51)
+ * @access protected
+ */
+ function stampToSecond($stamp)
+ {
+ }
+
+ /**
+ * Returns a timestamp. Can be worth "caching" generated
+ * timestamps in a static variable, identified by the
+ * params this method accepts, to timestamp will only
+ * be calculated once.
+ * @param int year (e.g. 2003)
+ * @param int month (e.g. 9)
+ * @param int day (e.g. 13)
+ * @param int hour (e.g. 13)
+ * @param int minute (e.g. 34)
+ * @param int second (e.g. 53)
+ * @return int (depends on implementation)
+ * @access protected
+ */
+ function dateToStamp($y,$m,$d,$h,$i,$s)
+ {
+ }
+
+ /**
+ * The upper limit on years that the Calendar Engine can work with
+ * @return int (e.g. 2037)
+ * @access protected
+ */
+ function getMaxYears()
+ {
+ }
+
+ /**
+ * The lower limit on years that the Calendar Engine can work with
+ * @return int (e.g 1902)
+ * @access protected
+ */
+ function getMinYears()
+ {
+ }
+
+ /**
+ * Returns the number of months in a year
+ * @param int (optional) year to get months for
+ * @return int (e.g. 12)
+ * @access protected
+ */
+ function getMonthsInYear($y=null)
+ {
+ }
+
+ /**
+ * Returns the number of days in a month, given year and month
+ * @param int year (e.g. 2003)
+ * @param int month (e.g. 9)
+ * @return int days in month
+ * @access protected
+ */
+ function getDaysInMonth($y, $m)
+ {
+ }
+
+ /**
+ * Returns numeric representation of the day of the week in a month,
+ * given year and month
+ * @param int year (e.g. 2003)
+ * @param int month (e.g. 9)
+ * @return int
+ * @access protected
+ */
+ function getFirstDayInMonth ($y, $m)
+ {
+ }
+
+ /**
+ * Returns the number of days in a week
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int (e.g. 7)
+ * @access protected
+ */
+ function getDaysInWeek($y=NULL, $m=NULL, $d=NULL)
+ {
+ }
+
+ /**
+ * Returns the number of the week in the year (ISO-8601), given a date
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int week number
+ * @access protected
+ */
+ function getWeekNInYear($y, $m, $d)
+ {
+ }
+
+ /**
+ * Returns the number of the week in the month, given a date
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @param int first day of the week (default: 1 - monday)
+ * @return int week number
+ * @access protected
+ */
+ function getWeekNInMonth($y, $m, $d, $firstDay=1)
+ {
+ }
+
+ /**
+ * Returns the number of weeks in the month
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int first day of the week (default: 1 - monday)
+ * @return int weeks number
+ * @access protected
+ */
+ function getWeeksInMonth($y, $m)
+ {
+ }
+
+ /**
+ * Returns the number of the day of the week (0=sunday, 1=monday...)
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int weekday number
+ * @access protected
+ */
+ function getDayOfWeek($y, $m, $d)
+ {
+ }
+
+ /**
+ * Returns the numeric values of the days of the week.
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return array list of numeric values of days in week, beginning 0
+ * @access protected
+ */
+ function getWeekDays($y=NULL, $m=NULL, $d=NULL)
+ {
+ }
+
+ /**
+ * Returns the default first day of the week as an integer. Must be a
+ * member of the array returned from getWeekDays
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int (e.g. 1 for Monday)
+ * @see getWeekDays
+ * @access protected
+ */
+ function getFirstDayOfWeek($y=NULL, $m=NULL, $d=NULL)
+ {
+ }
+
+ /**
+ * Returns the number of hours in a day
+ * @param int (optional) day to get hours for
+ * @return int (e.g. 24)
+ * @access protected
+ */
+ function getHoursInDay($y=null,$m=null,$d=null)
+ {
+ }
+
+ /**
+ * Returns the number of minutes in an hour
+ * @param int (optional) hour to get minutes for
+ * @return int
+ * @access protected
+ */
+ function getMinutesInHour($y=null,$m=null,$d=null,$h=null)
+ {
+ }
+
+ /**
+ * Returns the number of seconds in a minutes
+ * @param int (optional) minute to get seconds for
+ * @return int
+ * @access protected
+ */
+ function getSecondsInMinute($y=null,$m=null,$d=null,$h=null,$i=null)
+ {
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Engine/PearDate.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Engine/PearDate.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Engine/PearDate.php (revision 20119)
@@ -0,0 +1,407 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: PearDate.php,v 1.8 2004/08/20 20:00:55 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: PearDate.php,v 1.8 2004/08/20 20:00:55 quipo Exp $
+ */
+/**
+ * Load PEAR::Date class
+ */
+require_once 'Date.php';
+
+/**
+ * Performs calendar calculations based on the PEAR::Date class
+ * Timestamps are in the ISO-8601 format (YYYY-MM-DD HH:MM:SS)
+ * @package Calendar
+ * @access protected
+ */
+class Calendar_Engine_PearDate /* implements Calendar_Engine_Interface */
+{
+ /**
+ * Makes sure a given timestamp is only ever parsed once
+ * Uses a static variable to prevent date() being used twice
+ * for a date which is already known
+ * @param mixed Any timestamp format recognized by Pear::Date
+ * @return object Pear::Date object
+ * @access protected
+ */
+ function stampCollection($stamp)
+ {
+ static $stamps = array();
+ if (!isset($stamps[$stamp])) {
+ $stamps[$stamp] = new Date($stamp);
+ }
+ return $stamps[$stamp];
+ }
+
+ /**
+ * Returns a numeric year given a iso-8601 datetime
+ * @param string iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
+ * @return int year (e.g. 2003)
+ * @access protected
+ */
+ function stampToYear($stamp)
+ {
+ $date = Calendar_Engine_PearDate::stampCollection($stamp);
+ return (int)$date->year;
+ }
+
+ /**
+ * Returns a numeric month given a iso-8601 datetime
+ * @param string iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
+ * @return int month (e.g. 9)
+ * @access protected
+ */
+ function stampToMonth($stamp)
+ {
+ $date = Calendar_Engine_PearDate::stampCollection($stamp);
+ return (int)$date->month;
+ }
+
+ /**
+ * Returns a numeric day given a iso-8601 datetime
+ * @param string iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
+ * @return int day (e.g. 15)
+ * @access protected
+ */
+ function stampToDay($stamp)
+ {
+ $date = Calendar_Engine_PearDate::stampCollection($stamp);
+ return (int)$date->day;
+ }
+
+ /**
+ * Returns a numeric hour given a iso-8601 datetime
+ * @param string iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
+ * @return int hour (e.g. 13)
+ * @access protected
+ */
+ function stampToHour($stamp)
+ {
+ $date = Calendar_Engine_PearDate::stampCollection($stamp);
+ return (int)$date->hour;
+ }
+
+ /**
+ * Returns a numeric minute given a iso-8601 datetime
+ * @param string iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
+ * @return int minute (e.g. 34)
+ * @access protected
+ */
+ function stampToMinute($stamp)
+ {
+ $date = Calendar_Engine_PearDate::stampCollection($stamp);
+ return (int)$date->minute;
+ }
+
+ /**
+ * Returns a numeric second given a iso-8601 datetime
+ * @param string iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
+ * @return int second (e.g. 51)
+ * @access protected
+ */
+ function stampToSecond($stamp)
+ {
+ $date = Calendar_Engine_PearDate::stampCollection($stamp);
+ return (int)$date->second;
+ }
+
+ /**
+ * Returns a iso-8601 datetime
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (13)
+ * @param int hour (13)
+ * @param int minute (34)
+ * @param int second (53)
+ * @return string iso-8601 datetime
+ * @access protected
+ */
+ function dateToStamp($y, $m, $d, $h=0, $i=0, $s=0)
+ {
+ $r = array();
+ Calendar_Engine_PearDate::adjustDate($y, $m, $d, $h, $i, $s);
+ $key = $y.$m.$d.$h.$i.$s;
+ if (!isset($r[$key])) {
+ $r[$key] = sprintf("%04d-%02d-%02d %02d:%02d:%02d",
+ $y, $m, $d, $h, $i, $s);
+ }
+ return $r[$key];
+ }
+
+ /**
+ * Set the correct date values (useful for math operations on dates)
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (13)
+ * @param int hour (13)
+ * @param int minute (34)
+ * @param int second (53)
+ * @access protected
+ */
+ function adjustDate(&$y, &$m, &$d, &$h, &$i, &$s)
+ {
+ if ($s < 0) {
+ $m -= floor($s / 60);
+ $s = -$s % 60;
+ }
+ if ($s > 60) {
+ $m += floor($s / 60);
+ $s %= 60;
+ }
+ if ($i < 0) {
+ $h -= floor($i / 60);
+ $i = -$i % 60;
+ }
+ if ($i > 60) {
+ $h += floor($i / 60);
+ $i %= 60;
+ }
+ if ($h < 0) {
+ $d -= floor($h / 24);
+ $h = -$h % 24;
+ }
+ if ($h > 24) {
+ $d += floor($h / 24);
+ $h %= 24;
+ }
+ for(; $m < 1; $y--, $m+=12);
+ for(; $m > 12; $y++, $m-=12);
+
+ while ($d < 1) {
+ if ($m > 1) {
+ $m--;
+ } else {
+ $m = 12;
+ $y--;
+ }
+ $d += Date_Calc::daysInMonth($m, $y);
+ }
+ for ($max_days = Date_Calc::daysInMonth($m, $y); $d > $max_days; ) {
+ $d -= $max_days;
+ if ($m < 12) {
+ $m++;
+ } else {
+ $m = 1;
+ $y++;
+ }
+ }
+ }
+
+ /**
+ * The upper limit on years that the Calendar Engine can work with
+ * @return int 9999
+ * @access protected
+ */
+ function getMaxYears()
+ {
+ return 9999;
+ }
+
+ /**
+ * The lower limit on years that the Calendar Engine can work with
+ * @return int 0
+ * @access protected
+ */
+ function getMinYears()
+ {
+ return 0;
+ }
+
+ /**
+ * Returns the number of months in a year
+ * @return int (12)
+ * @access protected
+ */
+ function getMonthsInYear($y=null)
+ {
+ return 12;
+ }
+
+ /**
+ * Returns the number of days in a month, given year and month
+ * @param int year (2003)
+ * @param int month (9)
+ * @return int days in month
+ * @access protected
+ */
+ function getDaysInMonth($y, $m)
+ {
+ return (int)Date_Calc::daysInMonth($m, $y);
+ }
+
+ /**
+ * Returns numeric representation of the day of the week in a month,
+ * given year and month
+ * @param int year (2003)
+ * @param int month (9)
+ * @return int from 0 to 7
+ * @access protected
+ */
+ function getFirstDayInMonth($y, $m)
+ {
+ return (int)Date_Calc::dayOfWeek(1, $m, $y);
+ }
+
+ /**
+ * Returns the number of days in a week
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int (7)
+ * @access protected
+ */
+ function getDaysInWeek($y=NULL, $m=NULL, $d=NULL)
+ {
+ return 7;
+ }
+
+ /**
+ * Returns the number of the week in the year (ISO-8601), given a date
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int week number
+ * @access protected
+ */
+ function getWeekNInYear($y, $m, $d)
+ {
+ return Date_Calc::weekOfYear($d, $m, $y); //beware, Date_Calc doesn't follow ISO-8601 standard!
+ }
+
+ /**
+ * Returns the number of the week in the month, given a date
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @param int first day of the week (default: monday)
+ * @return int week number
+ * @access protected
+ */
+ function getWeekNInMonth($y, $m, $d, $firstDay=1)
+ {
+ $weekEnd = ($firstDay == 0) ? $this->getDaysInWeek()-1 : $firstDay-1;
+ $end_of_week = (int)Date_Calc::nextDayOfWeek($weekEnd, 1, $m, $y, '%e', true);
+ $w = 1;
+ while ($d > $end_of_week) {
+ ++$w;
+ $end_of_week += $this->getDaysInWeek();
+ }
+ return $w;
+ }
+
+ /**
+ * Returns the number of weeks in the month
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int first day of the week (default: monday)
+ * @return int weeks number
+ * @access protected
+ */
+ function getWeeksInMonth($y, $m, $firstDay=1)
+ {
+ $FDOM = Date_Calc::firstOfMonthWeekday($m, $y);
+ if ($FDOM == 0) {
+ $FDOM = $this->getDaysInWeek();
+ }
+ if ($FDOM > $firstDay) {
+ $daysInTheFirstWeek = $this->getDaysInWeek() - $FDOM + $firstDay;
+ $weeks = 1;
+ } else {
+ $daysInTheFirstWeek = $firstDay - $FDOM;
+ $weeks = 0;
+ }
+ $daysInTheFirstWeek %= $this->getDaysInWeek();
+ return (int)(ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) /
+ $this->getDaysInWeek()) + $weeks);
+ }
+
+ /**
+ * Returns the number of the day of the week (0=sunday, 1=monday...)
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int weekday number
+ * @access protected
+ */
+ function getDayOfWeek($y, $m, $d)
+ {
+ return Date_Calc::dayOfWeek($d, $m, $y);
+ }
+
+ /**
+ * Returns a list of integer days of the week beginning 0
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return array (0, 1, 2, 3, 4, 5, 6) 1 = Monday
+ * @access protected
+ */
+ function getWeekDays($y=NULL, $m=NULL, $d=NULL)
+ {
+ return array(0, 1, 2, 3, 4, 5, 6);
+ }
+
+ /**
+ * Returns the default first day of the week
+ * @param int year (2003)
+ * @param int month (9)
+ * @param int day (4)
+ * @return int (default 1 = Monday)
+ * @access protected
+ */
+ function getFirstDayOfWeek($y=NULL, $m=NULL, $d=NULL)
+ {
+ return 1;
+ }
+
+ /**
+ * Returns the number of hours in a day
+ * @return int (24)
+ * @access protected
+ */
+ function getHoursInDay($y=null,$m=null,$d=null)
+ {
+ return 24;
+ }
+
+ /**
+ * Returns the number of minutes in an hour
+ * @return int (60)
+ * @access protected
+ */
+ function getMinutesInHour($y=null,$m=null,$d=null,$h=null)
+ {
+ return 60;
+ }
+
+ /**
+ * Returns the number of seconds in a minutes
+ * @return int (60)
+ * @access protected
+ */
+ function getSecondsInMinute($y=null,$m=null,$d=null,$h=null,$i=null)
+ {
+ return 60;
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/Calendar/Decorator.php
===================================================================
--- /closed/version-2_5-dev/data/module/Calendar/Decorator.php (revision 20119)
+++ /closed/version-2_5-dev/data/module/Calendar/Decorator.php (revision 20119)
@@ -0,0 +1,558 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: Decorator.php,v 1.3 2005/10/22 10:29:46 quipo Exp $
+//
+/**
+ * @package Calendar
+ * @version $Id: Decorator.php,v 1.3 2005/10/22 10:29:46 quipo Exp $
+ */
+/**
+ * Decorates any calendar class.
+ * Create a subclass of this class for your own "decoration".
+ * Used for "selections"
+ *
+ * class DayDecorator extends Calendar_Decorator
+ * {
+ * function thisDay($format = 'int')
+ * {
+.* $day = parent::thisDay('timestamp');
+.* return date('D', $day);
+ * }
+ * }
+ * $Day = & new Calendar_Day(2003, 10, 25);
+ * $DayDecorator = & new DayDecorator($Day);
+ * echo $DayDecorator->thisDay(); // Outputs "Sat"
+ *
+ * @abstract
+ * @package Calendar
+ */
+class Calendar_Decorator
+{
+ /**
+ * Subclass of Calendar being decorated
+ * @var object
+ * @access private
+ */
+ var $calendar;
+
+ /**
+ * Constructs the Calendar_Decorator
+ * @param object subclass to Calendar to decorate
+ */
+ function Calendar_Decorator(& $calendar)
+ {
+ $this->calendar = & $calendar;
+ }
+
+ /**
+ * Defines the calendar by a Unix timestamp, replacing values
+ * passed to the constructor
+ * @param int Unix timestamp
+ * @return void
+ * @access public
+ */
+ function setTimestamp($ts)
+ {
+ $this->calendar->setTimestamp($ts);
+ }
+
+ /**
+ * Returns a timestamp from the current date / time values. Format of
+ * timestamp depends on Calendar_Engine implementation being used
+ * @return int timestamp
+ * @access public
+ */
+ function getTimestamp()
+ {
+ return $this->calendar->getTimeStamp();
+ }
+
+ /**
+ * Defines calendar object as selected (e.g. for today)
+ * @param boolean state whether Calendar subclass
+ * @return void
+ * @access public
+ */
+ function setSelected($state = true)
+ {
+ $this->calendar->setSelected($state = true);
+ }
+
+ /**
+ * True if the calendar subclass object is selected (e.g. today)
+ * @return boolean
+ * @access public
+ */
+ function isSelected()
+ {
+ return $this->calendar->isSelected();
+ }
+
+ /**
+ * Adjusts the date (helper method)
+ * @return void
+ * @access public
+ */
+ function adjust()
+ {
+ $this->calendar->adjust();
+ }
+
+ /**
+ * Returns the date as an associative array (helper method)
+ * @param mixed timestamp (leave empty for current timestamp)
+ * @return array
+ * @access public
+ */
+ function toArray($stamp=null)
+ {
+ return $this->calendar->toArray($stamp);
+ }
+
+ /**
+ * Returns the value as an associative array (helper method)
+ * @param string type of date object that return value represents
+ * @param string $format ['int' | 'array' | 'timestamp' | 'object']
+ * @param mixed timestamp (depending on Calendar engine being used)
+ * @param int integer default value (i.e. give me the answer quick)
+ * @return mixed
+ * @access private
+ */
+ function returnValue($returnType, $format, $stamp, $default)
+ {
+ return $this->calendar->returnValue($returnType, $format, $stamp, $default);
+ }
+
+ /**
+ * Defines Day object as first in a week
+ * Only used by Calendar_Month_Weekdays::build()
+ * @param boolean state
+ * @return void
+ * @access private
+ */
+ function setFirst ($state = true)
+ {
+ if ( method_exists($this->calendar,'setFirst') ) {
+ $this->calendar->setFirst($state);
+ }
+ }
+
+ /**
+ * Defines Day object as last in a week
+ * Used only following Calendar_Month_Weekdays::build()
+ * @param boolean state
+ * @return void
+ * @access private
+ */
+ function setLast($state = true)
+ {
+ if ( method_exists($this->calendar,'setLast') ) {
+ $this->calendar->setLast($state);
+ }
+ }
+
+ /**
+ * Returns true if Day object is first in a Week
+ * Only relevant when Day is created by Calendar_Month_Weekdays::build()
+ * @return boolean
+ * @access public
+ */
+ function isFirst() {
+ if ( method_exists($this->calendar,'isFirst') ) {
+ return $this->calendar->isFirst();
+ }
+ }
+
+ /**
+ * Returns true if Day object is last in a Week
+ * Only relevant when Day is created by Calendar_Month_Weekdays::build()
+ * @return boolean
+ * @access public
+ */
+ function isLast()
+ {
+ if ( method_exists($this->calendar,'isLast') ) {
+ return $this->calendar->isLast();
+ }
+ }
+
+ /**
+ * Defines Day object as empty
+ * Only used by Calendar_Month_Weekdays::build()
+ * @param boolean state
+ * @return void
+ * @access private
+ */
+ function setEmpty ($state = true)
+ {
+ if ( method_exists($this->calendar,'setEmpty') ) {
+ $this->calendar->setEmpty($state);
+ }
+ }
+
+ /**
+ * @return boolean
+ * @access public
+ */
+ function isEmpty()
+ {
+ if ( method_exists($this->calendar,'isEmpty') ) {
+ return $this->calendar->isEmpty();
+ }
+ }
+
+ /**
+ * Build the children
+ * @param array containing Calendar objects to select (optional)
+ * @return boolean
+ * @access public
+ * @abstract
+ */
+ function build($sDates = array())
+ {
+ $this->calendar->build($sDates);
+ }
+
+ /**
+ * Iterator method for fetching child Calendar subclass objects
+ * (e.g. a minute from an hour object). On reaching the end of
+ * the collection, returns false and resets the collection for
+ * further iteratations.
+ * @return mixed either an object subclass of Calendar or false
+ * @access public
+ */
+ function fetch()
+ {
+ return $this->calendar->fetch();
+ }
+
+ /**
+ * Fetches all child from the current collection of children
+ * @return array
+ * @access public
+ */
+ function fetchAll()
+ {
+ return $this->calendar->fetchAll();
+ }
+
+ /**
+ * Get the number Calendar subclass objects stored in the internal
+ * collection.
+ * @return int
+ * @access public
+ */
+ function size()
+ {
+ return $this->calendar->size();
+ }
+
+ /**
+ * Determine whether this date is valid, with the bounds determined by
+ * the Calendar_Engine. The call is passed on to
+ * Calendar_Validator::isValid
+ * @return boolean
+ * @access public
+ */
+ function isValid()
+ {
+ return $this->calendar->isValid();
+ }
+
+ /**
+ * Returns an instance of Calendar_Validator
+ * @return Calendar_Validator
+ * @access public
+ */
+ function & getValidator()
+ {
+ $validator = $this->calendar->getValidator();
+ return $validator;
+ }
+
+ /**
+ * Returns a reference to the current Calendar_Engine being used. Useful
+ * for Calendar_Table_Helper and Calendar_Validator
+ * @return object implementing Calendar_Engine_Inteface
+ * @access private
+ */
+ function & getEngine()
+ {
+ return $this->calendar->getEngine();
+ }
+
+ /**
+ * Returns the value for the previous year
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 2002 or timestamp
+ * @access public
+ */
+ function prevYear($format = 'int')
+ {
+ return $this->calendar->prevYear($format);
+ }
+
+ /**
+ * Returns the value for this year
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 2003 or timestamp
+ * @access public
+ */
+ function thisYear($format = 'int')
+ {
+ return $this->calendar->thisYear($format);
+ }
+
+ /**
+ * Returns the value for next year
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 2004 or timestamp
+ * @access public
+ */
+ function nextYear($format = 'int')
+ {
+ return $this->calendar->nextYear($format);
+ }
+
+ /**
+ * Returns the value for the previous month
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 4 or Unix timestamp
+ * @access public
+ */
+ function prevMonth($format = 'int')
+ {
+ return $this->calendar->prevMonth($format);
+ }
+
+ /**
+ * Returns the value for this month
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 5 or timestamp
+ * @access public
+ */
+ function thisMonth($format = 'int')
+ {
+ return $this->calendar->thisMonth($format);
+ }
+
+ /**
+ * Returns the value for next month
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 6 or timestamp
+ * @access public
+ */
+ function nextMonth($format = 'int')
+ {
+ return $this->calendar->nextMonth($format);
+ }
+
+ /**
+ * Returns the value for the previous week
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 4 or Unix timestamp
+ * @access public
+ */
+ function prevWeek($format = 'n_in_month')
+ {
+ if ( method_exists($this->calendar,'prevWeek') ) {
+ return $this->calendar->prevWeek($format);
+ } else {
+ require_once 'PEAR.php';
+ PEAR::raiseError(
+ 'Cannot call prevWeek on Calendar object of type: '.
+ get_class($this->calendar), 133, PEAR_ERROR_TRIGGER,
+ E_USER_NOTICE, 'Calendar_Decorator::prevWeek()');
+ return false;
+ }
+ }
+
+ /**
+ * Returns the value for this week
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 5 or timestamp
+ * @access public
+ */
+ function thisWeek($format = 'n_in_month')
+ {
+ if ( method_exists($this->calendar,'thisWeek') ) {
+ return $this->calendar->thisWeek($format);
+ } else {
+ require_once 'PEAR.php';
+ PEAR::raiseError(
+ 'Cannot call thisWeek on Calendar object of type: '.
+ get_class($this->calendar), 133, PEAR_ERROR_TRIGGER,
+ E_USER_NOTICE, 'Calendar_Decorator::thisWeek()');
+ return false;
+ }
+ }
+
+ /**
+ * Returns the value for next week
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 6 or timestamp
+ * @access public
+ */
+ function nextWeek($format = 'n_in_month')
+ {
+ if ( method_exists($this->calendar,'nextWeek') ) {
+ return $this->calendar->nextWeek($format);
+ } else {
+ require_once 'PEAR.php';
+ PEAR::raiseError(
+ 'Cannot call thisWeek on Calendar object of type: '.
+ get_class($this->calendar), 133, PEAR_ERROR_TRIGGER,
+ E_USER_NOTICE, 'Calendar_Decorator::nextWeek()');
+ return false;
+ }
+ }
+
+ /**
+ * Returns the value for the previous day
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 10 or timestamp
+ * @access public
+ */
+ function prevDay($format = 'int') {
+ return $this->calendar->prevDay($format);
+ }
+
+ /**
+ * Returns the value for this day
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 11 or timestamp
+ * @access public
+ */
+ function thisDay($format = 'int')
+ {
+ return $this->calendar->thisDay($format);
+ }
+
+ /**
+ * Returns the value for the next day
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 12 or timestamp
+ * @access public
+ */
+ function nextDay($format = 'int')
+ {
+ return $this->calendar->nextDay($format);
+ }
+
+ /**
+ * Returns the value for the previous hour
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 13 or timestamp
+ * @access public
+ */
+ function prevHour($format = 'int')
+ {
+ return $this->calendar->prevHour($format);
+ }
+
+ /**
+ * Returns the value for this hour
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 14 or timestamp
+ * @access public
+ */
+ function thisHour($format = 'int')
+ {
+ return $this->calendar->thisHour($format);
+ }
+
+ /**
+ * Returns the value for the next hour
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 14 or timestamp
+ * @access public
+ */
+ function nextHour($format = 'int')
+ {
+ return $this->calendar->nextHour($format);
+ }
+
+ /**
+ * Returns the value for the previous minute
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 23 or timestamp
+ * @access public
+ */
+ function prevMinute($format = 'int')
+ {
+ return $this->calendar->prevMinute($format);
+ }
+
+ /**
+ * Returns the value for this minute
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 24 or timestamp
+ * @access public
+ */
+ function thisMinute($format = 'int')
+ {
+ return $this->calendar->thisMinute($format);
+ }
+
+ /**
+ * Returns the value for the next minute
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 25 or timestamp
+ * @access public
+ */
+ function nextMinute($format = 'int')
+ {
+ return $this->calendar->nextMinute($format);
+ }
+
+ /**
+ * Returns the value for the previous second
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 43 or timestamp
+ * @access public
+ */
+ function prevSecond($format = 'int')
+ {
+ return $this->calendar->prevSecond($format);
+ }
+
+ /**
+ * Returns the value for this second
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 44 or timestamp
+ * @access public
+ */
+ function thisSecond($format = 'int')
+ {
+ return $this->calendar->thisSecond($format);
+ }
+
+ /**
+ * Returns the value for the next second
+ * @param string return value format ['int' | 'timestamp' | 'object' | 'array']
+ * @return int e.g. 45 or timestamp
+ * @access public
+ */
+ function nextSecond($format = 'int')
+ {
+ return $this->calendar->nextSecond($format);
+ }
+}
+?>
Index: /closed/version-2_5-dev/data/module/MDB2.php
===================================================================
--- /closed/version-2_5-dev/data/module/MDB2.php (revision 20764)
+++ /closed/version-2_5-dev/data/module/MDB2.php (revision 20764)
@@ -0,0 +1,4358 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2.php,v 1.335 2008/11/29 14:57:01 afz Exp $
+//
+
+/**
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith
+ */
+
+require_once 'PEAR.php';
+
+// {{{ Error constants
+
+/**
+ * The method mapErrorCode in each MDB2_dbtype implementation maps
+ * native error codes to one of these.
+ *
+ * If you add an error code here, make sure you also add a textual
+ * version of it in MDB2::errorMessage().
+ */
+
+define('MDB2_OK', true);
+define('MDB2_ERROR', -1);
+define('MDB2_ERROR_SYNTAX', -2);
+define('MDB2_ERROR_CONSTRAINT', -3);
+define('MDB2_ERROR_NOT_FOUND', -4);
+define('MDB2_ERROR_ALREADY_EXISTS', -5);
+define('MDB2_ERROR_UNSUPPORTED', -6);
+define('MDB2_ERROR_MISMATCH', -7);
+define('MDB2_ERROR_INVALID', -8);
+define('MDB2_ERROR_NOT_CAPABLE', -9);
+define('MDB2_ERROR_TRUNCATED', -10);
+define('MDB2_ERROR_INVALID_NUMBER', -11);
+define('MDB2_ERROR_INVALID_DATE', -12);
+define('MDB2_ERROR_DIVZERO', -13);
+define('MDB2_ERROR_NODBSELECTED', -14);
+define('MDB2_ERROR_CANNOT_CREATE', -15);
+define('MDB2_ERROR_CANNOT_DELETE', -16);
+define('MDB2_ERROR_CANNOT_DROP', -17);
+define('MDB2_ERROR_NOSUCHTABLE', -18);
+define('MDB2_ERROR_NOSUCHFIELD', -19);
+define('MDB2_ERROR_NEED_MORE_DATA', -20);
+define('MDB2_ERROR_NOT_LOCKED', -21);
+define('MDB2_ERROR_VALUE_COUNT_ON_ROW', -22);
+define('MDB2_ERROR_INVALID_DSN', -23);
+define('MDB2_ERROR_CONNECT_FAILED', -24);
+define('MDB2_ERROR_EXTENSION_NOT_FOUND',-25);
+define('MDB2_ERROR_NOSUCHDB', -26);
+define('MDB2_ERROR_ACCESS_VIOLATION', -27);
+define('MDB2_ERROR_CANNOT_REPLACE', -28);
+define('MDB2_ERROR_CONSTRAINT_NOT_NULL',-29);
+define('MDB2_ERROR_DEADLOCK', -30);
+define('MDB2_ERROR_CANNOT_ALTER', -31);
+define('MDB2_ERROR_MANAGER', -32);
+define('MDB2_ERROR_MANAGER_PARSE', -33);
+define('MDB2_ERROR_LOADMODULE', -34);
+define('MDB2_ERROR_INSUFFICIENT_DATA', -35);
+define('MDB2_ERROR_NO_PERMISSION', -36);
+define('MDB2_ERROR_DISCONNECT_FAILED', -37);
+
+// }}}
+// {{{ Verbose constants
+/**
+ * These are just helper constants to more verbosely express parameters to prepare()
+ */
+
+define('MDB2_PREPARE_MANIP', false);
+define('MDB2_PREPARE_RESULT', null);
+
+// }}}
+// {{{ Fetchmode constants
+
+/**
+ * This is a special constant that tells MDB2 the user hasn't specified
+ * any particular get mode, so the default should be used.
+ */
+define('MDB2_FETCHMODE_DEFAULT', 0);
+
+/**
+ * Column data indexed by numbers, ordered from 0 and up
+ */
+define('MDB2_FETCHMODE_ORDERED', 1);
+
+/**
+ * Column data indexed by column names
+ */
+define('MDB2_FETCHMODE_ASSOC', 2);
+
+/**
+ * Column data as object properties
+ */
+define('MDB2_FETCHMODE_OBJECT', 3);
+
+/**
+ * For multi-dimensional results: normally the first level of arrays
+ * is the row number, and the second level indexed by column number or name.
+ * MDB2_FETCHMODE_FLIPPED switches this order, so the first level of arrays
+ * is the column name, and the second level the row number.
+ */
+define('MDB2_FETCHMODE_FLIPPED', 4);
+
+// }}}
+// {{{ Portability mode constants
+
+/**
+ * Portability: turn off all portability features.
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_NONE', 0);
+
+/**
+ * Portability: convert names of tables and fields to case defined in the
+ * "field_case" option when using the query*(), fetch*() and tableInfo() methods.
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_FIX_CASE', 1);
+
+/**
+ * Portability: right trim the data output by query*() and fetch*().
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_RTRIM', 2);
+
+/**
+ * Portability: force reporting the number of rows deleted.
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_DELETE_COUNT', 4);
+
+/**
+ * Portability: not needed in MDB2 (just left here for compatibility to DB)
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_NUMROWS', 8);
+
+/**
+ * Portability: makes certain error messages in certain drivers compatible
+ * with those from other DBMS's.
+ *
+ * + mysql, mysqli: change unique/primary key constraints
+ * MDB2_ERROR_ALREADY_EXISTS -> MDB2_ERROR_CONSTRAINT
+ *
+ * + odbc(access): MS's ODBC driver reports 'no such field' as code
+ * 07001, which means 'too few parameters.' When this option is on
+ * that code gets mapped to MDB2_ERROR_NOSUCHFIELD.
+ *
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_ERRORS', 16);
+
+/**
+ * Portability: convert empty values to null strings in data output by
+ * query*() and fetch*().
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_EMPTY_TO_NULL', 32);
+
+/**
+ * Portability: removes database/table qualifiers from associative indexes
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES', 64);
+
+/**
+ * Portability: turn on all portability features.
+ * @see MDB2_Driver_Common::setOption()
+ */
+define('MDB2_PORTABILITY_ALL', 127);
+
+// }}}
+// {{{ Globals for class instance tracking
+
+/**
+ * These are global variables that are used to track the various class instances
+ */
+
+$GLOBALS['_MDB2_databases'] = array();
+$GLOBALS['_MDB2_dsninfo_default'] = array(
+ 'phptype' => false,
+ 'dbsyntax' => false,
+ 'username' => false,
+ 'password' => false,
+ 'protocol' => false,
+ 'hostspec' => false,
+ 'port' => false,
+ 'socket' => false,
+ 'database' => false,
+ 'mode' => false,
+);
+
+// }}}
+// {{{ class MDB2
+
+/**
+ * The main 'MDB2' class is simply a container class with some static
+ * methods for creating DB objects as well as some utility functions
+ * common to all parts of DB.
+ *
+ * The object model of MDB2 is as follows (indentation means inheritance):
+ *
+ * MDB2 The main MDB2 class. This is simply a utility class
+ * with some 'static' methods for creating MDB2 objects as
+ * well as common utility functions for other MDB2 classes.
+ *
+ * MDB2_Driver_Common The base for each MDB2 implementation. Provides default
+ * | implementations (in OO lingo virtual methods) for
+ * | the actual DB implementations as well as a bunch of
+ * | query utility functions.
+ * |
+ * +-MDB2_Driver_mysql The MDB2 implementation for MySQL. Inherits MDB2_Driver_Common.
+ * When calling MDB2::factory or MDB2::connect for MySQL
+ * connections, the object returned is an instance of this
+ * class.
+ * +-MDB2_Driver_pgsql The MDB2 implementation for PostGreSQL. Inherits MDB2_Driver_Common.
+ * When calling MDB2::factory or MDB2::connect for PostGreSQL
+ * connections, the object returned is an instance of this
+ * class.
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith
+ */
+class MDB2
+{
+ // {{{ function setOptions(&$db, $options)
+
+ /**
+ * set option array in an exiting database object
+ *
+ * @param MDB2_Driver_Common MDB2 object
+ * @param array An associative array of option names and their values.
+ *
+ * @return mixed MDB2_OK or a PEAR Error object
+ *
+ * @access public
+ */
+ function setOptions(&$db, $options)
+ {
+ if (is_array($options)) {
+ foreach ($options as $option => $value) {
+ $test = $db->setOption($option, $value);
+ if (PEAR::isError($test)) {
+ return $test;
+ }
+ }
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function classExists($classname)
+
+ /**
+ * Checks if a class exists without triggering __autoload
+ *
+ * @param string classname
+ *
+ * @return bool true success and false on error
+ * @static
+ * @access public
+ */
+ function classExists($classname)
+ {
+ if (version_compare(phpversion(), "5.0", ">=")) {
+ return class_exists($classname, false);
+ }
+ return class_exists($classname);
+ }
+
+ // }}}
+ // {{{ function loadClass($class_name, $debug)
+
+ /**
+ * Loads a PEAR class.
+ *
+ * @param string classname to load
+ * @param bool if errors should be suppressed
+ *
+ * @return mixed true success or PEAR_Error on failure
+ *
+ * @access public
+ */
+ function loadClass($class_name, $debug)
+ {
+ if (!MDB2::classExists($class_name)) {
+ $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
+ if ($debug) {
+ $include = include_once($file_name);
+ } else {
+ $include = @include_once($file_name);
+ }
+ if (!$include) {
+ if (!MDB2::fileExists($file_name)) {
+ $msg = "unable to find package '$class_name' file '$file_name'";
+ } else {
+ $msg = "unable to load class '$class_name' from file '$file_name'";
+ }
+ $err =& MDB2::raiseError(MDB2_ERROR_NOT_FOUND, null, null, $msg);
+ return $err;
+ }
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function &factory($dsn, $options = false)
+
+ /**
+ * Create a new MDB2 object for the specified database type
+ *
+ * IMPORTANT: In order for MDB2 to work properly it is necessary that
+ * you make sure that you work with a reference of the original
+ * object instead of a copy (this is a PHP4 quirk).
+ *
+ * For example:
+ * $db =& MDB2::factory($dsn);
+ * ^^
+ * And not:
+ * $db = MDB2::factory($dsn);
+ *
+ * @param mixed 'data source name', see the MDB2::parseDSN
+ * method for a description of the dsn format.
+ * Can also be specified as an array of the
+ * format returned by MDB2::parseDSN.
+ * @param array An associative array of option names and
+ * their values.
+ *
+ * @return mixed a newly created MDB2 object, or false on error
+ *
+ * @access public
+ */
+ function &factory($dsn, $options = false)
+ {
+ $dsninfo = MDB2::parseDSN($dsn);
+ if (empty($dsninfo['phptype'])) {
+ $err =& MDB2::raiseError(MDB2_ERROR_NOT_FOUND,
+ null, null, 'no RDBMS driver specified');
+ return $err;
+ }
+ $class_name = 'MDB2_Driver_'.$dsninfo['phptype'];
+
+ $debug = (!empty($options['debug']));
+ $err = MDB2::loadClass($class_name, $debug);
+ if (PEAR::isError($err)) {
+ return $err;
+ }
+
+ $db =& new $class_name();
+ $db->setDSN($dsninfo);
+ $err = MDB2::setOptions($db, $options);
+ if (PEAR::isError($err)) {
+ return $err;
+ }
+
+ return $db;
+ }
+
+ // }}}
+ // {{{ function &connect($dsn, $options = false)
+
+ /**
+ * Create a new MDB2_Driver_* connection object and connect to the specified
+ * database
+ *
+ * IMPORTANT: In order for MDB2 to work properly it is necessary that
+ * you make sure that you work with a reference of the original
+ * object instead of a copy (this is a PHP4 quirk).
+ *
+ * For example:
+ * $db =& MDB2::connect($dsn);
+ * ^^
+ * And not:
+ * $db = MDB2::connect($dsn);
+ * ^^
+ *
+ * @param mixed $dsn 'data source name', see the MDB2::parseDSN
+ * method for a description of the dsn format.
+ * Can also be specified as an array of the
+ * format returned by MDB2::parseDSN.
+ * @param array $options An associative array of option names and
+ * their values.
+ *
+ * @return mixed a newly created MDB2 connection object, or a MDB2
+ * error object on error
+ *
+ * @access public
+ * @see MDB2::parseDSN
+ */
+ function &connect($dsn, $options = false)
+ {
+ $db =& MDB2::factory($dsn, $options);
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+
+ $err = $db->connect();
+ if (PEAR::isError($err)) {
+ $dsn = $db->getDSN('string', 'xxx');
+ $db->disconnect();
+ $err->addUserInfo($dsn);
+ return $err;
+ }
+
+ return $db;
+ }
+
+ // }}}
+ // {{{ function &singleton($dsn = null, $options = false)
+
+ /**
+ * Returns a MDB2 connection with the requested DSN.
+ * A new MDB2 connection object is only created if no object with the
+ * requested DSN exists yet.
+ *
+ * IMPORTANT: In order for MDB2 to work properly it is necessary that
+ * you make sure that you work with a reference of the original
+ * object instead of a copy (this is a PHP4 quirk).
+ *
+ * For example:
+ * $db =& MDB2::singleton($dsn);
+ * ^^
+ * And not:
+ * $db = MDB2::singleton($dsn);
+ * ^^
+ *
+ * @param mixed 'data source name', see the MDB2::parseDSN
+ * method for a description of the dsn format.
+ * Can also be specified as an array of the
+ * format returned by MDB2::parseDSN.
+ * @param array An associative array of option names and
+ * their values.
+ *
+ * @return mixed a newly created MDB2 connection object, or a MDB2
+ * error object on error
+ *
+ * @access public
+ * @see MDB2::parseDSN
+ */
+ function &singleton($dsn = null, $options = false)
+ {
+ if ($dsn) {
+ $dsninfo = MDB2::parseDSN($dsn);
+ $dsninfo = array_merge($GLOBALS['_MDB2_dsninfo_default'], $dsninfo);
+ $keys = array_keys($GLOBALS['_MDB2_databases']);
+ for ($i=0, $j=count($keys); $i<$j; ++$i) {
+ if (isset($GLOBALS['_MDB2_databases'][$keys[$i]])) {
+ $tmp_dsn = $GLOBALS['_MDB2_databases'][$keys[$i]]->getDSN('array');
+ if (count(array_diff_assoc($tmp_dsn, $dsninfo)) == 0) {
+ MDB2::setOptions($GLOBALS['_MDB2_databases'][$keys[$i]], $options);
+ return $GLOBALS['_MDB2_databases'][$keys[$i]];
+ }
+ }
+ }
+ } elseif (is_array($GLOBALS['_MDB2_databases']) && reset($GLOBALS['_MDB2_databases'])) {
+ $db =& $GLOBALS['_MDB2_databases'][key($GLOBALS['_MDB2_databases'])];
+ return $db;
+ }
+ $db =& MDB2::factory($dsn, $options);
+ return $db;
+ }
+
+ // }}}
+ // {{{ function areEquals()
+
+ /**
+ * It looks like there's a memory leak in array_diff() in PHP 5.1.x,
+ * so use this method instead.
+ * @see http://pear.php.net/bugs/bug.php?id=11790
+ *
+ * @param array $arr1
+ * @param array $arr2
+ * @return boolean
+ */
+ function areEquals($arr1, $arr2)
+ {
+ if (count($arr1) != count($arr2)) {
+ return false;
+ }
+ foreach (array_keys($arr1) as $k) {
+ if (!array_key_exists($k, $arr2) || $arr1[$k] != $arr2[$k]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ // }}}
+ // {{{ function loadFile($file)
+
+ /**
+ * load a file (like 'Date')
+ *
+ * @param string name of the file in the MDB2 directory (without '.php')
+ *
+ * @return string name of the file that was included
+ *
+ * @access public
+ */
+ function loadFile($file)
+ {
+ $file_name = 'MDB2'.DIRECTORY_SEPARATOR.$file.'.php';
+ if (!MDB2::fileExists($file_name)) {
+ return MDB2::raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'unable to find: '.$file_name);
+ }
+ if (!include_once($file_name)) {
+ return MDB2::raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'unable to load driver class: '.$file_name);
+ }
+ return $file_name;
+ }
+
+ // }}}
+ // {{{ function apiVersion()
+
+ /**
+ * Return the MDB2 API version
+ *
+ * @return string the MDB2 API version number
+ *
+ * @access public
+ */
+ function apiVersion()
+ {
+ return '2.5.0b2';
+ }
+
+ // }}}
+ // {{{ function &raiseError($code = null, $mode = null, $options = null, $userinfo = null)
+
+ /**
+ * This method is used to communicate an error and invoke error
+ * callbacks etc. Basically a wrapper for PEAR::raiseError
+ * without the message string.
+ *
+ * @param mixed int error code
+ *
+ * @param int error mode, see PEAR_Error docs
+ *
+ * @param mixed If error mode is PEAR_ERROR_TRIGGER, this is the
+ * error level (E_USER_NOTICE etc). If error mode is
+ * PEAR_ERROR_CALLBACK, this is the callback function,
+ * either as a function name, or as an array of an
+ * object and method name. For other error modes this
+ * parameter is ignored.
+ *
+ * @param string Extra debug information. Defaults to the last
+ * query and native error code.
+ *
+ * @return PEAR_Error instance of a PEAR Error object
+ *
+ * @access private
+ * @see PEAR_Error
+ */
+ function &raiseError($code = null,
+ $mode = null,
+ $options = null,
+ $userinfo = null,
+ $dummy1 = null,
+ $dummy2 = null,
+ $dummy3 = false)
+ {
+ $err =& PEAR::raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
+ return $err;
+ }
+
+ // }}}
+ // {{{ function isError($data, $code = null)
+
+ /**
+ * Tell whether a value is a MDB2 error.
+ *
+ * @param mixed the value to test
+ * @param int if is an error object, return true
+ * only if $code is a string and
+ * $db->getMessage() == $code or
+ * $code is an integer and $db->getCode() == $code
+ *
+ * @return bool true if parameter is an error
+ *
+ * @access public
+ */
+ function isError($data, $code = null)
+ {
+ if (is_a($data, 'MDB2_Error')) {
+ if (is_null($code)) {
+ return true;
+ } elseif (is_string($code)) {
+ return $data->getMessage() === $code;
+ } else {
+ $code = (array)$code;
+ return in_array($data->getCode(), $code);
+ }
+ }
+ return false;
+ }
+
+ // }}}
+ // {{{ function isConnection($value)
+
+ /**
+ * Tell whether a value is a MDB2 connection
+ *
+ * @param mixed value to test
+ *
+ * @return bool whether $value is a MDB2 connection
+ *
+ * @access public
+ */
+ function isConnection($value)
+ {
+ return is_a($value, 'MDB2_Driver_Common');
+ }
+
+ // }}}
+ // {{{ function isResult($value)
+
+ /**
+ * Tell whether a value is a MDB2 result
+ *
+ * @param mixed value to test
+ *
+ * @return bool whether $value is a MDB2 result
+ *
+ * @access public
+ */
+ function isResult($value)
+ {
+ return is_a($value, 'MDB2_Result');
+ }
+
+ // }}}
+ // {{{ function isResultCommon($value)
+
+ /**
+ * Tell whether a value is a MDB2 result implementing the common interface
+ *
+ * @param mixed value to test
+ *
+ * @return bool whether $value is a MDB2 result implementing the common interface
+ *
+ * @access public
+ */
+ function isResultCommon($value)
+ {
+ return is_a($value, 'MDB2_Result_Common');
+ }
+
+ // }}}
+ // {{{ function isStatement($value)
+
+ /**
+ * Tell whether a value is a MDB2 statement interface
+ *
+ * @param mixed value to test
+ *
+ * @return bool whether $value is a MDB2 statement interface
+ *
+ * @access public
+ */
+ function isStatement($value)
+ {
+ return is_a($value, 'MDB2_Statement_Common');
+ }
+
+ // }}}
+ // {{{ function errorMessage($value = null)
+
+ /**
+ * Return a textual error message for a MDB2 error code
+ *
+ * @param int|array integer error code,
+ null to get the current error code-message map,
+ or an array with a new error code-message map
+ *
+ * @return string error message, or false if the error code was
+ * not recognized
+ *
+ * @access public
+ */
+ function errorMessage($value = null)
+ {
+ static $errorMessages;
+
+ if (is_array($value)) {
+ $errorMessages = $value;
+ return MDB2_OK;
+ }
+
+ if (!isset($errorMessages)) {
+ $errorMessages = array(
+ MDB2_OK => 'no error',
+ MDB2_ERROR => 'unknown error',
+ MDB2_ERROR_ALREADY_EXISTS => 'already exists',
+ MDB2_ERROR_CANNOT_CREATE => 'can not create',
+ MDB2_ERROR_CANNOT_ALTER => 'can not alter',
+ MDB2_ERROR_CANNOT_REPLACE => 'can not replace',
+ MDB2_ERROR_CANNOT_DELETE => 'can not delete',
+ MDB2_ERROR_CANNOT_DROP => 'can not drop',
+ MDB2_ERROR_CONSTRAINT => 'constraint violation',
+ MDB2_ERROR_CONSTRAINT_NOT_NULL=> 'null value violates not-null constraint',
+ MDB2_ERROR_DIVZERO => 'division by zero',
+ MDB2_ERROR_INVALID => 'invalid',
+ MDB2_ERROR_INVALID_DATE => 'invalid date or time',
+ MDB2_ERROR_INVALID_NUMBER => 'invalid number',
+ MDB2_ERROR_MISMATCH => 'mismatch',
+ MDB2_ERROR_NODBSELECTED => 'no database selected',
+ MDB2_ERROR_NOSUCHFIELD => 'no such field',
+ MDB2_ERROR_NOSUCHTABLE => 'no such table',
+ MDB2_ERROR_NOT_CAPABLE => 'MDB2 backend not capable',
+ MDB2_ERROR_NOT_FOUND => 'not found',
+ MDB2_ERROR_NOT_LOCKED => 'not locked',
+ MDB2_ERROR_SYNTAX => 'syntax error',
+ MDB2_ERROR_UNSUPPORTED => 'not supported',
+ MDB2_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+ MDB2_ERROR_INVALID_DSN => 'invalid DSN',
+ MDB2_ERROR_CONNECT_FAILED => 'connect failed',
+ MDB2_ERROR_NEED_MORE_DATA => 'insufficient data supplied',
+ MDB2_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
+ MDB2_ERROR_NOSUCHDB => 'no such database',
+ MDB2_ERROR_ACCESS_VIOLATION => 'insufficient permissions',
+ MDB2_ERROR_LOADMODULE => 'error while including on demand module',
+ MDB2_ERROR_TRUNCATED => 'truncated',
+ MDB2_ERROR_DEADLOCK => 'deadlock detected',
+ MDB2_ERROR_NO_PERMISSION => 'no permission',
+ MDB2_ERROR_DISCONNECT_FAILED => 'disconnect failed',
+ );
+ }
+
+ if (is_null($value)) {
+ return $errorMessages;
+ }
+
+ if (PEAR::isError($value)) {
+ $value = $value->getCode();
+ }
+
+ return isset($errorMessages[$value]) ?
+ $errorMessages[$value] : $errorMessages[MDB2_ERROR];
+ }
+
+ // }}}
+ // {{{ function parseDSN($dsn)
+
+ /**
+ * Parse a data source name.
+ *
+ * Additional keys can be added by appending a URI query string to the
+ * end of the DSN.
+ *
+ * The format of the supplied DSN is in its fullest form:
+ *
+ * phptype(dbsyntax)://username:password@protocol+hostspec/database?option=8&another=true
+ *
+ *
+ * Most variations are allowed:
+ *
+ * phptype://username:password@protocol+hostspec:110//usr/db_file.db?mode=0644
+ * phptype://username:password@hostspec/database_name
+ * phptype://username:password@hostspec
+ * phptype://username@hostspec
+ * phptype://hostspec/database
+ * phptype://hostspec
+ * phptype(dbsyntax)
+ * phptype
+ *
+ *
+ * @param string Data Source Name to be parsed
+ *
+ * @return array an associative array with the following keys:
+ * + phptype: Database backend used in PHP (mysql, odbc etc.)
+ * + dbsyntax: Database used with regards to SQL syntax etc.
+ * + protocol: Communication protocol to use (tcp, unix etc.)
+ * + hostspec: Host specification (hostname[:port])
+ * + database: Database to use on the DBMS server
+ * + username: User name for login
+ * + password: Password for login
+ *
+ * @access public
+ * @author Tomas V.V.Cox
+ */
+ function parseDSN($dsn)
+ {
+ $parsed = $GLOBALS['_MDB2_dsninfo_default'];
+
+ if (is_array($dsn)) {
+ $dsn = array_merge($parsed, $dsn);
+ if (!$dsn['dbsyntax']) {
+ $dsn['dbsyntax'] = $dsn['phptype'];
+ }
+ return $dsn;
+ }
+
+ // Find phptype and dbsyntax
+ if (($pos = strpos($dsn, '://')) !== false) {
+ $str = substr($dsn, 0, $pos);
+ $dsn = substr($dsn, $pos + 3);
+ } else {
+ $str = $dsn;
+ $dsn = null;
+ }
+
+ // Get phptype and dbsyntax
+ // $str => phptype(dbsyntax)
+ if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+ $parsed['phptype'] = $arr[1];
+ $parsed['dbsyntax'] = !$arr[2] ? $arr[1] : $arr[2];
+ } else {
+ $parsed['phptype'] = $str;
+ $parsed['dbsyntax'] = $str;
+ }
+
+ if (!count($dsn)) {
+ return $parsed;
+ }
+
+ // Get (if found): username and password
+ // $dsn => username:password@protocol+hostspec/database
+ if (($at = strrpos($dsn,'@')) !== false) {
+ $str = substr($dsn, 0, $at);
+ $dsn = substr($dsn, $at + 1);
+ if (($pos = strpos($str, ':')) !== false) {
+ $parsed['username'] = rawurldecode(substr($str, 0, $pos));
+ $parsed['password'] = rawurldecode(substr($str, $pos + 1));
+ } else {
+ $parsed['username'] = rawurldecode($str);
+ }
+ }
+
+ // Find protocol and hostspec
+
+ // $dsn => proto(proto_opts)/database
+ if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
+ $proto = $match[1];
+ $proto_opts = $match[2] ? $match[2] : false;
+ $dsn = $match[3];
+
+ // $dsn => protocol+hostspec/database (old format)
+ } else {
+ if (strpos($dsn, '+') !== false) {
+ list($proto, $dsn) = explode('+', $dsn, 2);
+ }
+ if ( strpos($dsn, '//') === 0
+ && strpos($dsn, '/', 2) !== false
+ && $parsed['phptype'] == 'oci8'
+ ) {
+ //oracle's "Easy Connect" syntax:
+ //"username/password@[//]host[:port][/service_name]"
+ //e.g. "scott/tiger@//mymachine:1521/oracle"
+ $proto_opts = $dsn;
+ $dsn = substr($proto_opts, strrpos($proto_opts, '/') + 1);
+ } elseif (strpos($dsn, '/') !== false) {
+ list($proto_opts, $dsn) = explode('/', $dsn, 2);
+ } else {
+ $proto_opts = $dsn;
+ $dsn = null;
+ }
+ }
+
+ // process the different protocol options
+ $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
+ $proto_opts = rawurldecode($proto_opts);
+ if (strpos($proto_opts, ':') !== false) {
+ list($proto_opts, $parsed['port']) = explode(':', $proto_opts);
+ }
+ if ($parsed['protocol'] == 'tcp') {
+ $parsed['hostspec'] = $proto_opts;
+ } elseif ($parsed['protocol'] == 'unix') {
+ $parsed['socket'] = $proto_opts;
+ }
+
+ // Get dabase if any
+ // $dsn => database
+ if ($dsn) {
+ // /database
+ if (($pos = strpos($dsn, '?')) === false) {
+ $parsed['database'] = $dsn;
+ // /database?param1=value1¶m2=value2
+ } else {
+ $parsed['database'] = substr($dsn, 0, $pos);
+ $dsn = substr($dsn, $pos + 1);
+ if (strpos($dsn, '&') !== false) {
+ $opts = explode('&', $dsn);
+ } else { // database?param1=value1
+ $opts = array($dsn);
+ }
+ foreach ($opts as $opt) {
+ list($key, $value) = explode('=', $opt);
+ if (!isset($parsed[$key])) {
+ // don't allow params overwrite
+ $parsed[$key] = rawurldecode($value);
+ }
+ }
+ }
+ }
+
+ return $parsed;
+ }
+
+ // }}}
+ // {{{ function fileExists($file)
+
+ /**
+ * Checks if a file exists in the include path
+ *
+ * @param string filename
+ *
+ * @return bool true success and false on error
+ *
+ * @access public
+ */
+ function fileExists($file)
+ {
+ // safe_mode does notwork with is_readable()
+ if (!@ini_get('safe_mode')) {
+ $dirs = explode(PATH_SEPARATOR, ini_get('include_path'));
+ foreach ($dirs as $dir) {
+ if (is_readable($dir . DIRECTORY_SEPARATOR . $file)) {
+ return true;
+ }
+ }
+ } else {
+ $fp = @fopen($file, 'r', true);
+ if (is_resource($fp)) {
+ @fclose($fp);
+ return true;
+ }
+ }
+ return false;
+ }
+ // }}}
+}
+
+// }}}
+// {{{ class MDB2_Error extends PEAR_Error
+
+/**
+ * MDB2_Error implements a class for reporting portable database error
+ * messages.
+ *
+ * @package MDB2
+ * @category Database
+ * @author Stig Bakken
+ */
+class MDB2_Error extends PEAR_Error
+{
+ // {{{ constructor: function MDB2_Error($code = MDB2_ERROR, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE, $debuginfo = null)
+
+ /**
+ * MDB2_Error constructor.
+ *
+ * @param mixed MDB2 error code, or string with error message.
+ * @param int what 'error mode' to operate in
+ * @param int what error level to use for $mode & PEAR_ERROR_TRIGGER
+ * @param mixed additional debug info, such as the last query
+ */
+ function MDB2_Error($code = MDB2_ERROR, $mode = PEAR_ERROR_RETURN,
+ $level = E_USER_NOTICE, $debuginfo = null, $dummy = null)
+ {
+ if (is_null($code)) {
+ $code = MDB2_ERROR;
+ }
+ $this->PEAR_Error('MDB2 Error: '.MDB2::errorMessage($code), $code,
+ $mode, $level, $debuginfo);
+ }
+
+ // }}}
+}
+
+// }}}
+// {{{ class MDB2_Driver_Common extends PEAR
+
+/**
+ * MDB2_Driver_Common: Base class that is extended by each MDB2 driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith
+ */
+class MDB2_Driver_Common extends PEAR
+{
+ // {{{ Variables (Properties)
+
+ /**
+ * index of the MDB2 object within the $GLOBALS['_MDB2_databases'] array
+ * @var int
+ * @access public
+ */
+ var $db_index = 0;
+
+ /**
+ * DSN used for the next query
+ * @var array
+ * @access protected
+ */
+ var $dsn = array();
+
+ /**
+ * DSN that was used to create the current connection
+ * @var array
+ * @access protected
+ */
+ var $connected_dsn = array();
+
+ /**
+ * connection resource
+ * @var mixed
+ * @access protected
+ */
+ var $connection = 0;
+
+ /**
+ * if the current opened connection is a persistent connection
+ * @var bool
+ * @access protected
+ */
+ var $opened_persistent;
+
+ /**
+ * the name of the database for the next query
+ * @var string
+ * @access protected
+ */
+ var $database_name = '';
+
+ /**
+ * the name of the database currently selected
+ * @var string
+ * @access protected
+ */
+ var $connected_database_name = '';
+
+ /**
+ * server version information
+ * @var string
+ * @access protected
+ */
+ var $connected_server_info = '';
+
+ /**
+ * list of all supported features of the given driver
+ * @var array
+ * @access public
+ */
+ var $supported = array(
+ 'sequences' => false,
+ 'indexes' => false,
+ 'affected_rows' => false,
+ 'summary_functions' => false,
+ 'order_by_text' => false,
+ 'transactions' => false,
+ 'savepoints' => false,
+ 'current_id' => false,
+ 'limit_queries' => false,
+ 'LOBs' => false,
+ 'replace' => false,
+ 'sub_selects' => false,
+ 'triggers' => false,
+ 'auto_increment' => false,
+ 'primary_key' => false,
+ 'result_introspection' => false,
+ 'prepared_statements' => false,
+ 'identifier_quoting' => false,
+ 'pattern_escaping' => false,
+ 'new_link' => false,
+ );
+
+ /**
+ * Array of supported options that can be passed to the MDB2 instance.
+ *
+ * The options can be set during object creation, using
+ * MDB2::connect(), MDB2::factory() or MDB2::singleton(). The options can
+ * also be set after the object is created, using MDB2::setOptions() or
+ * MDB2_Driver_Common::setOption().
+ * The list of available option includes:
+ *
+ * - $options['ssl'] -> boolean: determines if ssl should be used for connections
+ * - $options['field_case'] -> CASE_LOWER|CASE_UPPER: determines what case to force on field/table names
+ * - $options['disable_query'] -> boolean: determines if queries should be executed
+ * - $options['result_class'] -> string: class used for result sets
+ * - $options['buffered_result_class'] -> string: class used for buffered result sets
+ * - $options['result_wrap_class'] -> string: class used to wrap result sets into
+ * - $options['result_buffering'] -> boolean should results be buffered or not?
+ * - $options['fetch_class'] -> string: class to use when fetch mode object is used
+ * - $options['persistent'] -> boolean: persistent connection?
+ * - $options['debug'] -> integer: numeric debug level
+ * - $options['debug_handler'] -> string: function/method that captures debug messages
+ * - $options['debug_expanded_output'] -> bool: BC option to determine if more context information should be send to the debug handler
+ * - $options['default_text_field_length'] -> integer: default text field length to use
+ * - $options['lob_buffer_length'] -> integer: LOB buffer length
+ * - $options['log_line_break'] -> string: line-break format
+ * - $options['idxname_format'] -> string: pattern for index name
+ * - $options['seqname_format'] -> string: pattern for sequence name
+ * - $options['savepoint_format'] -> string: pattern for auto generated savepoint names
+ * - $options['statement_format'] -> string: pattern for prepared statement names
+ * - $options['seqcol_name'] -> string: sequence column name
+ * - $options['quote_identifier'] -> boolean: if identifier quoting should be done when check_option is used
+ * - $options['use_transactions'] -> boolean: if transaction use should be enabled
+ * - $options['decimal_places'] -> integer: number of decimal places to handle
+ * - $options['portability'] -> integer: portability constant
+ * - $options['modules'] -> array: short to long module name mapping for __call()
+ * - $options['emulate_prepared'] -> boolean: force prepared statements to be emulated
+ * - $options['datatype_map'] -> array: map user defined datatypes to other primitive datatypes
+ * - $options['datatype_map_callback'] -> array: callback function/method that should be called
+ * - $options['bindname_format'] -> string: regular expression pattern for named parameters
+ * - $options['multi_query'] -> boolean: determines if queries returning multiple result sets should be executed
+ * - $options['max_identifiers_length'] -> integer: max identifier length
+ * - $options['default_fk_action_onupdate'] -> string: default FOREIGN KEY ON UPDATE action ['RESTRICT'|'NO ACTION'|'SET DEFAULT'|'SET NULL'|'CASCADE']
+ * - $options['default_fk_action_ondelete'] -> string: default FOREIGN KEY ON DELETE action ['RESTRICT'|'NO ACTION'|'SET DEFAULT'|'SET NULL'|'CASCADE']
+ *
+ *
+ * @var array
+ * @access public
+ * @see MDB2::connect()
+ * @see MDB2::factory()
+ * @see MDB2::singleton()
+ * @see MDB2_Driver_Common::setOption()
+ */
+ var $options = array(
+ 'ssl' => false,
+ 'field_case' => CASE_LOWER,
+ 'disable_query' => false,
+ 'result_class' => 'MDB2_Result_%s',
+ 'buffered_result_class' => 'MDB2_BufferedResult_%s',
+ 'result_wrap_class' => false,
+ 'result_buffering' => true,
+ 'fetch_class' => 'stdClass',
+ 'persistent' => false,
+ 'debug' => 0,
+ 'debug_handler' => 'MDB2_defaultDebugOutput',
+ 'debug_expanded_output' => false,
+ 'default_text_field_length' => 4096,
+ 'lob_buffer_length' => 8192,
+ 'log_line_break' => "\n",
+ 'idxname_format' => '%s_idx',
+ 'seqname_format' => '%s_seq',
+ 'savepoint_format' => 'MDB2_SAVEPOINT_%s',
+ 'statement_format' => 'MDB2_STATEMENT_%1$s_%2$s',
+ 'seqcol_name' => 'sequence',
+ 'quote_identifier' => false,
+ 'use_transactions' => true,
+ 'decimal_places' => 2,
+ 'portability' => MDB2_PORTABILITY_ALL,
+ 'modules' => array(
+ 'ex' => 'Extended',
+ 'dt' => 'Datatype',
+ 'mg' => 'Manager',
+ 'rv' => 'Reverse',
+ 'na' => 'Native',
+ 'fc' => 'Function',
+ ),
+ 'emulate_prepared' => false,
+ 'datatype_map' => array(),
+ 'datatype_map_callback' => array(),
+ 'nativetype_map_callback' => array(),
+ 'lob_allow_url_include' => false,
+ 'bindname_format' => '(?:\d+)|(?:[a-zA-Z][a-zA-Z0-9_]*)',
+ 'max_identifiers_length' => 30,
+ 'default_fk_action_onupdate' => 'RESTRICT',
+ 'default_fk_action_ondelete' => 'RESTRICT',
+ );
+
+ /**
+ * string array
+ * @var string
+ * @access protected
+ */
+ var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => false, 'escape_pattern' => false);
+
+ /**
+ * identifier quoting
+ * @var array
+ * @access protected
+ */
+ var $identifier_quoting = array('start' => '"', 'end' => '"', 'escape' => '"');
+
+ /**
+ * sql comments
+ * @var array
+ * @access protected
+ */
+ var $sql_comments = array(
+ array('start' => '--', 'end' => "\n", 'escape' => false),
+ array('start' => '/*', 'end' => '*/', 'escape' => false),
+ );
+
+ /**
+ * comparision wildcards
+ * @var array
+ * @access protected
+ */
+ var $wildcards = array('%', '_');
+
+ /**
+ * column alias keyword
+ * @var string
+ * @access protected
+ */
+ var $as_keyword = ' AS ';
+
+ /**
+ * warnings
+ * @var array
+ * @access protected
+ */
+ var $warnings = array();
+
+ /**
+ * string with the debugging information
+ * @var string
+ * @access public
+ */
+ var $debug_output = '';
+
+ /**
+ * determine if there is an open transaction
+ * @var bool
+ * @access protected
+ */
+ var $in_transaction = false;
+
+ /**
+ * the smart transaction nesting depth
+ * @var int
+ * @access protected
+ */
+ var $nested_transaction_counter = null;
+
+ /**
+ * the first error that occured inside a nested transaction
+ * @var MDB2_Error|bool
+ * @access protected
+ */
+ var $has_transaction_error = false;
+
+ /**
+ * result offset used in the next query
+ * @var int
+ * @access protected
+ */
+ var $offset = 0;
+
+ /**
+ * result limit used in the next query
+ * @var int
+ * @access protected
+ */
+ var $limit = 0;
+
+ /**
+ * Database backend used in PHP (mysql, odbc etc.)
+ * @var string
+ * @access public
+ */
+ var $phptype;
+
+ /**
+ * Database used with regards to SQL syntax etc.
+ * @var string
+ * @access public
+ */
+ var $dbsyntax;
+
+ /**
+ * the last query sent to the driver
+ * @var string
+ * @access public
+ */
+ var $last_query;
+
+ /**
+ * the default fetchmode used
+ * @var int
+ * @access protected
+ */
+ var $fetchmode = MDB2_FETCHMODE_ORDERED;
+
+ /**
+ * array of module instances
+ * @var array
+ * @access protected
+ */
+ var $modules = array();
+
+ /**
+ * determines of the PHP4 destructor emulation has been enabled yet
+ * @var array
+ * @access protected
+ */
+ var $destructor_registered = true;
+
+ // }}}
+ // {{{ constructor: function __construct()
+
+ /**
+ * Constructor
+ */
+ function __construct()
+ {
+ end($GLOBALS['_MDB2_databases']);
+ $db_index = key($GLOBALS['_MDB2_databases']) + 1;
+ $GLOBALS['_MDB2_databases'][$db_index] = &$this;
+ $this->db_index = $db_index;
+ }
+
+ // }}}
+ // {{{ function MDB2_Driver_Common()
+
+ /**
+ * PHP 4 Constructor
+ */
+ function MDB2_Driver_Common()
+ {
+ $this->destructor_registered = false;
+ $this->__construct();
+ }
+
+ // }}}
+ // {{{ destructor: function __destruct()
+
+ /**
+ * Destructor
+ */
+ function __destruct()
+ {
+ $this->disconnect(false);
+ }
+
+ // }}}
+ // {{{ function free()
+
+ /**
+ * Free the internal references so that the instance can be destroyed
+ *
+ * @return bool true on success, false if result is invalid
+ *
+ * @access public
+ */
+ function free()
+ {
+ unset($GLOBALS['_MDB2_databases'][$this->db_index]);
+ unset($this->db_index);
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function __toString()
+
+ /**
+ * String conversation
+ *
+ * @return string representation of the object
+ *
+ * @access public
+ */
+ function __toString()
+ {
+ $info = get_class($this);
+ $info.= ': (phptype = '.$this->phptype.', dbsyntax = '.$this->dbsyntax.')';
+ if ($this->connection) {
+ $info.= ' [connected]';
+ }
+ return $info;
+ }
+
+ // }}}
+ // {{{ function errorInfo($error = null)
+
+ /**
+ * This method is used to collect information about an error
+ *
+ * @param mixed error code or resource
+ *
+ * @return array with MDB2 errorcode, native error code, native message
+ *
+ * @access public
+ */
+ function errorInfo($error = null)
+ {
+ return array($error, null, null);
+ }
+
+ // }}}
+ // {{{ function &raiseError($code = null, $mode = null, $options = null, $userinfo = null)
+
+ /**
+ * This method is used to communicate an error and invoke error
+ * callbacks etc. Basically a wrapper for PEAR::raiseError
+ * without the message string.
+ *
+ * @param mixed $code integer error code, or a PEAR error object (all
+ * other parameters are ignored if this parameter is
+ * an object
+ * @param int $mode error mode, see PEAR_Error docs
+ * @param mixed $options If error mode is PEAR_ERROR_TRIGGER, this is the
+ * error level (E_USER_NOTICE etc). If error mode is
+ * PEAR_ERROR_CALLBACK, this is the callback function,
+ * either as a function name, or as an array of an
+ * object and method name. For other error modes this
+ * parameter is ignored.
+ * @param string $userinfo Extra debug information. Defaults to the last
+ * query and native error code.
+ * @param string $method name of the method that triggered the error
+ * @param string $dummy1 not used
+ * @param bool $dummy2 not used
+ *
+ * @return PEAR_Error instance of a PEAR Error object
+ * @access public
+ * @see PEAR_Error
+ */
+ function &raiseError($code = null,
+ $mode = null,
+ $options = null,
+ $userinfo = null,
+ $method = null,
+ $dummy1 = null,
+ $dummy2 = false
+ ) {
+ $userinfo = "[Error message: $userinfo]\n";
+ // The error is yet a MDB2 error object
+ if (PEAR::isError($code)) {
+ // because we use the static PEAR::raiseError, our global
+ // handler should be used if it is set
+ if (is_null($mode) && !empty($this->_default_error_mode)) {
+ $mode = $this->_default_error_mode;
+ $options = $this->_default_error_options;
+ }
+ if (is_null($userinfo)) {
+ $userinfo = $code->getUserinfo();
+ }
+ $code = $code->getCode();
+ } elseif ($code == MDB2_ERROR_NOT_FOUND) {
+ // extension not loaded: don't call $this->errorInfo() or the script
+ // will die
+ } elseif (isset($this->connection)) {
+ if (!empty($this->last_query)) {
+ $userinfo.= "[Last executed query: {$this->last_query}]\n";
+ }
+ $native_errno = $native_msg = null;
+ list($code, $native_errno, $native_msg) = $this->errorInfo($code);
+ if (!is_null($native_errno) && $native_errno !== '') {
+ $userinfo.= "[Native code: $native_errno]\n";
+ }
+ if (!is_null($native_msg) && $native_msg !== '') {
+ $userinfo.= "[Native message: ". strip_tags($native_msg) ."]\n";
+ }
+ if (!is_null($method)) {
+ $userinfo = $method.': '.$userinfo;
+ }
+ }
+
+ $err =& PEAR::raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
+ if ($err->getMode() !== PEAR_ERROR_RETURN
+ && isset($this->nested_transaction_counter) && !$this->has_transaction_error) {
+ $this->has_transaction_error =& $err;
+ }
+ return $err;
+ }
+
+ // }}}
+ // {{{ function resetWarnings()
+
+ /**
+ * reset the warning array
+ *
+ * @return void
+ *
+ * @access public
+ */
+ function resetWarnings()
+ {
+ $this->warnings = array();
+ }
+
+ // }}}
+ // {{{ function getWarnings()
+
+ /**
+ * Get all warnings in reverse order.
+ * This means that the last warning is the first element in the array
+ *
+ * @return array with warnings
+ *
+ * @access public
+ * @see resetWarnings()
+ */
+ function getWarnings()
+ {
+ return array_reverse($this->warnings);
+ }
+
+ // }}}
+ // {{{ function setFetchMode($fetchmode, $object_class = 'stdClass')
+
+ /**
+ * Sets which fetch mode should be used by default on queries
+ * on this connection
+ *
+ * @param int MDB2_FETCHMODE_ORDERED, MDB2_FETCHMODE_ASSOC
+ * or MDB2_FETCHMODE_OBJECT
+ * @param string the class name of the object to be returned
+ * by the fetch methods when the
+ * MDB2_FETCHMODE_OBJECT mode is selected.
+ * If no class is specified by default a cast
+ * to object from the assoc array row will be
+ * done. There is also the possibility to use
+ * and extend the 'MDB2_row' class.
+ *
+ * @return mixed MDB2_OK or MDB2 Error Object
+ *
+ * @access public
+ * @see MDB2_FETCHMODE_ORDERED, MDB2_FETCHMODE_ASSOC, MDB2_FETCHMODE_OBJECT
+ */
+ function setFetchMode($fetchmode, $object_class = 'stdClass')
+ {
+ switch ($fetchmode) {
+ case MDB2_FETCHMODE_OBJECT:
+ $this->options['fetch_class'] = $object_class;
+ case MDB2_FETCHMODE_ORDERED:
+ case MDB2_FETCHMODE_ASSOC:
+ $this->fetchmode = $fetchmode;
+ break;
+ default:
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'invalid fetchmode mode', __FUNCTION__);
+ }
+
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function setOption($option, $value)
+
+ /**
+ * set the option for the db class
+ *
+ * @param string option name
+ * @param mixed value for the option
+ *
+ * @return mixed MDB2_OK or MDB2 Error Object
+ *
+ * @access public
+ */
+ function setOption($option, $value)
+ {
+ if (array_key_exists($option, $this->options)) {
+ $this->options[$option] = $value;
+ return MDB2_OK;
+ }
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ "unknown option $option", __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function getOption($option)
+
+ /**
+ * Returns the value of an option
+ *
+ * @param string option name
+ *
+ * @return mixed the option value or error object
+ *
+ * @access public
+ */
+ function getOption($option)
+ {
+ if (array_key_exists($option, $this->options)) {
+ return $this->options[$option];
+ }
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ "unknown option $option", __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function debug($message, $scope = '', $is_manip = null)
+
+ /**
+ * set a debug message
+ *
+ * @param string message that should be appended to the debug variable
+ * @param string usually the method name that triggered the debug call:
+ * for example 'query', 'prepare', 'execute', 'parameters',
+ * 'beginTransaction', 'commit', 'rollback'
+ * @param array contains context information about the debug() call
+ * common keys are: is_manip, time, result etc.
+ *
+ * @return void
+ *
+ * @access public
+ */
+ function debug($message, $scope = '', $context = array())
+ {
+ if ($this->options['debug'] && $this->options['debug_handler']) {
+ if (!$this->options['debug_expanded_output']) {
+ if (!empty($context['when']) && $context['when'] !== 'pre') {
+ return null;
+ }
+ $context = empty($context['is_manip']) ? false : $context['is_manip'];
+ }
+ return call_user_func_array($this->options['debug_handler'], array(&$this, $scope, $message, $context));
+ }
+ return null;
+ }
+
+ // }}}
+ // {{{ function getDebugOutput()
+
+ /**
+ * output debug info
+ *
+ * @return string content of the debug_output class variable
+ *
+ * @access public
+ */
+ function getDebugOutput()
+ {
+ return $this->debug_output;
+ }
+
+ // }}}
+ // {{{ function escape($text)
+
+ /**
+ * Quotes a string so it can be safely used in a query. It will quote
+ * the text so it can safely be used within a query.
+ *
+ * @param string the input string to quote
+ * @param bool escape wildcards
+ *
+ * @return string quoted string
+ *
+ * @access public
+ */
+ function escape($text, $escape_wildcards = false)
+ {
+ if ($escape_wildcards) {
+ $text = $this->escapePattern($text);
+ }
+
+ $text = str_replace($this->string_quoting['end'], $this->string_quoting['escape'] . $this->string_quoting['end'], $text);
+ return $text;
+ }
+
+ // }}}
+ // {{{ function escapePattern($text)
+
+ /**
+ * Quotes pattern (% and _) characters in a string)
+ *
+ * @param string the input string to quote
+ *
+ * @return string quoted string
+ *
+ * @access public
+ */
+ function escapePattern($text)
+ {
+ if ($this->string_quoting['escape_pattern']) {
+ $text = str_replace($this->string_quoting['escape_pattern'], $this->string_quoting['escape_pattern'] . $this->string_quoting['escape_pattern'], $text);
+ foreach ($this->wildcards as $wildcard) {
+ $text = str_replace($wildcard, $this->string_quoting['escape_pattern'] . $wildcard, $text);
+ }
+ }
+ return $text;
+ }
+
+ // }}}
+ // {{{ function quoteIdentifier($str, $check_option = false)
+
+ /**
+ * Quote a string so it can be safely used as a table or column name
+ *
+ * Delimiting style depends on which database driver is being used.
+ *
+ * NOTE: just because you CAN use delimited identifiers doesn't mean
+ * you SHOULD use them. In general, they end up causing way more
+ * problems than they solve.
+ *
+ * NOTE: if you have table names containing periods, don't use this method
+ * (@see bug #11906)
+ *
+ * Portability is broken by using the following characters inside
+ * delimited identifiers:
+ * + backtick (`) -- due to MySQL
+ * + double quote (") -- due to Oracle
+ * + brackets ([ or ]) -- due to Access
+ *
+ * Delimited identifiers are known to generally work correctly under
+ * the following drivers:
+ * + mssql
+ * + mysql
+ * + mysqli
+ * + oci8
+ * + pgsql
+ * + sqlite
+ *
+ * InterBase doesn't seem to be able to use delimited identifiers
+ * via PHP 4. They work fine under PHP 5.
+ *
+ * @param string identifier name to be quoted
+ * @param bool check the 'quote_identifier' option
+ *
+ * @return string quoted identifier string
+ *
+ * @access public
+ */
+ function quoteIdentifier($str, $check_option = false)
+ {
+ if ($check_option && !$this->options['quote_identifier']) {
+ return $str;
+ }
+ $str = str_replace($this->identifier_quoting['end'], $this->identifier_quoting['escape'] . $this->identifier_quoting['end'], $str);
+ $parts = explode('.', $str);
+ foreach (array_keys($parts) as $k) {
+ $parts[$k] = $this->identifier_quoting['start'] . $parts[$k] . $this->identifier_quoting['end'];
+ }
+ return implode('.', $parts);
+ }
+
+ // }}}
+ // {{{ function getAsKeyword()
+
+ /**
+ * Gets the string to alias column
+ *
+ * @return string to use when aliasing a column
+ */
+ function getAsKeyword()
+ {
+ return $this->as_keyword;
+ }
+
+ // }}}
+ // {{{ function getConnection()
+
+ /**
+ * Returns a native connection
+ *
+ * @return mixed a valid MDB2 connection object,
+ * or a MDB2 error object on error
+ *
+ * @access public
+ */
+ function getConnection()
+ {
+ $result = $this->connect();
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+ return $this->connection;
+ }
+
+ // }}}
+ // {{{ function _fixResultArrayValues(&$row, $mode)
+
+ /**
+ * Do all necessary conversions on result arrays to fix DBMS quirks
+ *
+ * @param array the array to be fixed (passed by reference)
+ * @param array bit-wise addition of the required portability modes
+ *
+ * @return void
+ *
+ * @access protected
+ */
+ function _fixResultArrayValues(&$row, $mode)
+ {
+ switch ($mode) {
+ case MDB2_PORTABILITY_EMPTY_TO_NULL:
+ foreach ($row as $key => $value) {
+ if ($value === '') {
+ $row[$key] = null;
+ }
+ }
+ break;
+ case MDB2_PORTABILITY_RTRIM:
+ foreach ($row as $key => $value) {
+ if (is_string($value)) {
+ $row[$key] = rtrim($value);
+ }
+ }
+ break;
+ case MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES:
+ $tmp_row = array();
+ foreach ($row as $key => $value) {
+ $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
+ }
+ $row = $tmp_row;
+ break;
+ case (MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_EMPTY_TO_NULL):
+ foreach ($row as $key => $value) {
+ if ($value === '') {
+ $row[$key] = null;
+ } elseif (is_string($value)) {
+ $row[$key] = rtrim($value);
+ }
+ }
+ break;
+ case (MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES):
+ $tmp_row = array();
+ foreach ($row as $key => $value) {
+ if (is_string($value)) {
+ $value = rtrim($value);
+ }
+ $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
+ }
+ $row = $tmp_row;
+ break;
+ case (MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES):
+ $tmp_row = array();
+ foreach ($row as $key => $value) {
+ if ($value === '') {
+ $value = null;
+ }
+ $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
+ }
+ $row = $tmp_row;
+ break;
+ case (MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES):
+ $tmp_row = array();
+ foreach ($row as $key => $value) {
+ if ($value === '') {
+ $value = null;
+ } elseif (is_string($value)) {
+ $value = rtrim($value);
+ }
+ $tmp_row[preg_replace('/^(?:.*\.)?([^.]+)$/', '\\1', $key)] = $value;
+ }
+ $row = $tmp_row;
+ break;
+ }
+ }
+
+ // }}}
+ // {{{ function &loadModule($module, $property = null, $phptype_specific = null)
+
+ /**
+ * loads a module
+ *
+ * @param string name of the module that should be loaded
+ * (only used for error messages)
+ * @param string name of the property into which the class will be loaded
+ * @param bool if the class to load for the module is specific to the
+ * phptype
+ *
+ * @return object on success a reference to the given module is returned
+ * and on failure a PEAR error
+ *
+ * @access public
+ */
+ function &loadModule($module, $property = null, $phptype_specific = null)
+ {
+ if (!$property) {
+ $property = strtolower($module);
+ }
+
+ if (!isset($this->{$property})) {
+ $version = $phptype_specific;
+ if ($phptype_specific !== false) {
+ $version = true;
+ $class_name = 'MDB2_Driver_'.$module.'_'.$this->phptype;
+ $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
+ }
+ if ($phptype_specific === false
+ || (!MDB2::classExists($class_name) && !MDB2::fileExists($file_name))
+ ) {
+ $version = false;
+ $class_name = 'MDB2_'.$module;
+ $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
+ }
+
+ $err = MDB2::loadClass($class_name, $this->getOption('debug'));
+ if (PEAR::isError($err)) {
+ return $err;
+ }
+
+ // load module in a specific version
+ if ($version) {
+ if (method_exists($class_name, 'getClassName')) {
+ $class_name_new = call_user_func(array($class_name, 'getClassName'), $this->db_index);
+ if ($class_name != $class_name_new) {
+ $class_name = $class_name_new;
+ $err = MDB2::loadClass($class_name, $this->getOption('debug'));
+ if (PEAR::isError($err)) {
+ return $err;
+ }
+ }
+ }
+ }
+
+ if (!MDB2::classExists($class_name)) {
+ $err =& $this->raiseError(MDB2_ERROR_LOADMODULE, null, null,
+ "unable to load module '$module' into property '$property'", __FUNCTION__);
+ return $err;
+ }
+ $this->{$property} = new $class_name($this->db_index);
+ $this->modules[$module] =& $this->{$property};
+ if ($version) {
+ // this will be used in the connect method to determine if the module
+ // needs to be loaded with a different version if the server
+ // version changed in between connects
+ $this->loaded_version_modules[] = $property;
+ }
+ }
+
+ return $this->{$property};
+ }
+
+ // }}}
+ // {{{ function __call($method, $params)
+
+ /**
+ * Calls a module method using the __call magic method
+ *
+ * @param string Method name.
+ * @param array Arguments.
+ *
+ * @return mixed Returned value.
+ */
+ function __call($method, $params)
+ {
+ $module = null;
+ if (preg_match('/^([a-z]+)([A-Z])(.*)$/', $method, $match)
+ && isset($this->options['modules'][$match[1]])
+ ) {
+ $module = $this->options['modules'][$match[1]];
+ $method = strtolower($match[2]).$match[3];
+ if (!isset($this->modules[$module]) || !is_object($this->modules[$module])) {
+ $result =& $this->loadModule($module);
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+ }
+ } else {
+ foreach ($this->modules as $key => $foo) {
+ if (is_object($this->modules[$key])
+ && method_exists($this->modules[$key], $method)
+ ) {
+ $module = $key;
+ break;
+ }
+ }
+ }
+ if (!is_null($module)) {
+ return call_user_func_array(array(&$this->modules[$module], $method), $params);
+ }
+ trigger_error(sprintf('Call to undefined function: %s::%s().', get_class($this), $method), E_USER_ERROR);
+ }
+
+ // }}}
+ // {{{ function beginTransaction($savepoint = null)
+
+ /**
+ * Start a transaction or set a savepoint.
+ *
+ * @param string name of a savepoint to set
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function beginTransaction($savepoint = null)
+ {
+ $this->debug('Starting transaction', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'transactions are not supported', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function commit($savepoint = null)
+
+ /**
+ * Commit the database changes done during a transaction that is in
+ * progress or release a savepoint. This function may only be called when
+ * auto-committing is disabled, otherwise it will fail. Therefore, a new
+ * transaction is implicitly started after committing the pending changes.
+ *
+ * @param string name of a savepoint to release
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function commit($savepoint = null)
+ {
+ $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'commiting transactions is not supported', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function rollback($savepoint = null)
+
+ /**
+ * Cancel any database changes done during a transaction or since a specific
+ * savepoint that is in progress. This function may only be called when
+ * auto-committing is disabled, otherwise it will fail. Therefore, a new
+ * transaction is implicitly started after canceling the pending changes.
+ *
+ * @param string name of a savepoint to rollback to
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function rollback($savepoint = null)
+ {
+ $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'rolling back transactions is not supported', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function inTransaction($ignore_nested = false)
+
+ /**
+ * If a transaction is currently open.
+ *
+ * @param bool if the nested transaction count should be ignored
+ * @return int|bool - an integer with the nesting depth is returned if a
+ * nested transaction is open
+ * - true is returned for a normal open transaction
+ * - false is returned if no transaction is open
+ *
+ * @access public
+ */
+ function inTransaction($ignore_nested = false)
+ {
+ if (!$ignore_nested && isset($this->nested_transaction_counter)) {
+ return $this->nested_transaction_counter;
+ }
+ return $this->in_transaction;
+ }
+
+ // }}}
+ // {{{ function setTransactionIsolation($isolation)
+
+ /**
+ * Set the transacton isolation level.
+ *
+ * @param string standard isolation level
+ * READ UNCOMMITTED (allows dirty reads)
+ * READ COMMITTED (prevents dirty reads)
+ * REPEATABLE READ (prevents nonrepeatable reads)
+ * SERIALIZABLE (prevents phantom reads)
+ * @param array some transaction options:
+ * 'wait' => 'WAIT' | 'NO WAIT'
+ * 'rw' => 'READ WRITE' | 'READ ONLY'
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ * @since 2.1.1
+ */
+ function setTransactionIsolation($isolation, $options = array())
+ {
+ $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'isolation level setting is not supported', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function beginNestedTransaction($savepoint = false)
+
+ /**
+ * Start a nested transaction.
+ *
+ * @return mixed MDB2_OK on success/savepoint name, a MDB2 error on failure
+ *
+ * @access public
+ * @since 2.1.1
+ */
+ function beginNestedTransaction()
+ {
+ if ($this->in_transaction) {
+ ++$this->nested_transaction_counter;
+ $savepoint = sprintf($this->options['savepoint_format'], $this->nested_transaction_counter);
+ if ($this->supports('savepoints') && $savepoint) {
+ return $this->beginTransaction($savepoint);
+ }
+ return MDB2_OK;
+ }
+ $this->has_transaction_error = false;
+ $result = $this->beginTransaction();
+ $this->nested_transaction_counter = 1;
+ return $result;
+ }
+
+ // }}}
+ // {{{ function completeNestedTransaction($force_rollback = false, $release = false)
+
+ /**
+ * Finish a nested transaction by rolling back if an error occured or
+ * committing otherwise.
+ *
+ * @param bool if the transaction should be rolled back regardless
+ * even if no error was set within the nested transaction
+ * @return mixed MDB_OK on commit/counter decrementing, false on rollback
+ * and a MDB2 error on failure
+ *
+ * @access public
+ * @since 2.1.1
+ */
+ function completeNestedTransaction($force_rollback = false)
+ {
+ if ($this->nested_transaction_counter > 1) {
+ $savepoint = sprintf($this->options['savepoint_format'], $this->nested_transaction_counter);
+ if ($this->supports('savepoints') && $savepoint) {
+ if ($force_rollback || $this->has_transaction_error) {
+ $result = $this->rollback($savepoint);
+ if (!PEAR::isError($result)) {
+ $result = false;
+ $this->has_transaction_error = false;
+ }
+ } else {
+ $result = $this->commit($savepoint);
+ }
+ } else {
+ $result = MDB2_OK;
+ }
+ --$this->nested_transaction_counter;
+ return $result;
+ }
+
+ $this->nested_transaction_counter = null;
+ $result = MDB2_OK;
+
+ // transaction has not yet been rolled back
+ if ($this->in_transaction) {
+ if ($force_rollback || $this->has_transaction_error) {
+ $result = $this->rollback();
+ if (!PEAR::isError($result)) {
+ $result = false;
+ }
+ } else {
+ $result = $this->commit();
+ }
+ }
+ $this->has_transaction_error = false;
+ return $result;
+ }
+
+ // }}}
+ // {{{ function failNestedTransaction($error = null, $immediately = false)
+
+ /**
+ * Force setting nested transaction to failed.
+ *
+ * @param mixed value to return in getNestededTransactionError()
+ * @param bool if the transaction should be rolled back immediately
+ * @return bool MDB2_OK
+ *
+ * @access public
+ * @since 2.1.1
+ */
+ function failNestedTransaction($error = null, $immediately = false)
+ {
+ if (is_null($error)) {
+ $error = $this->has_transaction_error ? $this->has_transaction_error : true;
+ } elseif (!$error) {
+ $error = true;
+ }
+ $this->has_transaction_error = $error;
+ if (!$immediately) {
+ return MDB2_OK;
+ }
+ return $this->rollback();
+ }
+
+ // }}}
+ // {{{ function getNestedTransactionError()
+
+ /**
+ * The first error that occured since the transaction start.
+ *
+ * @return MDB2_Error|bool MDB2 error object if an error occured or false.
+ *
+ * @access public
+ * @since 2.1.1
+ */
+ function getNestedTransactionError()
+ {
+ return $this->has_transaction_error;
+ }
+
+ // }}}
+ // {{{ connect()
+
+ /**
+ * Connect to the database
+ *
+ * @return true on success, MDB2 Error Object on failure
+ */
+ function connect()
+ {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ databaseExists()
+
+ /**
+ * check if given database name is exists?
+ *
+ * @param string $name name of the database that should be checked
+ *
+ * @return mixed true/false on success, a MDB2 error on failure
+ * @access public
+ */
+ function databaseExists($name)
+ {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ setCharset($charset, $connection = null)
+
+ /**
+ * Set the charset on the current connection
+ *
+ * @param string charset
+ * @param resource connection handle
+ *
+ * @return true on success, MDB2 Error Object on failure
+ */
+ function setCharset($charset, $connection = null)
+ {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function disconnect($force = true)
+
+ /**
+ * Log out and disconnect from the database.
+ *
+ * @param boolean $force whether the disconnect should be forced even if the
+ * connection is opened persistently
+ *
+ * @return mixed true on success, false if not connected and error object on error
+ *
+ * @access public
+ */
+ function disconnect($force = true)
+ {
+ $this->connection = 0;
+ $this->connected_dsn = array();
+ $this->connected_database_name = '';
+ $this->opened_persistent = null;
+ $this->connected_server_info = '';
+ $this->in_transaction = null;
+ $this->nested_transaction_counter = null;
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function setDatabase($name)
+
+ /**
+ * Select a different database
+ *
+ * @param string name of the database that should be selected
+ *
+ * @return string name of the database previously connected to
+ *
+ * @access public
+ */
+ function setDatabase($name)
+ {
+ $previous_database_name = (isset($this->database_name)) ? $this->database_name : '';
+ $this->database_name = $name;
+ if (!empty($this->connected_database_name) && ($this->connected_database_name != $this->database_name)) {
+ $this->disconnect(false);
+ }
+ return $previous_database_name;
+ }
+
+ // }}}
+ // {{{ function getDatabase()
+
+ /**
+ * Get the current database
+ *
+ * @return string name of the database
+ *
+ * @access public
+ */
+ function getDatabase()
+ {
+ return $this->database_name;
+ }
+
+ // }}}
+ // {{{ function setDSN($dsn)
+
+ /**
+ * set the DSN
+ *
+ * @param mixed DSN string or array
+ *
+ * @return MDB2_OK
+ *
+ * @access public
+ */
+ function setDSN($dsn)
+ {
+ $dsn_default = $GLOBALS['_MDB2_dsninfo_default'];
+ $dsn = MDB2::parseDSN($dsn);
+ if (array_key_exists('database', $dsn)) {
+ $this->database_name = $dsn['database'];
+ unset($dsn['database']);
+ }
+ $this->dsn = array_merge($dsn_default, $dsn);
+ return $this->disconnect(false);
+ }
+
+ // }}}
+ // {{{ function getDSN($type = 'string', $hidepw = false)
+
+ /**
+ * return the DSN as a string
+ *
+ * @param string format to return ("array", "string")
+ * @param string string to hide the password with
+ *
+ * @return mixed DSN in the chosen type
+ *
+ * @access public
+ */
+ function getDSN($type = 'string', $hidepw = false)
+ {
+ $dsn = array_merge($GLOBALS['_MDB2_dsninfo_default'], $this->dsn);
+ $dsn['phptype'] = $this->phptype;
+ $dsn['database'] = $this->database_name;
+ if ($hidepw) {
+ $dsn['password'] = $hidepw;
+ }
+ switch ($type) {
+ // expand to include all possible options
+ case 'string':
+ $dsn = $dsn['phptype'].
+ ($dsn['dbsyntax'] ? ('('.$dsn['dbsyntax'].')') : '').
+ '://'.$dsn['username'].':'.
+ $dsn['password'].'@'.$dsn['hostspec'].
+ ($dsn['port'] ? (':'.$dsn['port']) : '').
+ '/'.$dsn['database'];
+ break;
+ case 'array':
+ default:
+ break;
+ }
+ return $dsn;
+ }
+
+ // }}}
+ // {{{ _isNewLinkSet()
+
+ /**
+ * Check if the 'new_link' option is set
+ *
+ * @return boolean
+ *
+ * @access protected
+ */
+ function _isNewLinkSet()
+ {
+ return (isset($this->dsn['new_link'])
+ && ($this->dsn['new_link'] === true
+ || (is_string($this->dsn['new_link']) && preg_match('/^true$/i', $this->dsn['new_link']))
+ || (is_numeric($this->dsn['new_link']) && 0 != (int)$this->dsn['new_link'])
+ )
+ );
+ }
+
+ // }}}
+ // {{{ function &standaloneQuery($query, $types = null, $is_manip = false)
+
+ /**
+ * execute a query as database administrator
+ *
+ * @param string the SQL query
+ * @param mixed array that contains the types of the columns in
+ * the result set
+ * @param bool if the query is a manipulation query
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function &standaloneQuery($query, $types = null, $is_manip = false)
+ {
+ $offset = $this->offset;
+ $limit = $this->limit;
+ $this->offset = $this->limit = 0;
+ $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
+
+ $connection = $this->getConnection();
+ if (PEAR::isError($connection)) {
+ return $connection;
+ }
+
+ $result =& $this->_doQuery($query, $is_manip, $connection, false);
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+
+ if ($is_manip) {
+ $affected_rows = $this->_affectedRows($connection, $result);
+ return $affected_rows;
+ }
+ $result =& $this->_wrapResult($result, $types, true, false, $limit, $offset);
+ return $result;
+ }
+
+ // }}}
+ // {{{ function _modifyQuery($query, $is_manip, $limit, $offset)
+
+ /**
+ * Changes a query string for various DBMS specific reasons
+ *
+ * @param string query to modify
+ * @param bool if it is a DML query
+ * @param int limit the number of rows
+ * @param int start reading from given offset
+ *
+ * @return string modified query
+ *
+ * @access protected
+ */
+ function _modifyQuery($query, $is_manip, $limit, $offset)
+ {
+ return $query;
+ }
+
+ // }}}
+ // {{{ function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
+
+ /**
+ * Execute a query
+ * @param string query
+ * @param bool if the query is a manipulation query
+ * @param resource connection handle
+ * @param string database name
+ *
+ * @return result or error object
+ *
+ * @access protected
+ */
+ function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
+ {
+ $this->last_query = $query;
+ $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
+ if ($result) {
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+ $query = $result;
+ }
+ $err =& $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ return $err;
+ }
+
+ // }}}
+ // {{{ function _affectedRows($connection, $result = null)
+
+ /**
+ * Returns the number of rows affected
+ *
+ * @param resource result handle
+ * @param resource connection handle
+ *
+ * @return mixed MDB2 Error Object or the number of rows affected
+ *
+ * @access private
+ */
+ function _affectedRows($connection, $result = null)
+ {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function &exec($query)
+
+ /**
+ * Execute a manipulation query to the database and return the number of affected rows
+ *
+ * @param string the SQL query
+ *
+ * @return mixed number of affected rows on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function &exec($query)
+ {
+ $offset = $this->offset;
+ $limit = $this->limit;
+ $this->offset = $this->limit = 0;
+ $query = $this->_modifyQuery($query, true, $limit, $offset);
+
+ $connection = $this->getConnection();
+ if (PEAR::isError($connection)) {
+ return $connection;
+ }
+
+ $result =& $this->_doQuery($query, true, $connection, $this->database_name);
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+
+ $affectedRows = $this->_affectedRows($connection, $result);
+ return $affectedRows;
+ }
+
+ // }}}
+ // {{{ function &query($query, $types = null, $result_class = true, $result_wrap_class = false)
+
+ /**
+ * Send a query to the database and return any results
+ *
+ * @param string the SQL query
+ * @param mixed array that contains the types of the columns in
+ * the result set
+ * @param mixed string which specifies which result class to use
+ * @param mixed string which specifies which class to wrap results in
+ *
+ * @return mixed an MDB2_Result handle on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function &query($query, $types = null, $result_class = true, $result_wrap_class = false)
+ {
+ $offset = $this->offset;
+ $limit = $this->limit;
+ $this->offset = $this->limit = 0;
+ $query = $this->_modifyQuery($query, false, $limit, $offset);
+
+ $connection = $this->getConnection();
+ if (PEAR::isError($connection)) {
+ return $connection;
+ }
+
+ $result =& $this->_doQuery($query, false, $connection, $this->database_name);
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+
+ $result =& $this->_wrapResult($result, $types, $result_class, $result_wrap_class, $limit, $offset);
+ return $result;
+ }
+
+ // }}}
+ // {{{ function &_wrapResult($result, $types = array(), $result_class = true, $result_wrap_class = false, $limit = null, $offset = null)
+
+ /**
+ * wrap a result set into the correct class
+ *
+ * @param resource result handle
+ * @param mixed array that contains the types of the columns in
+ * the result set
+ * @param mixed string which specifies which result class to use
+ * @param mixed string which specifies which class to wrap results in
+ * @param string number of rows to select
+ * @param string first row to select
+ *
+ * @return mixed an MDB2_Result, a MDB2 error on failure
+ *
+ * @access protected
+ */
+ function &_wrapResult($result, $types = array(), $result_class = true,
+ $result_wrap_class = false, $limit = null, $offset = null)
+ {
+ if ($types === true) {
+ if ($this->supports('result_introspection')) {
+ $this->loadModule('Reverse', null, true);
+ $tableInfo = $this->reverse->tableInfo($result);
+ if (PEAR::isError($tableInfo)) {
+ return $tableInfo;
+ }
+ $types = array();
+ foreach ($tableInfo as $field) {
+ $types[] = $field['mdb2type'];
+ }
+ } else {
+ $types = null;
+ }
+ }
+
+ if ($result_class === true) {
+ $result_class = $this->options['result_buffering']
+ ? $this->options['buffered_result_class'] : $this->options['result_class'];
+ }
+
+ if ($result_class) {
+ $class_name = sprintf($result_class, $this->phptype);
+ if (!MDB2::classExists($class_name)) {
+ $err =& $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'result class does not exist '.$class_name, __FUNCTION__);
+ return $err;
+ }
+ $result =& new $class_name($this, $result, $limit, $offset);
+ if (!MDB2::isResultCommon($result)) {
+ $err =& $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'result class is not extended from MDB2_Result_Common', __FUNCTION__);
+ return $err;
+ }
+ if (!empty($types)) {
+ $err = $result->setResultTypes($types);
+ if (PEAR::isError($err)) {
+ $result->free();
+ return $err;
+ }
+ }
+ }
+ if ($result_wrap_class === true) {
+ $result_wrap_class = $this->options['result_wrap_class'];
+ }
+ if ($result_wrap_class) {
+ if (!MDB2::classExists($result_wrap_class)) {
+ $err =& $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'result wrap class does not exist '.$result_wrap_class, __FUNCTION__);
+ return $err;
+ }
+ $result = new $result_wrap_class($result, $this->fetchmode);
+ }
+ return $result;
+ }
+
+ // }}}
+ // {{{ function getServerVersion($native = false)
+
+ /**
+ * return version information about the server
+ *
+ * @param bool determines if the raw version string should be returned
+ *
+ * @return mixed array with version information or row string
+ *
+ * @access public
+ */
+ function getServerVersion($native = false)
+ {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function setLimit($limit, $offset = null)
+
+ /**
+ * set the range of the next query
+ *
+ * @param string number of rows to select
+ * @param string first row to select
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function setLimit($limit, $offset = null)
+ {
+ if (!$this->supports('limit_queries')) {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'limit is not supported by this driver', __FUNCTION__);
+ }
+ $limit = (int)$limit;
+ if ($limit < 0) {
+ return $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+ 'it was not specified a valid selected range row limit', __FUNCTION__);
+ }
+ $this->limit = $limit;
+ if (!is_null($offset)) {
+ $offset = (int)$offset;
+ if ($offset < 0) {
+ return $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+ 'it was not specified a valid first selected range row', __FUNCTION__);
+ }
+ $this->offset = $offset;
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function subSelect($query, $type = false)
+
+ /**
+ * simple subselect emulation: leaves the query untouched for all RDBMS
+ * that support subselects
+ *
+ * @param string the SQL query for the subselect that may only
+ * return a column
+ * @param string determines type of the field
+ *
+ * @return string the query
+ *
+ * @access public
+ */
+ function subSelect($query, $type = false)
+ {
+ if ($this->supports('sub_selects') === true) {
+ return $query;
+ }
+
+ if (!$this->supports('sub_selects')) {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ $col = $this->queryCol($query, $type);
+ if (PEAR::isError($col)) {
+ return $col;
+ }
+ if (!is_array($col) || count($col) == 0) {
+ return 'NULL';
+ }
+ if ($type) {
+ $this->loadModule('Datatype', null, true);
+ return $this->datatype->implodeArray($col, $type);
+ }
+ return implode(', ', $col);
+ }
+
+ // }}}
+ // {{{ function replace($table, $fields)
+
+ /**
+ * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
+ * query, except that if there is already a row in the table with the same
+ * key field values, the old row is deleted before the new row is inserted.
+ *
+ * The REPLACE type of query does not make part of the SQL standards. Since
+ * practically only MySQL and SQLite implement it natively, this type of
+ * query isemulated through this method for other DBMS using standard types
+ * of queries inside a transaction to assure the atomicity of the operation.
+ *
+ * @param string name of the table on which the REPLACE query will
+ * be executed.
+ * @param array associative array that describes the fields and the
+ * values that will be inserted or updated in the specified table. The
+ * indexes of the array are the names of all the fields of the table.
+ * The values of the array are also associative arrays that describe
+ * the values and other properties of the table fields.
+ *
+ * Here follows a list of field properties that need to be specified:
+ *
+ * value
+ * Value to be assigned to the specified field. This value may be
+ * of specified in database independent type format as this
+ * function can perform the necessary datatype conversions.
+ *
+ * Default: this property is required unless the Null property is
+ * set to 1.
+ *
+ * type
+ * Name of the type of the field. Currently, all types MDB2
+ * are supported except for clob and blob.
+ *
+ * Default: no type conversion
+ *
+ * null
+ * bool property that indicates that the value for this field
+ * should be set to null.
+ *
+ * The default value for fields missing in INSERT queries may be
+ * specified the definition of a table. Often, the default value
+ * is already null, but since the REPLACE may be emulated using
+ * an UPDATE query, make sure that all fields of the table are
+ * listed in this function argument array.
+ *
+ * Default: 0
+ *
+ * key
+ * bool property that indicates that this field should be
+ * handled as a primary key or at least as part of the compound
+ * unique index of the table that will determine the row that will
+ * updated if it exists or inserted a new row otherwise.
+ *
+ * This function will fail if no key field is specified or if the
+ * value of a key field is set to null because fields that are
+ * part of unique index they may not be null.
+ *
+ * Default: 0
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function replace($table, $fields)
+ {
+ if (!$this->supports('replace')) {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'replace query is not supported', __FUNCTION__);
+ }
+ $count = count($fields);
+ $condition = $values = array();
+ for ($colnum = 0, reset($fields); $colnum < $count; next($fields), $colnum++) {
+ $name = key($fields);
+ if (isset($fields[$name]['null']) && $fields[$name]['null']) {
+ $value = 'NULL';
+ } else {
+ $type = isset($fields[$name]['type']) ? $fields[$name]['type'] : null;
+ $value = $this->quote($fields[$name]['value'], $type);
+ }
+ $values[$name] = $value;
+ if (isset($fields[$name]['key']) && $fields[$name]['key']) {
+ if ($value === 'NULL') {
+ return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
+ 'key value '.$name.' may not be NULL', __FUNCTION__);
+ }
+ $condition[] = $this->quoteIdentifier($name, true) . '=' . $value;
+ }
+ }
+ if (empty($condition)) {
+ return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
+ 'not specified which fields are keys', __FUNCTION__);
+ }
+
+ $result = null;
+ $in_transaction = $this->in_transaction;
+ if (!$in_transaction && PEAR::isError($result = $this->beginTransaction())) {
+ return $result;
+ }
+
+ $connection = $this->getConnection();
+ if (PEAR::isError($connection)) {
+ return $connection;
+ }
+
+ $condition = ' WHERE '.implode(' AND ', $condition);
+ $query = 'DELETE FROM ' . $this->quoteIdentifier($table, true) . $condition;
+ $result =& $this->_doQuery($query, true, $connection);
+ if (!PEAR::isError($result)) {
+ $affected_rows = $this->_affectedRows($connection, $result);
+ $insert = '';
+ foreach ($values as $key => $value) {
+ $insert .= ($insert?', ':'') . $this->quoteIdentifier($key, true);
+ }
+ $values = implode(', ', $values);
+ $query = 'INSERT INTO '. $this->quoteIdentifier($table, true) . "($insert) VALUES ($values)";
+ $result =& $this->_doQuery($query, true, $connection);
+ if (!PEAR::isError($result)) {
+ $affected_rows += $this->_affectedRows($connection, $result);;
+ }
+ }
+
+ if (!$in_transaction) {
+ if (PEAR::isError($result)) {
+ $this->rollback();
+ } else {
+ $result = $this->commit();
+ }
+ }
+
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+
+ return $affected_rows;
+ }
+
+ // }}}
+ // {{{ function &prepare($query, $types = null, $result_types = null, $lobs = array())
+
+ /**
+ * Prepares a query for multiple execution with execute().
+ * With some database backends, this is emulated.
+ * prepare() requires a generic query as string like
+ * 'INSERT INTO numbers VALUES(?,?)' or
+ * 'INSERT INTO numbers VALUES(:foo,:bar)'.
+ * The ? and :name and are placeholders which can be set using
+ * bindParam() and the query can be sent off using the execute() method.
+ * The allowed format for :name can be set with the 'bindname_format' option.
+ *
+ * @param string the query to prepare
+ * @param mixed array that contains the types of the placeholders
+ * @param mixed array that contains the types of the columns in
+ * the result set or MDB2_PREPARE_RESULT, if set to
+ * MDB2_PREPARE_MANIP the query is handled as a manipulation query
+ * @param mixed key (field) value (parameter) pair for all lob placeholders
+ *
+ * @return mixed resource handle for the prepared query on success,
+ * a MDB2 error on failure
+ *
+ * @access public
+ * @see bindParam, execute
+ */
+ function &prepare($query, $types = null, $result_types = null, $lobs = array())
+ {
+ $is_manip = ($result_types === MDB2_PREPARE_MANIP);
+ $offset = $this->offset;
+ $limit = $this->limit;
+ $this->offset = $this->limit = 0;
+ $result = $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'pre'));
+ if ($result) {
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+ $query = $result;
+ }
+ $placeholder_type_guess = $placeholder_type = null;
+ $question = '?';
+ $colon = ':';
+ $positions = array();
+ $position = 0;
+ while ($position < strlen($query)) {
+ $q_position = strpos($query, $question, $position);
+ $c_position = strpos($query, $colon, $position);
+ if ($q_position && $c_position) {
+ $p_position = min($q_position, $c_position);
+ } elseif ($q_position) {
+ $p_position = $q_position;
+ } elseif ($c_position) {
+ $p_position = $c_position;
+ } else {
+ break;
+ }
+ if (is_null($placeholder_type)) {
+ $placeholder_type_guess = $query[$p_position];
+ }
+
+ $new_pos = $this->_skipDelimitedStrings($query, $position, $p_position);
+ if (PEAR::isError($new_pos)) {
+ return $new_pos;
+ }
+ if ($new_pos != $position) {
+ $position = $new_pos;
+ continue; //evaluate again starting from the new position
+ }
+
+ if ($query[$position] == $placeholder_type_guess) {
+ if (is_null($placeholder_type)) {
+ $placeholder_type = $query[$p_position];
+ $question = $colon = $placeholder_type;
+ if (!empty($types) && is_array($types)) {
+ if ($placeholder_type == ':') {
+ if (is_int(key($types))) {
+ $types_tmp = $types;
+ $types = array();
+ $count = -1;
+ }
+ } else {
+ $types = array_values($types);
+ }
+ }
+ }
+ if ($placeholder_type == ':') {
+ $regexp = '/^.{'.($position+1).'}('.$this->options['bindname_format'].').*$/s';
+ $parameter = preg_replace($regexp, '\\1', $query);
+ if ($parameter === '') {
+ $err =& $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+ 'named parameter name must match "bindname_format" option', __FUNCTION__);
+ return $err;
+ }
+ $positions[$p_position] = $parameter;
+ $query = substr_replace($query, '?', $position, strlen($parameter)+1);
+ // use parameter name in type array
+ if (isset($count) && isset($types_tmp[++$count])) {
+ $types[$parameter] = $types_tmp[$count];
+ }
+ } else {
+ $positions[$p_position] = count($positions);
+ }
+ $position = $p_position + 1;
+ } else {
+ $position = $p_position;
+ }
+ }
+ $class_name = 'MDB2_Statement_'.$this->phptype;
+ $statement = null;
+ $obj = new $class_name($this, $statement, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
+ $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'post', 'result' => $obj));
+ return $obj;
+ }
+
+ // }}}
+ // {{{ function _skipDelimitedStrings($query, $position, $p_position)
+
+ /**
+ * Utility method, used by prepare() to avoid replacing placeholders within delimited strings.
+ * Check if the placeholder is contained within a delimited string.
+ * If so, skip it and advance the position, otherwise return the current position,
+ * which is valid
+ *
+ * @param string $query
+ * @param integer $position current string cursor position
+ * @param integer $p_position placeholder position
+ *
+ * @return mixed integer $new_position on success
+ * MDB2_Error on failure
+ *
+ * @access protected
+ */
+ function _skipDelimitedStrings($query, $position, $p_position)
+ {
+ $ignores = $this->string_quoting;
+ $ignores[] = $this->identifier_quoting;
+ $ignores = array_merge($ignores, $this->sql_comments);
+
+ foreach ($ignores as $ignore) {
+ if (!empty($ignore['start'])) {
+ if (is_int($start_quote = strpos($query, $ignore['start'], $position)) && $start_quote < $p_position) {
+ $end_quote = $start_quote;
+ do {
+ if (!is_int($end_quote = strpos($query, $ignore['end'], $end_quote + 1))) {
+ if ($ignore['end'] === "\n") {
+ $end_quote = strlen($query) - 1;
+ } else {
+ $err =& $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+ 'query with an unterminated text string specified', __FUNCTION__);
+ return $err;
+ }
+ }
+ } while ($ignore['escape']
+ && $end_quote-1 != $start_quote
+ && $query[($end_quote - 1)] == $ignore['escape']
+ && ( $ignore['escape_pattern'] !== $ignore['escape']
+ || $query[($end_quote - 2)] != $ignore['escape'])
+ );
+
+ $position = $end_quote + 1;
+ return $position;
+ }
+ }
+ }
+ return $position;
+ }
+
+ // }}}
+ // {{{ function quote($value, $type = null, $quote = true)
+
+ /**
+ * Convert a text value into a DBMS specific format that is suitable to
+ * compose query statements.
+ *
+ * @param string text string value that is intended to be converted.
+ * @param string type to which the value should be converted to
+ * @param bool quote
+ * @param bool escape wildcards
+ *
+ * @return string text string that represents the given argument value in
+ * a DBMS specific format.
+ *
+ * @access public
+ */
+ function quote($value, $type = null, $quote = true, $escape_wildcards = false)
+ {
+ $result = $this->loadModule('Datatype', null, true);
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+
+ return $this->datatype->quote($value, $type, $quote, $escape_wildcards);
+ }
+
+ // }}}
+ // {{{ function getDeclaration($type, $name, $field)
+
+ /**
+ * Obtain DBMS specific SQL code portion needed to declare
+ * of the given type
+ *
+ * @param string type to which the value should be converted to
+ * @param string name the field to be declared.
+ * @param string definition of the field
+ *
+ * @return string DBMS specific SQL code portion that should be used to
+ * declare the specified field.
+ *
+ * @access public
+ */
+ function getDeclaration($type, $name, $field)
+ {
+ $result = $this->loadModule('Datatype', null, true);
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+ return $this->datatype->getDeclaration($type, $name, $field);
+ }
+
+ // }}}
+ // {{{ function compareDefinition($current, $previous)
+
+ /**
+ * Obtain an array of changes that may need to applied
+ *
+ * @param array new definition
+ * @param array old definition
+ *
+ * @return array containing all changes that will need to be applied
+ *
+ * @access public
+ */
+ function compareDefinition($current, $previous)
+ {
+ $result = $this->loadModule('Datatype', null, true);
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+ return $this->datatype->compareDefinition($current, $previous);
+ }
+
+ // }}}
+ // {{{ function supports($feature)
+
+ /**
+ * Tell whether a DB implementation or its backend extension
+ * supports a given feature.
+ *
+ * @param string name of the feature (see the MDB2 class doc)
+ *
+ * @return bool|string if this DB implementation supports a given feature
+ * false means no, true means native,
+ * 'emulated' means emulated
+ *
+ * @access public
+ */
+ function supports($feature)
+ {
+ if (array_key_exists($feature, $this->supported)) {
+ return $this->supported[$feature];
+ }
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ "unknown support feature $feature", __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function getSequenceName($sqn)
+
+ /**
+ * adds sequence name formatting to a sequence name
+ *
+ * @param string name of the sequence
+ *
+ * @return string formatted sequence name
+ *
+ * @access public
+ */
+ function getSequenceName($sqn)
+ {
+ return sprintf($this->options['seqname_format'],
+ preg_replace('/[^a-z0-9_\-\$.]/i', '_', $sqn));
+ }
+
+ // }}}
+ // {{{ function getIndexName($idx)
+
+ /**
+ * adds index name formatting to a index name
+ *
+ * @param string name of the index
+ *
+ * @return string formatted index name
+ *
+ * @access public
+ */
+ function getIndexName($idx)
+ {
+ return sprintf($this->options['idxname_format'],
+ preg_replace('/[^a-z0-9_\-\$.]/i', '_', $idx));
+ }
+
+ // }}}
+ // {{{ function nextID($seq_name, $ondemand = true)
+
+ /**
+ * Returns the next free id of a sequence
+ *
+ * @param string name of the sequence
+ * @param bool when true missing sequences are automatic created
+ *
+ * @return mixed MDB2 Error Object or id
+ *
+ * @access public
+ */
+ function nextID($seq_name, $ondemand = true)
+ {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function lastInsertID($table = null, $field = null)
+
+ /**
+ * Returns the autoincrement ID if supported or $id or fetches the current
+ * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
+ *
+ * @param string name of the table into which a new row was inserted
+ * @param string name of the field into which a new row was inserted
+ *
+ * @return mixed MDB2 Error Object or id
+ *
+ * @access public
+ */
+ function lastInsertID($table = null, $field = null)
+ {
+ return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function currID($seq_name)
+
+ /**
+ * Returns the current id of a sequence
+ *
+ * @param string name of the sequence
+ *
+ * @return mixed MDB2 Error Object or id
+ *
+ * @access public
+ */
+ function currID($seq_name)
+ {
+ $this->warnings[] = 'database does not support getting current
+ sequence value, the sequence value was incremented';
+ return $this->nextID($seq_name);
+ }
+
+ // }}}
+ // {{{ function queryOne($query, $type = null, $colnum = 0)
+
+ /**
+ * Execute the specified query, fetch the value from the first column of
+ * the first row of the result set and then frees
+ * the result set.
+ *
+ * @param string $query the SELECT query statement to be executed.
+ * @param string $type optional argument that specifies the expected
+ * datatype of the result set field, so that an eventual
+ * conversion may be performed. The default datatype is
+ * text, meaning that no conversion is performed
+ * @param mixed $colnum the column number (or name) to fetch
+ *
+ * @return mixed MDB2_OK or field value on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function queryOne($query, $type = null, $colnum = 0)
+ {
+ $result = $this->query($query, $type);
+ if (!MDB2::isResultCommon($result)) {
+ return $result;
+ }
+
+ $one = $result->fetchOne($colnum);
+ $result->free();
+ return $one;
+ }
+
+ // }}}
+ // {{{ function queryRow($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT)
+
+ /**
+ * Execute the specified query, fetch the values from the first
+ * row of the result set into an array and then frees
+ * the result set.
+ *
+ * @param string the SELECT query statement to be executed.
+ * @param array optional array argument that specifies a list of
+ * expected datatypes of the result set columns, so that the eventual
+ * conversions may be performed. The default list of datatypes is
+ * empty, meaning that no conversion is performed.
+ * @param int how the array data should be indexed
+ *
+ * @return mixed MDB2_OK or data array on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function queryRow($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT)
+ {
+ $result = $this->query($query, $types);
+ if (!MDB2::isResultCommon($result)) {
+ return $result;
+ }
+
+ $row = $result->fetchRow($fetchmode);
+ $result->free();
+ return $row;
+ }
+
+ // }}}
+ // {{{ function queryCol($query, $type = null, $colnum = 0)
+
+ /**
+ * Execute the specified query, fetch the value from the first column of
+ * each row of the result set into an array and then frees the result set.
+ *
+ * @param string $query the SELECT query statement to be executed.
+ * @param string $type optional argument that specifies the expected
+ * datatype of the result set field, so that an eventual
+ * conversion may be performed. The default datatype is text,
+ * meaning that no conversion is performed
+ * @param mixed $colnum the column number (or name) to fetch
+ *
+ * @return mixed MDB2_OK or data array on success, a MDB2 error on failure
+ * @access public
+ */
+ function queryCol($query, $type = null, $colnum = 0)
+ {
+ $result = $this->query($query, $type);
+ if (!MDB2::isResultCommon($result)) {
+ return $result;
+ }
+
+ $col = $result->fetchCol($colnum);
+ $result->free();
+ return $col;
+ }
+
+ // }}}
+ // {{{ function queryAll($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT, $rekey = false, $force_array = false, $group = false)
+
+ /**
+ * Execute the specified query, fetch all the rows of the result set into
+ * a two dimensional array and then frees the result set.
+ *
+ * @param string the SELECT query statement to be executed.
+ * @param array optional array argument that specifies a list of
+ * expected datatypes of the result set columns, so that the eventual
+ * conversions may be performed. The default list of datatypes is
+ * empty, meaning that no conversion is performed.
+ * @param int how the array data should be indexed
+ * @param bool if set to true, the $all will have the first
+ * column as its first dimension
+ * @param bool used only when the query returns exactly
+ * two columns. If true, the values of the returned array will be
+ * one-element arrays instead of scalars.
+ * @param bool if true, the values of the returned array is
+ * wrapped in another array. If the same key value (in the first
+ * column) repeats itself, the values will be appended to this array
+ * instead of overwriting the existing values.
+ *
+ * @return mixed MDB2_OK or data array on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function queryAll($query, $types = null, $fetchmode = MDB2_FETCHMODE_DEFAULT,
+ $rekey = false, $force_array = false, $group = false)
+ {
+ $result = $this->query($query, $types);
+ if (!MDB2::isResultCommon($result)) {
+ return $result;
+ }
+
+ $all = $result->fetchAll($fetchmode, $rekey, $force_array, $group);
+ $result->free();
+ return $all;
+ }
+
+ // }}}
+}
+
+// }}}
+// {{{ class MDB2_Result
+
+/**
+ * The dummy class that all user space result classes should extend from
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith
+ */
+class MDB2_Result
+{
+}
+
+// }}}
+// {{{ class MDB2_Result_Common extends MDB2_Result
+
+/**
+ * The common result class for MDB2 result objects
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith
+ */
+class MDB2_Result_Common extends MDB2_Result
+{
+ // {{{ Variables (Properties)
+
+ var $db;
+ var $result;
+ var $rownum = -1;
+ var $types = array();
+ var $values = array();
+ var $offset;
+ var $offset_count = 0;
+ var $limit;
+ var $column_names;
+
+ // }}}
+ // {{{ constructor: function __construct(&$db, &$result, $limit = 0, $offset = 0)
+
+ /**
+ * Constructor
+ */
+ function __construct(&$db, &$result, $limit = 0, $offset = 0)
+ {
+ $this->db =& $db;
+ $this->result =& $result;
+ $this->offset = $offset;
+ $this->limit = max(0, $limit - 1);
+ }
+
+ // }}}
+ // {{{ function MDB2_Result_Common(&$db, &$result, $limit = 0, $offset = 0)
+
+ /**
+ * PHP 4 Constructor
+ */
+ function MDB2_Result_Common(&$db, &$result, $limit = 0, $offset = 0)
+ {
+ $this->__construct($db, $result, $limit, $offset);
+ }
+
+ // }}}
+ // {{{ function setResultTypes($types)
+
+ /**
+ * Define the list of types to be associated with the columns of a given
+ * result set.
+ *
+ * This function may be called before invoking fetchRow(), fetchOne(),
+ * fetchCol() and fetchAll() so that the necessary data type
+ * conversions are performed on the data to be retrieved by them. If this
+ * function is not called, the type of all result set columns is assumed
+ * to be text, thus leading to not perform any conversions.
+ *
+ * @param array variable that lists the
+ * data types to be expected in the result set columns. If this array
+ * contains less types than the number of columns that are returned
+ * in the result set, the remaining columns are assumed to be of the
+ * type text. Currently, the types clob and blob are not fully
+ * supported.
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function setResultTypes($types)
+ {
+ $load = $this->db->loadModule('Datatype', null, true);
+ if (PEAR::isError($load)) {
+ return $load;
+ }
+ $types = $this->db->datatype->checkResultTypes($types);
+ if (PEAR::isError($types)) {
+ return $types;
+ }
+ $this->types = $types;
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function seek($rownum = 0)
+
+ /**
+ * Seek to a specific row in a result set
+ *
+ * @param int number of the row where the data can be found
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function seek($rownum = 0)
+ {
+ $target_rownum = $rownum - 1;
+ if ($this->rownum > $target_rownum) {
+ return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'seeking to previous rows not implemented', __FUNCTION__);
+ }
+ while ($this->rownum < $target_rownum) {
+ $this->fetchRow();
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+
+ /**
+ * Fetch and return a row of data
+ *
+ * @param int how the array data should be indexed
+ * @param int number of the row where the data can be found
+ *
+ * @return int data array on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+ {
+ $err =& $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ return $err;
+ }
+
+ // }}}
+ // {{{ function fetchOne($colnum = 0)
+
+ /**
+ * fetch single column from the next row from a result set
+ *
+ * @param int|string the column number (or name) to fetch
+ * @param int number of the row where the data can be found
+ *
+ * @return string data on success, a MDB2 error on failure
+ * @access public
+ */
+ function fetchOne($colnum = 0, $rownum = null)
+ {
+ $fetchmode = is_numeric($colnum) ? MDB2_FETCHMODE_ORDERED : MDB2_FETCHMODE_ASSOC;
+ $row = $this->fetchRow($fetchmode, $rownum);
+ if (!is_array($row) || PEAR::isError($row)) {
+ return $row;
+ }
+ if (!array_key_exists($colnum, $row)) {
+ return $this->db->raiseError(MDB2_ERROR_TRUNCATED, null, null,
+ 'column is not defined in the result set: '.$colnum, __FUNCTION__);
+ }
+ return $row[$colnum];
+ }
+
+ // }}}
+ // {{{ function fetchCol($colnum = 0)
+
+ /**
+ * Fetch and return a column from the current row pointer position
+ *
+ * @param int|string the column number (or name) to fetch
+ *
+ * @return mixed data array on success, a MDB2 error on failure
+ * @access public
+ */
+ function fetchCol($colnum = 0)
+ {
+ $column = array();
+ $fetchmode = is_numeric($colnum) ? MDB2_FETCHMODE_ORDERED : MDB2_FETCHMODE_ASSOC;
+ $row = $this->fetchRow($fetchmode);
+ if (is_array($row)) {
+ if (!array_key_exists($colnum, $row)) {
+ return $this->db->raiseError(MDB2_ERROR_TRUNCATED, null, null,
+ 'column is not defined in the result set: '.$colnum, __FUNCTION__);
+ }
+ do {
+ $column[] = $row[$colnum];
+ } while (is_array($row = $this->fetchRow($fetchmode)));
+ }
+ if (PEAR::isError($row)) {
+ return $row;
+ }
+ return $column;
+ }
+
+ // }}}
+ // {{{ function fetchAll($fetchmode = MDB2_FETCHMODE_DEFAULT, $rekey = false, $force_array = false, $group = false)
+
+ /**
+ * Fetch and return all rows from the current row pointer position
+ *
+ * @param int $fetchmode the fetch mode to use:
+ * + MDB2_FETCHMODE_ORDERED
+ * + MDB2_FETCHMODE_ASSOC
+ * + MDB2_FETCHMODE_ORDERED | MDB2_FETCHMODE_FLIPPED
+ * + MDB2_FETCHMODE_ASSOC | MDB2_FETCHMODE_FLIPPED
+ * @param bool if set to true, the $all will have the first
+ * column as its first dimension
+ * @param bool used only when the query returns exactly
+ * two columns. If true, the values of the returned array will be
+ * one-element arrays instead of scalars.
+ * @param bool if true, the values of the returned array is
+ * wrapped in another array. If the same key value (in the first
+ * column) repeats itself, the values will be appended to this array
+ * instead of overwriting the existing values.
+ *
+ * @return mixed data array on success, a MDB2 error on failure
+ *
+ * @access public
+ * @see getAssoc()
+ */
+ function fetchAll($fetchmode = MDB2_FETCHMODE_DEFAULT, $rekey = false,
+ $force_array = false, $group = false)
+ {
+ $all = array();
+ $row = $this->fetchRow($fetchmode);
+ if (PEAR::isError($row)) {
+ return $row;
+ } elseif (!$row) {
+ return $all;
+ }
+
+ $shift_array = $rekey ? false : null;
+ if (!is_null($shift_array)) {
+ if (is_object($row)) {
+ $colnum = count(get_object_vars($row));
+ } else {
+ $colnum = count($row);
+ }
+ if ($colnum < 2) {
+ return $this->db->raiseError(MDB2_ERROR_TRUNCATED, null, null,
+ 'rekey feature requires atleast 2 column', __FUNCTION__);
+ }
+ $shift_array = (!$force_array && $colnum == 2);
+ }
+
+ if ($rekey) {
+ do {
+ if (is_object($row)) {
+ $arr = get_object_vars($row);
+ $key = reset($arr);
+ unset($row->{$key});
+ } else {
+ if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
+ $key = reset($row);
+ unset($row[key($row)]);
+ } else {
+ $key = array_shift($row);
+ }
+ if ($shift_array) {
+ $row = array_shift($row);
+ }
+ }
+ if ($group) {
+ $all[$key][] = $row;
+ } else {
+ $all[$key] = $row;
+ }
+ } while (($row = $this->fetchRow($fetchmode)));
+ } elseif ($fetchmode & MDB2_FETCHMODE_FLIPPED) {
+ do {
+ foreach ($row as $key => $val) {
+ $all[$key][] = $val;
+ }
+ } while (($row = $this->fetchRow($fetchmode)));
+ } else {
+ do {
+ $all[] = $row;
+ } while (($row = $this->fetchRow($fetchmode)));
+ }
+
+ return $all;
+ }
+
+ // }}}
+ // {{{ function rowCount()
+ /**
+ * Returns the actual row number that was last fetched (count from 0)
+ * @return int
+ *
+ * @access public
+ */
+ function rowCount()
+ {
+ return $this->rownum + 1;
+ }
+
+ // }}}
+ // {{{ function numRows()
+
+ /**
+ * Returns the number of rows in a result object
+ *
+ * @return mixed MDB2 Error Object or the number of rows
+ *
+ * @access public
+ */
+ function numRows()
+ {
+ return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function nextResult()
+
+ /**
+ * Move the internal result pointer to the next available result
+ *
+ * @return true on success, false if there is no more result set or an error object on failure
+ *
+ * @access public
+ */
+ function nextResult()
+ {
+ return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function getColumnNames()
+
+ /**
+ * Retrieve the names of columns returned by the DBMS in a query result or
+ * from the cache.
+ *
+ * @param bool If set to true the values are the column names,
+ * otherwise the names of the columns are the keys.
+ * @return mixed Array variable that holds the names of columns or an
+ * MDB2 error on failure.
+ * Some DBMS may not return any columns when the result set
+ * does not contain any rows.
+ *
+ * @access public
+ */
+ function getColumnNames($flip = false)
+ {
+ if (!isset($this->column_names)) {
+ $result = $this->_getColumnNames();
+ if (PEAR::isError($result)) {
+ return $result;
+ }
+ $this->column_names = $result;
+ }
+ if ($flip) {
+ return array_flip($this->column_names);
+ }
+ return $this->column_names;
+ }
+
+ // }}}
+ // {{{ function _getColumnNames()
+
+ /**
+ * Retrieve the names of columns returned by the DBMS in a query result.
+ *
+ * @return mixed Array variable that holds the names of columns as keys
+ * or an MDB2 error on failure.
+ * Some DBMS may not return any columns when the result set
+ * does not contain any rows.
+ *
+ * @access private
+ */
+ function _getColumnNames()
+ {
+ return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function numCols()
+
+ /**
+ * Count the number of columns returned by the DBMS in a query result.
+ *
+ * @return mixed integer value with the number of columns, a MDB2 error
+ * on failure
+ *
+ * @access public
+ */
+ function numCols()
+ {
+ return $this->db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+ 'method not implemented', __FUNCTION__);
+ }
+
+ // }}}
+ // {{{ function getResource()
+
+ /**
+ * return the resource associated with the result object
+ *
+ * @return resource
+ *
+ * @access public
+ */
+ function getResource()
+ {
+ return $this->result;
+ }
+
+ // }}}
+ // {{{ function bindColumn($column, &$value, $type = null)
+
+ /**
+ * Set bind variable to a column.
+ *
+ * @param int column number or name
+ * @param mixed variable reference
+ * @param string specifies the type of the field
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function bindColumn($column, &$value, $type = null)
+ {
+ if (!is_numeric($column)) {
+ $column_names = $this->getColumnNames();
+ if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+ if ($this->db->options['field_case'] == CASE_LOWER) {
+ $column = strtolower($column);
+ } else {
+ $column = strtoupper($column);
+ }
+ }
+ $column = $column_names[$column];
+ }
+ $this->values[$column] =& $value;
+ if (!is_null($type)) {
+ $this->types[$column] = $type;
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function _assignBindColumns($row)
+
+ /**
+ * Bind a variable to a value in the result row.
+ *
+ * @param array row data
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access private
+ */
+ function _assignBindColumns($row)
+ {
+ $row = array_values($row);
+ foreach ($row as $column => $value) {
+ if (array_key_exists($column, $this->values)) {
+ $this->values[$column] = $value;
+ }
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function free()
+
+ /**
+ * Free the internal resources associated with result.
+ *
+ * @return bool true on success, false if result is invalid
+ *
+ * @access public
+ */
+ function free()
+ {
+ $this->result = false;
+ return MDB2_OK;
+ }
+
+ // }}}
+}
+
+// }}}
+// {{{ class MDB2_Row
+
+/**
+ * The simple class that accepts row data as an array
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith
+ */
+class MDB2_Row
+{
+ // {{{ constructor: function __construct(&$row)
+
+ /**
+ * constructor
+ *
+ * @param resource row data as array
+ */
+ function __construct(&$row)
+ {
+ foreach ($row as $key => $value) {
+ $this->$key = &$row[$key];
+ }
+ }
+
+ // }}}
+ // {{{ function MDB2_Row(&$row)
+
+ /**
+ * PHP 4 Constructor
+ *
+ * @param resource row data as array
+ */
+ function MDB2_Row(&$row)
+ {
+ $this->__construct($row);
+ }
+
+ // }}}
+}
+
+// }}}
+// {{{ class MDB2_Statement_Common
+
+/**
+ * The common statement class for MDB2 statement objects
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith
+ */
+class MDB2_Statement_Common
+{
+ // {{{ Variables (Properties)
+
+ var $db;
+ var $statement;
+ var $query;
+ var $result_types;
+ var $types;
+ var $values = array();
+ var $limit;
+ var $offset;
+ var $is_manip;
+
+ // }}}
+ // {{{ constructor: function __construct(&$db, &$statement, $positions, $query, $types, $result_types, $is_manip = false, $limit = null, $offset = null)
+
+ /**
+ * Constructor
+ */
+ function __construct(&$db, &$statement, $positions, $query, $types, $result_types, $is_manip = false, $limit = null, $offset = null)
+ {
+ $this->db =& $db;
+ $this->statement =& $statement;
+ $this->positions = $positions;
+ $this->query = $query;
+ $this->types = (array)$types;
+ $this->result_types = (array)$result_types;
+ $this->limit = $limit;
+ $this->is_manip = $is_manip;
+ $this->offset = $offset;
+ }
+
+ // }}}
+ // {{{ function MDB2_Statement_Common(&$db, &$statement, $positions, $query, $types, $result_types, $is_manip = false, $limit = null, $offset = null)
+
+ /**
+ * PHP 4 Constructor
+ */
+ function MDB2_Statement_Common(&$db, &$statement, $positions, $query, $types, $result_types, $is_manip = false, $limit = null, $offset = null)
+ {
+ $this->__construct($db, $statement, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
+ }
+
+ // }}}
+ // {{{ function bindValue($parameter, &$value, $type = null)
+
+ /**
+ * Set the value of a parameter of a prepared query.
+ *
+ * @param int the order number of the parameter in the query
+ * statement. The order number of the first parameter is 1.
+ * @param mixed value that is meant to be assigned to specified
+ * parameter. The type of the value depends on the $type argument.
+ * @param string specifies the type of the field
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function bindValue($parameter, $value, $type = null)
+ {
+ if (!is_numeric($parameter)) {
+ $parameter = preg_replace('/^:(.*)$/', '\\1', $parameter);
+ }
+ if (!in_array($parameter, $this->positions)) {
+ return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
+ }
+ $this->values[$parameter] = $value;
+ if (!is_null($type)) {
+ $this->types[$parameter] = $type;
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function bindValueArray($values, $types = null)
+
+ /**
+ * Set the values of multiple a parameter of a prepared query in bulk.
+ *
+ * @param array specifies all necessary information
+ * for bindValue() the array elements must use keys corresponding to
+ * the number of the position of the parameter.
+ * @param array specifies the types of the fields
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ * @see bindParam()
+ */
+ function bindValueArray($values, $types = null)
+ {
+ $types = is_array($types) ? array_values($types) : array_fill(0, count($values), null);
+ $parameters = array_keys($values);
+ foreach ($parameters as $key => $parameter) {
+ $this->db->pushErrorHandling(PEAR_ERROR_RETURN);
+ $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+ $err = $this->bindValue($parameter, $values[$parameter], $types[$key]);
+ $this->db->popExpect();
+ $this->db->popErrorHandling();
+ if (PEAR::isError($err)) {
+ if ($err->getCode() == MDB2_ERROR_NOT_FOUND) {
+ //ignore (extra value for missing placeholder)
+ continue;
+ }
+ return $err;
+ }
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function bindParam($parameter, &$value, $type = null)
+
+ /**
+ * Bind a variable to a parameter of a prepared query.
+ *
+ * @param int the order number of the parameter in the query
+ * statement. The order number of the first parameter is 1.
+ * @param mixed variable that is meant to be bound to specified
+ * parameter. The type of the value depends on the $type argument.
+ * @param string specifies the type of the field
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function bindParam($parameter, &$value, $type = null)
+ {
+ if (!is_numeric($parameter)) {
+ $parameter = preg_replace('/^:(.*)$/', '\\1', $parameter);
+ }
+ if (!in_array($parameter, $this->positions)) {
+ return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
+ }
+ $this->values[$parameter] =& $value;
+ if (!is_null($type)) {
+ $this->types[$parameter] = $type;
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function bindParamArray(&$values, $types = null)
+
+ /**
+ * Bind the variables of multiple a parameter of a prepared query in bulk.
+ *
+ * @param array specifies all necessary information
+ * for bindParam() the array elements must use keys corresponding to
+ * the number of the position of the parameter.
+ * @param array specifies the types of the fields
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ * @see bindParam()
+ */
+ function bindParamArray(&$values, $types = null)
+ {
+ $types = is_array($types) ? array_values($types) : array_fill(0, count($values), null);
+ $parameters = array_keys($values);
+ foreach ($parameters as $key => $parameter) {
+ $err = $this->bindParam($parameter, $values[$parameter], $types[$key]);
+ if (PEAR::isError($err)) {
+ return $err;
+ }
+ }
+ return MDB2_OK;
+ }
+
+ // }}}
+ // {{{ function &execute($values = null, $result_class = true, $result_wrap_class = false)
+
+ /**
+ * Execute a prepared query statement.
+ *
+ * @param array specifies all necessary information
+ * for bindParam() the array elements must use keys corresponding
+ * to the number of the position of the parameter.
+ * @param mixed specifies which result class to use
+ * @param mixed specifies which class to wrap results in
+ *
+ * @return mixed MDB2_Result or integer (affected rows) on success,
+ * a MDB2 error on failure
+ * @access public
+ */
+ function &execute($values = null, $result_class = true, $result_wrap_class = false)
+ {
+ if (is_null($this->positions)) {
+ return $this->db->raiseError(MDB2_ERROR, null, null,
+ 'Prepared statement has already been freed', __FUNCTION__);
+ }
+
+ $values = (array)$values;
+ if (!empty($values)) {
+ $err = $this->bindValueArray($values);
+ if (PEAR::isError($err)) {
+ return $this->db->raiseError(MDB2_ERROR, null, null,
+ 'Binding Values failed with message: ' . $err->getMessage(), __FUNCTION__);
+ }
+ }
+ $result =& $this->_execute($result_class, $result_wrap_class);
+ return $result;
+ }
+
+ // }}}
+ // {{{ function &_execute($result_class = true, $result_wrap_class = false)
+
+ /**
+ * Execute a prepared query statement helper method.
+ *
+ * @param mixed specifies which result class to use
+ * @param mixed specifies which class to wrap results in
+ *
+ * @return mixed MDB2_Result or integer (affected rows) on success,
+ * a MDB2 error on failure
+ * @access private
+ */
+ function &_execute($result_class = true, $result_wrap_class = false)
+ {
+ $this->last_query = $this->query;
+ $query = '';
+ $last_position = 0;
+ foreach ($this->positions as $current_position => $parameter) {
+ if (!array_key_exists($parameter, $this->values)) {
+ return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
+ }
+ $value = $this->values[$parameter];
+ $query.= substr($this->query, $last_position, $current_position - $last_position);
+ if (!isset($value)) {
+ $value_quoted = 'NULL';
+ } else {
+ $type = !empty($this->types[$parameter]) ? $this->types[$parameter] : null;
+ $value_quoted = $this->db->quote($value, $type);
+ if (PEAR::isError($value_quoted)) {
+ return $value_quoted;
+ }
+ }
+ $query.= $value_quoted;
+ $last_position = $current_position + 1;
+ }
+ $query.= substr($this->query, $last_position);
+
+ $this->db->offset = $this->offset;
+ $this->db->limit = $this->limit;
+ if ($this->is_manip) {
+ $result = $this->db->exec($query);
+ } else {
+ $result =& $this->db->query($query, $this->result_types, $result_class, $result_wrap_class);
+ }
+ return $result;
+ }
+
+ // }}}
+ // {{{ function free()
+
+ /**
+ * Release resources allocated for the specified prepared query.
+ *
+ * @return mixed MDB2_OK on success, a MDB2 error on failure
+ *
+ * @access public
+ */
+ function free()
+ {
+ if (is_null($this->positions)) {
+ return $this->db->raiseError(MDB2_ERROR, null, null,
+ 'Prepared statement has already been freed', __FUNCTION__);
+ }
+
+ $this->statement = null;
+ $this->positions = null;
+ $this->query = null;
+ $this->types = null;
+ $this->result_types = null;
+ $this->limit = null;
+ $this->is_manip = null;
+ $this->offset = null;
+ $this->values = null;
+
+ return MDB2_OK;
+ }
+
+ // }}}
+}
+
+// }}}
+// {{{ class MDB2_Module_Common
+
+/**
+ * The common modules class for MDB2 module objects
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith
+ */
+class MDB2_Module_Common
+{
+ // {{{ Variables (Properties)
+
+ /**
+ * contains the key to the global MDB2 instance array of the associated
+ * MDB2 instance
+ *
+ * @var int
+ * @access protected
+ */
+ var $db_index;
+
+ // }}}
+ // {{{ constructor: function __construct($db_index)
+
+ /**
+ * Constructor
+ */
+ function __construct($db_index)
+ {
+ $this->db_index = $db_index;
+ }
+
+ // }}}
+ // {{{ function MDB2_Module_Common($db_index)
+
+ /**
+ * PHP 4 Constructor
+ */
+ function MDB2_Module_Common($db_index)
+ {
+ $this->__construct($db_index);
+ }
+
+ // }}}
+ // {{{ function &getDBInstance()
+
+ /**
+ * Get the instance of MDB2 associated with the module instance
+ *
+ * @return object MDB2 instance or a MDB2 error on failure
+ *
+ * @access public
+ */
+ function &getDBInstance()
+ {
+ if (isset($GLOBALS['_MDB2_databases'][$this->db_index])) {
+ $result =& $GLOBALS['_MDB2_databases'][$this->db_index];
+ } else {
+ $result =& MDB2::raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+ 'could not find MDB2 instance');
+ }
+ return $result;
+ }
+
+ // }}}
+}
+
+// }}}
+// {{{ function MDB2_closeOpenTransactions()
+
+/**
+ * Close any open transactions form persistent connections
+ *
+ * @return void
+ *
+ * @access public
+ */
+
+function MDB2_closeOpenTransactions()
+{
+ reset($GLOBALS['_MDB2_databases']);
+ while (next($GLOBALS['_MDB2_databases'])) {
+ $key = key($GLOBALS['_MDB2_databases']);
+ if ($GLOBALS['_MDB2_databases'][$key]->opened_persistent
+ && $GLOBALS['_MDB2_databases'][$key]->in_transaction
+ ) {
+ $GLOBALS['_MDB2_databases'][$key]->rollback();
+ }
+ }
+}
+
+// }}}
+// {{{ function MDB2_defaultDebugOutput(&$db, $scope, $message, $is_manip = null)
+
+/**
+ * default debug output handler
+ *
+ * @param object reference to an MDB2 database object
+ * @param string usually the method name that triggered the debug call:
+ * for example 'query', 'prepare', 'execute', 'parameters',
+ * 'beginTransaction', 'commit', 'rollback'
+ * @param string message that should be appended to the debug variable
+ * @param array contains context information about the debug() call
+ * common keys are: is_manip, time, result etc.
+ *
+ * @return void|string optionally return a modified message, this allows
+ * rewriting a query before being issued or prepared
+ *
+ * @access public
+ */
+function MDB2_defaultDebugOutput(&$db, $scope, $message, $context = array())
+{
+ $db->debug_output.= $scope.'('.$db->db_index.'): ';
+ $db->debug_output.= $message.$db->getOption('log_line_break');
+ return $message;
+}
+
+// }}}
+?>
Index: /closed/version-2_5-dev/data/module/Tar.php
===================================================================
--- /closed/version-2_5-dev/data/module/Tar.php (revision 20116)
+++ /closed/version-2_5-dev/data/module/Tar.php (revision 20116)
@@ -0,0 +1,1767 @@
+ |
+// +----------------------------------------------------------------------+
+//
+// $Id$
+
+if(!defined('TAR_PHP_DIR')) {
+ $TAR_PHP_DIR = realpath(dirname( __FILE__));
+ define("TAR_PHP_DIR", $TAR_PHP_DIR);
+}
+
+require_once TAR_PHP_DIR . '/PEAR.php';
+
+
+define ('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
+
+/**
+* Creates a (compressed) Tar archive
+*
+* @author Vincent Blavet
+* @version $Revision: 4772 $
+* @package Archive
+*/
+class Archive_Tar extends PEAR
+{
+ /**
+ * @var string Name of the Tar
+ */
+ var $_tarname='';
+
+ /**
+ * @var boolean if true, the Tar file will be gzipped
+ */
+ var $_compress=false;
+
+ /**
+ * @var string Type of compression : 'none', 'gz' or 'bz2'
+ */
+ var $_compress_type='none';
+
+ /**
+ * @var string Explode separator
+ */
+ var $_separator=' ';
+
+ /**
+ * @var file descriptor
+ */
+ var $_file=0;
+
+ /**
+ * @var string Local Tar name of a remote Tar (http:// or ftp://)
+ */
+ var $_temp_tarname='';
+
+ // {{{ constructor
+ /**
+ * Archive_Tar Class constructor. This flavour of the constructor only
+ * declare a new Archive_Tar object, identifying it by the name of the
+ * tar file.
+ * If the compress argument is set the tar will be read or created as a
+ * gzip or bz2 compressed TAR file.
+ *
+ * @param string $p_tarname The name of the tar archive to create
+ * @param string $p_compress can be null, 'gz' or 'bz2'. This
+ * parameter indicates if gzip or bz2 compression
+ * is required. For compatibility reason the
+ * boolean value 'true' means 'gz'.
+ * @access public
+ */
+ function Archive_Tar($p_tarname, $p_compress = null)
+ {
+ $this->PEAR();
+ $this->_compress = false;
+ $this->_compress_type = 'none';
+ if (($p_compress === null) || ($p_compress == '')) {
+ if (@file_exists($p_tarname)) {
+ if ($fp = @fopen($p_tarname, "rb")) {
+ // look for gzip magic cookie
+ $data = fread($fp, 2);
+ fclose($fp);
+ if ($data == "\37\213") {
+ $this->_compress = true;
+ $this->_compress_type = 'gz';
+ // No sure it's enought for a magic code ....
+ } elseif ($data == "BZ") {
+ $this->_compress = true;
+ $this->_compress_type = 'bz2';
+ }
+ }
+ } else {
+ // probably a remote file or some file accessible
+ // through a stream interface
+ if (substr($p_tarname, -2) == 'gz') {
+ $this->_compress = true;
+ $this->_compress_type = 'gz';
+ } elseif ((substr($p_tarname, -3) == 'bz2') ||
+ (substr($p_tarname, -2) == 'bz')) {
+ $this->_compress = true;
+ $this->_compress_type = 'bz2';
+ }
+ }
+ } else {
+ if (($p_compress === true) || ($p_compress == 'gz')) {
+ $this->_compress = true;
+ $this->_compress_type = 'gz';
+ } else if ($p_compress == 'bz2') {
+ $this->_compress = true;
+ $this->_compress_type = 'bz2';
+ } else {
+ die("Unsupported compression type '$p_compress'\n".
+ "Supported types are 'gz' and 'bz2'.\n");
+ return false;
+ }
+ }
+ $this->_tarname = $p_tarname;
+ if ($this->_compress) { // assert zlib or bz2 extension support
+ if ($this->_compress_type == 'gz')
+ $extname = 'zlib';
+ else if ($this->_compress_type == 'bz2')
+ $extname = 'bz2';
+
+ if (!extension_loaded($extname)) {
+ PEAR::loadExtension($extname);
+ }
+ if (!extension_loaded($extname)) {
+ die("The extension '$extname' couldn't be found.\n".
+ "Please make sure your version of PHP was built ".
+ "with '$extname' support.\n");
+ return false;
+ }
+ }
+ }
+ // }}}
+
+ // {{{ destructor
+ function _Archive_Tar()
+ {
+ $this->_close();
+ // ----- Look for a local copy to delete
+ if ($this->_temp_tarname != '')
+ @unlink($this->_temp_tarname);
+ $this->_PEAR();
+ }
+ // }}}
+
+ // {{{ create()
+ /**
+ * This method creates the archive file and add the files / directories
+ * that are listed in $p_filelist.
+ * If a file with the same name exist and is writable, it is replaced
+ * by the new tar.
+ * The method return false and a PEAR error text.
+ * The $p_filelist parameter can be an array of string, each string
+ * representing a filename or a directory name with their path if
+ * needed. It can also be a single string with names separated by a
+ * single blank.
+ * For each directory added in the archive, the files and
+ * sub-directories are also added.
+ * See also createModify() method for more details.
+ *
+ * @param array $p_filelist An array of filenames and directory names, or a
+ * single string with names separated by a single
+ * blank space.
+ * @return true on success, false on error.
+ * @see createModify()
+ * @access public
+ */
+ function create($p_filelist)
+ {
+ return $this->createModify($p_filelist, '', '');
+ }
+ // }}}
+
+ // {{{ add()
+ /**
+ * This method add the files / directories that are listed in $p_filelist in
+ * the archive. If the archive does not exist it is created.
+ * The method return false and a PEAR error text.
+ * The files and directories listed are only added at the end of the archive,
+ * even if a file with the same name is already archived.
+ * See also createModify() method for more details.
+ *
+ * @param array $p_filelist An array of filenames and directory names, or a
+ * single string with names separated by a single
+ * blank space.
+ * @return true on success, false on error.
+ * @see createModify()
+ * @access public
+ */
+ function add($p_filelist)
+ {
+ return $this->addModify($p_filelist, '', '');
+ }
+ // }}}
+
+ // {{{ extract()
+ function extract($p_path='')
+ {
+ return $this->extractModify($p_path, '');
+ }
+ // }}}
+
+ // {{{ listContent()
+ function listContent()
+ {
+ $v_list_detail = array();
+
+ if ($this->_openRead()) {
+ if (!$this->_extractList('', $v_list_detail, "list", '', '')) {
+ unset($v_list_detail);
+ $v_list_detail = 0;
+ }
+ $this->_close();
+ }
+
+ return $v_list_detail;
+ }
+ // }}}
+
+ // {{{ createModify()
+ /**
+ * This method creates the archive file and add the files / directories
+ * that are listed in $p_filelist.
+ * If the file already exists and is writable, it is replaced by the
+ * new tar. It is a create and not an add. If the file exists and is
+ * read-only or is a directory it is not replaced. The method return
+ * false and a PEAR error text.
+ * The $p_filelist parameter can be an array of string, each string
+ * representing a filename or a directory name with their path if
+ * needed. It can also be a single string with names separated by a
+ * single blank.
+ * The path indicated in $p_remove_dir will be removed from the
+ * memorized path of each file / directory listed when this path
+ * exists. By default nothing is removed (empty path '')
+ * The path indicated in $p_add_dir will be added at the beginning of
+ * the memorized path of each file / directory listed. However it can
+ * be set to empty ''. The adding of a path is done after the removing
+ * of path.
+ * The path add/remove ability enables the user to prepare an archive
+ * for extraction in a different path than the origin files are.
+ * See also addModify() method for file adding properties.
+ *
+ * @param array $p_filelist An array of filenames and directory names,
+ * or a single string with names separated by
+ * a single blank space.
+ * @param string $p_add_dir A string which contains a path to be added
+ * to the memorized path of each element in
+ * the list.
+ * @param string $p_remove_dir A string which contains a path to be
+ * removed from the memorized path of each
+ * element in the list, when relevant.
+ * @return boolean true on success, false on error.
+ * @access public
+ * @see addModify()
+ */
+ function createModify($p_filelist, $p_add_dir, $p_remove_dir='')
+ {
+ $v_result = true;
+
+ if (!$this->_openWrite())
+ return false;
+
+ if ($p_filelist != '') {
+ if (is_array($p_filelist))
+ $v_list = $p_filelist;
+ elseif (is_string($p_filelist))
+ $v_list = explode($this->_separator, $p_filelist);
+ else {
+ $this->_cleanFile();
+ $this->_error('Invalid file list');
+ return false;
+ }
+
+ $v_result = $this->_addList($v_list, $p_add_dir, $p_remove_dir);
+ }
+
+ if ($v_result) {
+ $this->_writeFooter();
+ $this->_close();
+ } else
+ $this->_cleanFile();
+
+ return $v_result;
+ }
+ // }}}
+
+ // {{{ addModify()
+ /**
+ * This method add the files / directories listed in $p_filelist at the
+ * end of the existing archive. If the archive does not yet exists it
+ * is created.
+ * The $p_filelist parameter can be an array of string, each string
+ * representing a filename or a directory name with their path if
+ * needed. It can also be a single string with names separated by a
+ * single blank.
+ * The path indicated in $p_remove_dir will be removed from the
+ * memorized path of each file / directory listed when this path
+ * exists. By default nothing is removed (empty path '')
+ * The path indicated in $p_add_dir will be added at the beginning of
+ * the memorized path of each file / directory listed. However it can
+ * be set to empty ''. The adding of a path is done after the removing
+ * of path.
+ * The path add/remove ability enables the user to prepare an archive
+ * for extraction in a different path than the origin files are.
+ * If a file/dir is already in the archive it will only be added at the
+ * end of the archive. There is no update of the existing archived
+ * file/dir. However while extracting the archive, the last file will
+ * replace the first one. This results in a none optimization of the
+ * archive size.
+ * If a file/dir does not exist the file/dir is ignored. However an
+ * error text is send to PEAR error.
+ * If a file/dir is not readable the file/dir is ignored. However an
+ * error text is send to PEAR error.
+ *
+ * @param array $p_filelist An array of filenames and directory
+ * names, or a single string with names
+ * separated by a single blank space.
+ * @param string $p_add_dir A string which contains a path to be
+ * added to the memorized path of each
+ * element in the list.
+ * @param string $p_remove_dir A string which contains a path to be
+ * removed from the memorized path of
+ * each element in the list, when
+ * relevant.
+ * @return true on success, false on error.
+ * @access public
+ */
+ function addModify($p_filelist, $p_add_dir, $p_remove_dir='')
+ {
+ $v_result = true;
+
+ if (!$this->_isArchive())
+ $v_result = $this->createModify($p_filelist, $p_add_dir,
+ $p_remove_dir);
+ else {
+ if (is_array($p_filelist))
+ $v_list = $p_filelist;
+ elseif (is_string($p_filelist))
+ $v_list = explode($this->_separator, $p_filelist);
+ else {
+ $this->_error('Invalid file list');
+ return false;
+ }
+
+ $v_result = $this->_append($v_list, $p_add_dir, $p_remove_dir);
+ }
+
+ return $v_result;
+ }
+ // }}}
+
+ // {{{ addString()
+ /**
+ * This method add a single string as a file at the
+ * end of the existing archive. If the archive does not yet exists it
+ * is created.
+ *
+ * @param string $p_filename A string which contains the full
+ * filename path that will be associated
+ * with the string.
+ * @param string $p_string The content of the file added in
+ * the archive.
+ * @return true on success, false on error.
+ * @access public
+ */
+ function addString($p_filename, $p_string)
+ {
+ $v_result = true;
+
+ if (!$this->_isArchive()) {
+ if (!$this->_openWrite()) {
+ return false;
+ }
+ $this->_close();
+ }
+
+ if (!$this->_openAppend())
+ return false;
+
+ // Need to check the get back to the temporary file ? ....
+ $v_result = $this->_addString($p_filename, $p_string);
+
+ $this->_writeFooter();
+
+ $this->_close();
+
+ return $v_result;
+ }
+ // }}}
+
+ // {{{ extractModify()
+ /**
+ * This method extract all the content of the archive in the directory
+ * indicated by $p_path. When relevant the memorized path of the
+ * files/dir can be modified by removing the $p_remove_path path at the
+ * beginning of the file/dir path.
+ * While extracting a file, if the directory path does not exists it is
+ * created.
+ * While extracting a file, if the file already exists it is replaced
+ * without looking for last modification date.
+ * While extracting a file, if the file already exists and is write
+ * protected, the extraction is aborted.
+ * While extracting a file, if a directory with the same name already
+ * exists, the extraction is aborted.
+ * While extracting a directory, if a file with the same name already
+ * exists, the extraction is aborted.
+ * While extracting a file/directory if the destination directory exist
+ * and is write protected, or does not exist but can not be created,
+ * the extraction is aborted.
+ * If after extraction an extracted file does not show the correct
+ * stored file size, the extraction is aborted.
+ * When the extraction is aborted, a PEAR error text is set and false
+ * is returned. However the result can be a partial extraction that may
+ * need to be manually cleaned.
+ *
+ * @param string $p_path The path of the directory where the
+ * files/dir need to by extracted.
+ * @param string $p_remove_path Part of the memorized path that can be
+ * removed if present at the beginning of
+ * the file/dir path.
+ * @return boolean true on success, false on error.
+ * @access public
+ * @see extractList()
+ */
+ function extractModify($p_path, $p_remove_path)
+ {
+ $v_result = true;
+ $v_list_detail = array();
+
+ if ($v_result = $this->_openRead()) {
+ $v_result = $this->_extractList($p_path, $v_list_detail,
+ "complete", 0, $p_remove_path);
+ $this->_close();
+ }
+
+ return $v_result;
+ }
+ // }}}
+
+ // {{{ extractInString()
+ /**
+ * This method extract from the archive one file identified by $p_filename.
+ * The return value is a string with the file content, or NULL on error.
+ * @param string $p_filename The path of the file to extract in a string.
+ * @return a string with the file content or NULL.
+ * @access public
+ */
+ function extractInString($p_filename)
+ {
+ if ($this->_openRead()) {
+ $v_result = $this->_extractInString($p_filename);
+ $this->_close();
+ } else {
+ $v_result = NULL;
+ }
+
+ return $v_result;
+ }
+ // }}}
+
+ // {{{ extractList()
+ /**
+ * This method extract from the archive only the files indicated in the
+ * $p_filelist. These files are extracted in the current directory or
+ * in the directory indicated by the optional $p_path parameter.
+ * If indicated the $p_remove_path can be used in the same way as it is
+ * used in extractModify() method.
+ * @param array $p_filelist An array of filenames and directory names,
+ * or a single string with names separated
+ * by a single blank space.
+ * @param string $p_path The path of the directory where the
+ * files/dir need to by extracted.
+ * @param string $p_remove_path Part of the memorized path that can be
+ * removed if present at the beginning of
+ * the file/dir path.
+ * @return true on success, false on error.
+ * @access public
+ * @see extractModify()
+ */
+ function extractList($p_filelist, $p_path='', $p_remove_path='')
+ {
+ $v_result = true;
+ $v_list_detail = array();
+
+ if (is_array($p_filelist))
+ $v_list = $p_filelist;
+ elseif (is_string($p_filelist))
+ $v_list = explode($this->_separator, $p_filelist);
+ else {
+ $this->_error('Invalid string list');
+ return false;
+ }
+
+ if ($v_result = $this->_openRead()) {
+ $v_result = $this->_extractList($p_path, $v_list_detail, "partial",
+ $v_list, $p_remove_path);
+ $this->_close();
+ }
+
+ return $v_result;
+ }
+ // }}}
+
+ // {{{ setAttribute()
+ /**
+ * This method set specific attributes of the archive. It uses a variable
+ * list of parameters, in the format attribute code + attribute values :
+ * $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ',');
+ * @param mixed $argv variable list of attributes and values
+ * @return true on success, false on error.
+ * @access public
+ */
+ function setAttribute()
+ {
+ $v_result = true;
+
+ // ----- Get the number of variable list of arguments
+ if (($v_size = func_num_args()) == 0) {
+ return true;
+ }
+
+ // ----- Get the arguments
+ $v_att_list = &func_get_args();
+
+ // ----- Read the attributes
+ $i=0;
+ while ($i<$v_size) {
+
+ // ----- Look for next option
+ switch ($v_att_list[$i]) {
+ // ----- Look for options that request a string value
+ case ARCHIVE_TAR_ATT_SEPARATOR :
+ // ----- Check the number of parameters
+ if (($i+1) >= $v_size) {
+ $this->_error('Invalid number of parameters for '
+ .'attribute ARCHIVE_TAR_ATT_SEPARATOR');
+ return false;
+ }
+
+ // ----- Get the value
+ $this->_separator = $v_att_list[$i+1];
+ $i++;
+ break;
+
+ default :
+ $this->_error('Unknow attribute code '.$v_att_list[$i].'');
+ return false;
+ }
+
+ // ----- Next attribute
+ $i++;
+ }
+
+ return $v_result;
+ }
+ // }}}
+
+ // {{{ _error()
+ function _error($p_message)
+ {
+ // ----- To be completed
+ $this->raiseError($p_message);
+ }
+ // }}}
+
+ // {{{ _warning()
+ function _warning($p_message)
+ {
+ // ----- To be completed
+ $this->raiseError($p_message);
+ }
+ // }}}
+
+ // {{{ _isArchive()
+ function _isArchive($p_filename=NULL)
+ {
+ if ($p_filename == NULL) {
+ $p_filename = $this->_tarname;
+ }
+ clearstatcache();
+ return @is_file($p_filename);
+ }
+ // }}}
+
+ // {{{ _openWrite()
+ function _openWrite()
+ {
+ if ($this->_compress_type == 'gz')
+ $this->_file = @gzopen($this->_tarname, "wb9");
+ else if ($this->_compress_type == 'bz2')
+ $this->_file = @bzopen($this->_tarname, "wb");
+ else if ($this->_compress_type == 'none')
+ $this->_file = @fopen($this->_tarname, "wb");
+ else
+ $this->_error('Unknown or missing compression type ('
+ .$this->_compress_type.')');
+
+ if ($this->_file == 0) {
+ $this->_error('Unable to open in write mode \''
+ .$this->_tarname.'\'');
+ return false;
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _openRead()
+ function _openRead()
+ {
+ if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
+
+ // ----- Look if a local copy need to be done
+ if ($this->_temp_tarname == '') {
+ $this->_temp_tarname = uniqid('tar').'.tmp';
+ if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
+ $this->_error('Unable to open in read mode \''
+ .$this->_tarname.'\'');
+ $this->_temp_tarname = '';
+ return false;
+ }
+ if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+ $this->_error('Unable to open in write mode \''
+ .$this->_temp_tarname.'\'');
+ $this->_temp_tarname = '';
+ return false;
+ }
+ while ($v_data = @fread($v_file_from, 1024))
+ @fwrite($v_file_to, $v_data);
+ @fclose($v_file_from);
+ @fclose($v_file_to);
+ }
+
+ // ----- File to open if the local copy
+ $v_filename = $this->_temp_tarname;
+
+ } else
+ // ----- File to open if the normal Tar file
+ $v_filename = $this->_tarname;
+
+ if ($this->_compress_type == 'gz')
+ $this->_file = @gzopen($v_filename, "rb");
+ else if ($this->_compress_type == 'bz2')
+ $this->_file = @bzopen($v_filename, "rb");
+ else if ($this->_compress_type == 'none')
+ $this->_file = @fopen($v_filename, "rb");
+ else
+ $this->_error('Unknown or missing compression type ('
+ .$this->_compress_type.')');
+
+ if ($this->_file == 0) {
+ $this->_error('Unable to open in read mode \''.$v_filename.'\'');
+ return false;
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _openReadWrite()
+ function _openReadWrite()
+ {
+ if ($this->_compress_type == 'gz')
+ $this->_file = @gzopen($this->_tarname, "r+b");
+ else if ($this->_compress_type == 'bz2')
+ $this->_file = @bzopen($this->_tarname, "r+b");
+ else if ($this->_compress_type == 'none')
+ $this->_file = @fopen($this->_tarname, "r+b");
+ else
+ $this->_error('Unknown or missing compression type ('
+ .$this->_compress_type.')');
+
+ if ($this->_file == 0) {
+ $this->_error('Unable to open in read/write mode \''
+ .$this->_tarname.'\'');
+ return false;
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _close()
+ function _close()
+ {
+ //if (isset($this->_file)) {
+ if (is_resource($this->_file)) {
+ if ($this->_compress_type == 'gz')
+ @gzclose($this->_file);
+ else if ($this->_compress_type == 'bz2')
+ @bzclose($this->_file);
+ else if ($this->_compress_type == 'none')
+ @fclose($this->_file);
+ else
+ $this->_error('Unknown or missing compression type ('
+ .$this->_compress_type.')');
+
+ $this->_file = 0;
+ }
+
+ // ----- Look if a local copy need to be erase
+ // Note that it might be interesting to keep the url for a time : ToDo
+ if ($this->_temp_tarname != '') {
+ @unlink($this->_temp_tarname);
+ $this->_temp_tarname = '';
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _cleanFile()
+ function _cleanFile()
+ {
+ $this->_close();
+
+ // ----- Look for a local copy
+ if ($this->_temp_tarname != '') {
+ // ----- Remove the local copy but not the remote tarname
+ @unlink($this->_temp_tarname);
+ $this->_temp_tarname = '';
+ } else {
+ // ----- Remove the local tarname file
+ @unlink($this->_tarname);
+ }
+ $this->_tarname = '';
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _writeBlock()
+ function _writeBlock($p_binary_data, $p_len=null)
+ {
+ if (is_resource($this->_file)) {
+ if ($p_len === null) {
+ if ($this->_compress_type == 'gz')
+ @gzputs($this->_file, $p_binary_data);
+ else if ($this->_compress_type == 'bz2')
+ @bzwrite($this->_file, $p_binary_data);
+ else if ($this->_compress_type == 'none')
+ @fputs($this->_file, $p_binary_data);
+ else
+ $this->_error('Unknown or missing compression type ('
+ .$this->_compress_type.')');
+ } else {
+ if ($this->_compress_type == 'gz')
+ @gzputs($this->_file, $p_binary_data, $p_len);
+ else if ($this->_compress_type == 'bz2')
+ @bzwrite($this->_file, $p_binary_data, $p_len);
+ else if ($this->_compress_type == 'none')
+ @fputs($this->_file, $p_binary_data, $p_len);
+ else
+ $this->_error('Unknown or missing compression type ('
+ .$this->_compress_type.')');
+
+ }
+ }
+ return true;
+ }
+ // }}}
+
+ // {{{ _readBlock()
+ function _readBlock()
+ {
+ $v_block = null;
+ if (is_resource($this->_file)) {
+ if ($this->_compress_type == 'gz')
+ $v_block = @gzread($this->_file, 512);
+ else if ($this->_compress_type == 'bz2')
+ $v_block = @bzread($this->_file, 512);
+ else if ($this->_compress_type == 'none')
+ $v_block = @fread($this->_file, 512);
+ else
+ $this->_error('Unknown or missing compression type ('
+ .$this->_compress_type.')');
+ }
+ return $v_block;
+ }
+ // }}}
+
+ // {{{ _jumpBlock()
+ function _jumpBlock($p_len=null)
+ {
+ if (is_resource($this->_file)) {
+ if ($p_len === null)
+ $p_len = 1;
+
+ if ($this->_compress_type == 'gz') {
+ @gzseek($this->_file, @gztell($this->_file)+($p_len*512));
+ }
+ else if ($this->_compress_type == 'bz2') {
+ // ----- Replace missing bztell() and bzseek()
+ for ($i=0; $i<$p_len; $i++)
+ $this->_readBlock();
+ } else if ($this->_compress_type == 'none')
+ @fseek($this->_file, @ftell($this->_file)+($p_len*512));
+ else
+ $this->_error('Unknown or missing compression type ('
+ .$this->_compress_type.')');
+
+ }
+ return true;
+ }
+ // }}}
+
+ // {{{ _writeFooter()
+ function _writeFooter()
+ {
+ if (is_resource($this->_file)) {
+ // ----- Write the last 0 filled block for end of archive
+ $v_binary_data = pack("a512", '');
+ $this->_writeBlock($v_binary_data);
+ }
+ return true;
+ }
+ // }}}
+
+ // {{{ _addList()
+ function _addList($p_list, $p_add_dir, $p_remove_dir)
+ {
+ $v_result=true;
+ $v_header = array();
+
+ // ----- Remove potential windows directory separator
+ $p_add_dir = $this->_translateWinPath($p_add_dir);
+ $p_remove_dir = $this->_translateWinPath($p_remove_dir, false);
+
+ if (!$this->_file) {
+ $this->_error('Invalid file descriptor');
+ return false;
+ }
+
+ if (sizeof($p_list) == 0)
+ return true;
+
+ foreach ($p_list as $v_filename) {
+ if (!$v_result) {
+ break;
+ }
+
+ // ----- Skip the current tar name
+ if ($v_filename == $this->_tarname)
+ continue;
+
+ if ($v_filename == '')
+ continue;
+
+ if (!file_exists($v_filename)) {
+ $this->_warning("File '$v_filename' does not exist");
+ continue;
+ }
+
+ // ----- Add the file or directory header
+ if (!$this->_addFile($v_filename, $v_header, $p_add_dir, $p_remove_dir))
+ return false;
+
+ if (@is_dir($v_filename)) {
+ if (!($p_hdir = opendir($v_filename))) {
+ $this->_warning("Directory '$v_filename' can not be read");
+ continue;
+ }
+ while (false !== ($p_hitem = readdir($p_hdir))) {
+ if (($p_hitem != '.') && ($p_hitem != '..')) {
+ if ($v_filename != ".")
+ $p_temp_list[0] = $v_filename.'/'.$p_hitem;
+ else
+ $p_temp_list[0] = $p_hitem;
+
+ $v_result = $this->_addList($p_temp_list,
+ $p_add_dir,
+ $p_remove_dir);
+ }
+ }
+
+ unset($p_temp_list);
+ unset($p_hdir);
+ unset($p_hitem);
+ }
+ }
+
+ return $v_result;
+ }
+ // }}}
+
+ // {{{ _addFile()
+ function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir)
+ {
+ if (!$this->_file) {
+ $this->_error('Invalid file descriptor');
+ return false;
+ }
+
+ if ($p_filename == '') {
+ $this->_error('Invalid file name');
+ return false;
+ }
+
+ // ----- Calculate the stored filename
+ $p_filename = $this->_translateWinPath($p_filename, false);;
+ $v_stored_filename = $p_filename;
+ if (strcmp($p_filename, $p_remove_dir) == 0) {
+ return true;
+ }
+ if ($p_remove_dir != '') {
+ if (substr($p_remove_dir, -1) != '/')
+ $p_remove_dir .= '/';
+
+ if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir)
+ $v_stored_filename = substr($p_filename, strlen($p_remove_dir));
+ }
+ $v_stored_filename = $this->_translateWinPath($v_stored_filename);
+ if ($p_add_dir != '') {
+ if (substr($p_add_dir, -1) == '/')
+ $v_stored_filename = $p_add_dir.$v_stored_filename;
+ else
+ $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
+ }
+
+ $v_stored_filename = $this->_pathReduction($v_stored_filename);
+
+ if ($this->_isArchive($p_filename)) {
+ if (($v_file = @fopen($p_filename, "rb")) == 0) {
+ $this->_warning("Unable to open file '".$p_filename
+ ."' in binary read mode");
+ return true;
+ }
+
+ if (!$this->_writeHeader($p_filename, $v_stored_filename))
+ return false;
+
+ while (($v_buffer = fread($v_file, 512)) != '') {
+ $v_binary_data = pack("a512", "$v_buffer");
+ $this->_writeBlock($v_binary_data);
+ }
+
+ fclose($v_file);
+
+ } else {
+ // ----- Only header for dir
+ if (!$this->_writeHeader($p_filename, $v_stored_filename))
+ return false;
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _addString()
+ function _addString($p_filename, $p_string)
+ {
+ if (!$this->_file) {
+ $this->_error('Invalid file descriptor');
+ return false;
+ }
+
+ if ($p_filename == '') {
+ $this->_error('Invalid file name');
+ return false;
+ }
+
+ // ----- Calculate the stored filename
+ $p_filename = $this->_translateWinPath($p_filename, false);;
+
+ if (!$this->_writeHeaderBlock($p_filename, strlen($p_string),
+ 0, 0, "", 0, 0))
+ return false;
+
+ $i=0;
+ while (($v_buffer = substr($p_string, (($i++)*512), 512)) != '') {
+ $v_binary_data = pack("a512", $v_buffer);
+ $this->_writeBlock($v_binary_data);
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _writeHeader()
+ function _writeHeader($p_filename, $p_stored_filename)
+ {
+ if ($p_stored_filename == '')
+ $p_stored_filename = $p_filename;
+ $v_reduce_filename = $this->_pathReduction($p_stored_filename);
+
+ if (strlen($v_reduce_filename) > 99) {
+ if (!$this->_writeLongHeader($v_reduce_filename))
+ return false;
+ }
+
+ $v_info = stat($p_filename);
+ $v_uid = sprintf("%6s ", DecOct($v_info[4]));
+ $v_gid = sprintf("%6s ", DecOct($v_info[5]));
+ $v_perms = sprintf("%6s ", DecOct(fileperms($p_filename)));
+
+ $v_mtime = sprintf("%11s", DecOct(filemtime($p_filename)));
+
+ if (@is_dir($p_filename)) {
+ $v_typeflag = "5";
+ $v_size = sprintf("%11s ", DecOct(0));
+ } else {
+ $v_typeflag = '';
+ clearstatcache();
+ $v_size = sprintf("%11s ", DecOct(filesize($p_filename)));
+ }
+
+ $v_linkname = '';
+
+ $v_magic = '';
+
+ $v_version = '';
+
+ $v_uname = '';
+
+ $v_gname = '';
+
+ $v_devmajor = '';
+
+ $v_devminor = '';
+
+ $v_prefix = '';
+
+ $v_binary_data_first = pack("a100a8a8a8a12A12",
+ $v_reduce_filename, $v_perms, $v_uid,
+ $v_gid, $v_size, $v_mtime);
+ $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
+ $v_typeflag, $v_linkname, $v_magic,
+ $v_version, $v_uname, $v_gname,
+ $v_devmajor, $v_devminor, $v_prefix, '');
+
+ // ----- Calculate the checksum
+ $v_checksum = 0;
+ // ..... First part of the header
+ for ($i=0; $i<148; $i++)
+ $v_checksum += ord(substr($v_binary_data_first,$i,1));
+ // ..... Ignore the checksum value and replace it by ' ' (space)
+ for ($i=148; $i<156; $i++)
+ $v_checksum += ord(' ');
+ // ..... Last part of the header
+ for ($i=156, $j=0; $i<512; $i++, $j++)
+ $v_checksum += ord(substr($v_binary_data_last,$j,1));
+
+ // ----- Write the first 148 bytes of the header in the archive
+ $this->_writeBlock($v_binary_data_first, 148);
+
+ // ----- Write the calculated checksum
+ $v_checksum = sprintf("%6s ", DecOct($v_checksum));
+ $v_binary_data = pack("a8", $v_checksum);
+ $this->_writeBlock($v_binary_data, 8);
+
+ // ----- Write the last 356 bytes of the header in the archive
+ $this->_writeBlock($v_binary_data_last, 356);
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _writeHeaderBlock()
+ function _writeHeaderBlock($p_filename, $p_size, $p_mtime=0, $p_perms=0,
+ $p_type='', $p_uid=0, $p_gid=0)
+ {
+ $p_filename = $this->_pathReduction($p_filename);
+
+ if (strlen($p_filename) > 99) {
+ if (!$this->_writeLongHeader($p_filename))
+ return false;
+ }
+
+ if ($p_type == "5") {
+ $v_size = sprintf("%11s ", DecOct(0));
+ } else {
+ $v_size = sprintf("%11s ", DecOct($p_size));
+ }
+
+ $v_uid = sprintf("%6s ", DecOct($p_uid));
+ $v_gid = sprintf("%6s ", DecOct($p_gid));
+ $v_perms = sprintf("%6s ", DecOct($p_perms));
+
+ $v_mtime = sprintf("%11s", DecOct($p_mtime));
+
+ $v_linkname = '';
+
+ $v_magic = '';
+
+ $v_version = '';
+
+ $v_uname = '';
+
+ $v_gname = '';
+
+ $v_devmajor = '';
+
+ $v_devminor = '';
+
+ $v_prefix = '';
+
+ $v_binary_data_first = pack("a100a8a8a8a12A12",
+ $p_filename, $v_perms, $v_uid, $v_gid,
+ $v_size, $v_mtime);
+ $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
+ $p_type, $v_linkname, $v_magic,
+ $v_version, $v_uname, $v_gname,
+ $v_devmajor, $v_devminor, $v_prefix, '');
+
+ // ----- Calculate the checksum
+ $v_checksum = 0;
+ // ..... First part of the header
+ for ($i=0; $i<148; $i++)
+ $v_checksum += ord(substr($v_binary_data_first,$i,1));
+ // ..... Ignore the checksum value and replace it by ' ' (space)
+ for ($i=148; $i<156; $i++)
+ $v_checksum += ord(' ');
+ // ..... Last part of the header
+ for ($i=156, $j=0; $i<512; $i++, $j++)
+ $v_checksum += ord(substr($v_binary_data_last,$j,1));
+
+ // ----- Write the first 148 bytes of the header in the archive
+ $this->_writeBlock($v_binary_data_first, 148);
+
+ // ----- Write the calculated checksum
+ $v_checksum = sprintf("%6s ", DecOct($v_checksum));
+ $v_binary_data = pack("a8", $v_checksum);
+ $this->_writeBlock($v_binary_data, 8);
+
+ // ----- Write the last 356 bytes of the header in the archive
+ $this->_writeBlock($v_binary_data_last, 356);
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _writeLongHeader()
+ function _writeLongHeader($p_filename)
+ {
+ $v_size = sprintf("%11s ", DecOct(strlen($p_filename)));
+
+ $v_typeflag = 'L';
+
+ $v_linkname = '';
+
+ $v_magic = '';
+
+ $v_version = '';
+
+ $v_uname = '';
+
+ $v_gname = '';
+
+ $v_devmajor = '';
+
+ $v_devminor = '';
+
+ $v_prefix = '';
+
+ $v_binary_data_first = pack("a100a8a8a8a12A12",
+ '././@LongLink', 0, 0, 0, $v_size, 0);
+ $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
+ $v_typeflag, $v_linkname, $v_magic,
+ $v_version, $v_uname, $v_gname,
+ $v_devmajor, $v_devminor, $v_prefix, '');
+
+ // ----- Calculate the checksum
+ $v_checksum = 0;
+ // ..... First part of the header
+ for ($i=0; $i<148; $i++)
+ $v_checksum += ord(substr($v_binary_data_first,$i,1));
+ // ..... Ignore the checksum value and replace it by ' ' (space)
+ for ($i=148; $i<156; $i++)
+ $v_checksum += ord(' ');
+ // ..... Last part of the header
+ for ($i=156, $j=0; $i<512; $i++, $j++)
+ $v_checksum += ord(substr($v_binary_data_last,$j,1));
+
+ // ----- Write the first 148 bytes of the header in the archive
+ $this->_writeBlock($v_binary_data_first, 148);
+
+ // ----- Write the calculated checksum
+ $v_checksum = sprintf("%6s ", DecOct($v_checksum));
+ $v_binary_data = pack("a8", $v_checksum);
+ $this->_writeBlock($v_binary_data, 8);
+
+ // ----- Write the last 356 bytes of the header in the archive
+ $this->_writeBlock($v_binary_data_last, 356);
+
+ // ----- Write the filename as content of the block
+ $i=0;
+ while (($v_buffer = substr($p_filename, (($i++)*512), 512)) != '') {
+ $v_binary_data = pack("a512", "$v_buffer");
+ $this->_writeBlock($v_binary_data);
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _readHeader()
+ function _readHeader($v_binary_data, &$v_header)
+ {
+ if (strlen($v_binary_data)==0) {
+ $v_header['filename'] = '';
+ return true;
+ }
+
+ if (strlen($v_binary_data) != 512) {
+ $v_header['filename'] = '';
+ $this->_error('Invalid block size : '.strlen($v_binary_data));
+ return false;
+ }
+
+ // ----- Calculate the checksum
+ $v_checksum = 0;
+ // ..... First part of the header
+ for ($i=0; $i<148; $i++)
+ $v_checksum+=ord(substr($v_binary_data,$i,1));
+ // ..... Ignore the checksum value and replace it by ' ' (space)
+ for ($i=148; $i<156; $i++)
+ $v_checksum += ord(' ');
+ // ..... Last part of the header
+ for ($i=156; $i<512; $i++)
+ $v_checksum+=ord(substr($v_binary_data,$i,1));
+
+ $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
+ ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
+ ."a32uname/a32gname/a8devmajor/a8devminor",
+ $v_binary_data);
+
+ // ----- Extract the checksum
+ $v_header['checksum'] = OctDec(trim($v_data['checksum']));
+ if ($v_header['checksum'] != $v_checksum) {
+ $v_header['filename'] = '';
+
+ // ----- Look for last block (empty block)
+ if (($v_checksum == 256) && ($v_header['checksum'] == 0))
+ return true;
+
+ $this->_error('Invalid checksum for file "'.$v_data['filename']
+ .'" : '.$v_checksum.' calculated, '
+ .$v_header['checksum'].' expected');
+ return false;
+ }
+
+ // ----- Extract the properties
+ $v_header['filename'] = trim($v_data['filename']);
+ $v_header['mode'] = OctDec(trim($v_data['mode']));
+ $v_header['uid'] = OctDec(trim($v_data['uid']));
+ $v_header['gid'] = OctDec(trim($v_data['gid']));
+ $v_header['size'] = OctDec(trim($v_data['size']));
+ $v_header['mtime'] = OctDec(trim($v_data['mtime']));
+ if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
+ $v_header['size'] = 0;
+ }
+ /* ----- All these fields are removed form the header because
+ they do not carry interesting info
+ $v_header[link] = trim($v_data[link]);
+ $v_header[magic] = trim($v_data[magic]);
+ $v_header[version] = trim($v_data[version]);
+ $v_header[uname] = trim($v_data[uname]);
+ $v_header[gname] = trim($v_data[gname]);
+ $v_header[devmajor] = trim($v_data[devmajor]);
+ $v_header[devminor] = trim($v_data[devminor]);
+ */
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _readLongHeader()
+ function _readLongHeader(&$v_header)
+ {
+ $v_filename = '';
+ $n = floor($v_header['size']/512);
+ for ($i=0; $i<$n; $i++) {
+ $v_content = $this->_readBlock();
+ $v_filename .= $v_content;
+ }
+ if (($v_header['size'] % 512) != 0) {
+ $v_content = $this->_readBlock();
+ $v_filename .= $v_content;
+ }
+
+ // ----- Read the next header
+ $v_binary_data = $this->_readBlock();
+
+ if (!$this->_readHeader($v_binary_data, $v_header))
+ return false;
+
+ $v_header['filename'] = $v_filename;
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _extractInString()
+ /**
+ * This method extract from the archive one file identified by $p_filename.
+ * The return value is a string with the file content, or NULL on error.
+ * @param string $p_filename The path of the file to extract in a string.
+ * @return a string with the file content or NULL.
+ * @access private
+ */
+ function _extractInString($p_filename)
+ {
+ $v_result_str = "";
+
+ While (strlen($v_binary_data = $this->_readBlock()) != 0)
+ {
+ if (!$this->_readHeader($v_binary_data, $v_header))
+ return NULL;
+
+ if ($v_header['filename'] == '')
+ continue;
+
+ // ----- Look for long filename
+ if ($v_header['typeflag'] == 'L') {
+ if (!$this->_readLongHeader($v_header))
+ return NULL;
+ }
+
+ if ($v_header['filename'] == $p_filename) {
+ if ($v_header['typeflag'] == "5") {
+ $this->_error('Unable to extract in string a directory '
+ .'entry {'.$v_header['filename'].'}');
+ return NULL;
+ } else {
+ $n = floor($v_header['size']/512);
+ for ($i=0; $i<$n; $i++) {
+ $v_result_str .= $this->_readBlock();
+ }
+ if (($v_header['size'] % 512) != 0) {
+ $v_content = $this->_readBlock();
+ $v_result_str .= substr($v_content, 0,
+ ($v_header['size'] % 512));
+ }
+ return $v_result_str;
+ }
+ } else {
+ $this->_jumpBlock(ceil(($v_header['size']/512)));
+ }
+ }
+
+ return NULL;
+ }
+ // }}}
+
+ // {{{ _extractList()
+ function _extractList($p_path, &$p_list_detail, $p_mode,
+ $p_file_list, $p_remove_path)
+ {
+ $v_result=true;
+ $v_nb = 0;
+ $v_extract_all = true;
+ $v_listing = false;
+
+ $p_path = $this->_translateWinPath($p_path, false);
+ if ($p_path == '' || (substr($p_path, 0, 1) != '/'
+ && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
+ $p_path = "./".$p_path;
+ }
+ $p_remove_path = $this->_translateWinPath($p_remove_path);
+
+ // ----- Look for path to remove format (should end by /)
+ if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
+ $p_remove_path .= '/';
+ $p_remove_path_size = strlen($p_remove_path);
+
+ switch ($p_mode) {
+ case "complete" :
+ $v_extract_all = TRUE;
+ $v_listing = FALSE;
+ break;
+ case "partial" :
+ $v_extract_all = FALSE;
+ $v_listing = FALSE;
+ break;
+ case "list" :
+ $v_extract_all = FALSE;
+ $v_listing = TRUE;
+ break;
+ default :
+ $this->_error('Invalid extract mode ('.$p_mode.')');
+ return false;
+ }
+
+ clearstatcache();
+
+ while (strlen($v_binary_data = $this->_readBlock()) != 0)
+ {
+ $v_extract_file = FALSE;
+ $v_extraction_stopped = 0;
+
+ if (!$this->_readHeader($v_binary_data, $v_header))
+ return false;
+
+ if ($v_header['filename'] == '') {
+ continue;
+ }
+
+ // ----- Look for long filename
+ if ($v_header['typeflag'] == 'L') {
+ if (!$this->_readLongHeader($v_header))
+ return false;
+ }
+
+ if ((!$v_extract_all) && (is_array($p_file_list))) {
+ // ----- By default no unzip if the file is not found
+ $v_extract_file = false;
+
+ for ($i=0; $i strlen($p_file_list[$i]))
+ && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
+ == $p_file_list[$i])) {
+ $v_extract_file = TRUE;
+ break;
+ }
+ }
+
+ // ----- It is a file, so compare the file names
+ elseif ($p_file_list[$i] == $v_header['filename']) {
+ $v_extract_file = TRUE;
+ break;
+ }
+ }
+ } else {
+ $v_extract_file = TRUE;
+ }
+
+ // ----- Look if this file need to be extracted
+ if (($v_extract_file) && (!$v_listing))
+ {
+ if (($p_remove_path != '')
+ && (substr($v_header['filename'], 0, $p_remove_path_size)
+ == $p_remove_path))
+ $v_header['filename'] = substr($v_header['filename'],
+ $p_remove_path_size);
+ if (($p_path != './') && ($p_path != '/')) {
+ while (substr($p_path, -1) == '/')
+ $p_path = substr($p_path, 0, strlen($p_path)-1);
+
+ if (substr($v_header['filename'], 0, 1) == '/')
+ $v_header['filename'] = $p_path.$v_header['filename'];
+ else
+ $v_header['filename'] = $p_path.'/'.$v_header['filename'];
+ }
+ if (file_exists($v_header['filename'])) {
+ if ( (@is_dir($v_header['filename']))
+ && ($v_header['typeflag'] == '')) {
+ $this->_error('File '.$v_header['filename']
+ .' already exists as a directory');
+ return false;
+ }
+ if ( ($this->_isArchive($v_header['filename']))
+ && ($v_header['typeflag'] == "5")) {
+ $this->_error('Directory '.$v_header['filename']
+ .' already exists as a file');
+ return false;
+ }
+ if (!is_writeable($v_header['filename'])) {
+ $this->_error('File '.$v_header['filename']
+ .' already exists and is write protected');
+ return false;
+ }
+ if (filemtime($v_header['filename']) > $v_header['mtime']) {
+ // To be completed : An error or silent no replace ?
+ }
+ }
+
+ // ----- Check the directory availability and create it if necessary
+ elseif (($v_result
+ = $this->_dirCheck(($v_header['typeflag'] == "5"
+ ?$v_header['filename']
+ :dirname($v_header['filename'])))) != 1) {
+ $this->_error('Unable to create path for '.$v_header['filename']);
+ return false;
+ }
+
+ if ($v_extract_file) {
+ if ($v_header['typeflag'] == "5") {
+ if (!@file_exists($v_header['filename'])) {
+ if (!@mkdir($v_header['filename'], 0777)) {
+ $this->_error('Unable to create directory {'
+ .$v_header['filename'].'}');
+ return false;
+ }
+ }
+ } else {
+ if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+ $this->_error('Error while opening {'.$v_header['filename']
+ .'} in write binary mode');
+ return false;
+ } else {
+ $n = floor($v_header['size']/512);
+ for ($i=0; $i<$n; $i++) {
+ $v_content = $this->_readBlock();
+ fwrite($v_dest_file, $v_content, 512);
+ }
+ if (($v_header['size'] % 512) != 0) {
+ $v_content = $this->_readBlock();
+ fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
+ }
+
+ @fclose($v_dest_file);
+
+ // ----- Change the file mode, mtime
+ @touch($v_header['filename'], $v_header['mtime']);
+ // To be completed
+ //chmod($v_header[filename], DecOct($v_header[mode]));
+ }
+
+ // ----- Check the file size
+ clearstatcache();
+ if (filesize($v_header['filename']) != $v_header['size']) {
+ $this->_error('Extracted file '.$v_header['filename']
+ .' does not have the correct file size \''
+ .filesize($v_header['filename'])
+ .'\' ('.$v_header['size']
+ .' expected). Archive may be corrupted.');
+ return false;
+ }
+ }
+ } else {
+ $this->_jumpBlock(ceil(($v_header['size']/512)));
+ }
+ } else {
+ $this->_jumpBlock(ceil(($v_header['size']/512)));
+ }
+
+ /* TBC : Seems to be unused ...
+ if ($this->_compress)
+ $v_end_of_file = @gzeof($this->_file);
+ else
+ $v_end_of_file = @feof($this->_file);
+ */
+
+ if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+ // ----- Log extracted files
+ if (($v_file_dir = dirname($v_header['filename']))
+ == $v_header['filename'])
+ $v_file_dir = '';
+ if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
+ $v_file_dir = '/';
+
+ $p_list_detail[$v_nb++] = $v_header;
+ }
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _openAppend()
+ function _openAppend()
+ {
+ if (filesize($this->_tarname) == 0)
+ return $this->_openWrite();
+
+ if ($this->_compress) {
+ $this->_close();
+
+ if (!@rename($this->_tarname, $this->_tarname.".tmp")) {
+ $this->_error('Error while renaming \''.$this->_tarname
+ .'\' to temporary file \''.$this->_tarname
+ .'.tmp\'');
+ return false;
+ }
+
+ if ($this->_compress_type == 'gz')
+ $v_temp_tar = @gzopen($this->_tarname.".tmp", "rb");
+ elseif ($this->_compress_type == 'bz2')
+ $v_temp_tar = @bzopen($this->_tarname.".tmp", "rb");
+
+ if ($v_temp_tar == 0) {
+ $this->_error('Unable to open file \''.$this->_tarname
+ .'.tmp\' in binary read mode');
+ @rename($this->_tarname.".tmp", $this->_tarname);
+ return false;
+ }
+
+ if (!$this->_openWrite()) {
+ @rename($this->_tarname.".tmp", $this->_tarname);
+ return false;
+ }
+
+ if ($this->_compress_type == 'gz') {
+ $v_buffer = @gzread($v_temp_tar, 512);
+
+ // ----- Read the following blocks but not the last one
+ if (!@gzeof($v_temp_tar)) {
+ do{
+ $v_binary_data = pack("a512", $v_buffer);
+ $this->_writeBlock($v_binary_data);
+ $v_buffer = @gzread($v_temp_tar, 512);
+
+ } while (!@gzeof($v_temp_tar));
+ }
+
+ @gzclose($v_temp_tar);
+ }
+ elseif ($this->_compress_type == 'bz2') {
+ $v_buffered_lines = array();
+ $v_buffered_lines[] = @bzread($v_temp_tar, 512);
+
+ // ----- Read the following blocks but not the last one
+ while (strlen($v_buffered_lines[]
+ = @bzread($v_temp_tar, 512)) > 0) {
+ $v_binary_data = pack("a512",
+ array_shift($v_buffered_lines));
+ $this->_writeBlock($v_binary_data);
+ }
+
+ @bzclose($v_temp_tar);
+ }
+
+ if (!@unlink($this->_tarname.".tmp")) {
+ $this->_error('Error while deleting temporary file \''
+ .$this->_tarname.'.tmp\'');
+ }
+
+ } else {
+ // ----- For not compressed tar, just add files before the last
+ // 512 bytes block
+ if (!$this->_openReadWrite())
+ return false;
+
+ clearstatcache();
+ $v_size = filesize($this->_tarname);
+ fseek($this->_file, $v_size-512);
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _append()
+ function _append($p_filelist, $p_add_dir='', $p_remove_dir='')
+ {
+ if (!$this->_openAppend())
+ return false;
+
+ if ($this->_addList($p_filelist, $p_add_dir, $p_remove_dir))
+ $this->_writeFooter();
+
+ $this->_close();
+
+ return true;
+ }
+ // }}}
+
+ // {{{ _dirCheck()
+
+ /**
+ * Check if a directory exists and create it (including parent
+ * dirs) if not.
+ *
+ * @param string $p_dir directory to check
+ *
+ * @return bool TRUE if the directory exists or was created
+ */
+ function _dirCheck($p_dir)
+ {
+ if ((@is_dir($p_dir)) || ($p_dir == ''))
+ return true;
+
+ $p_parent_dir = dirname($p_dir);
+
+ if (($p_parent_dir != $p_dir) &&
+ ($p_parent_dir != '') &&
+ (!$this->_dirCheck($p_parent_dir)))
+ return false;
+
+ if (!@mkdir($p_dir, 0777)) {
+ $this->_error("Unable to create directory '$p_dir'");
+ return false;
+ }
+
+ return true;
+ }
+
+ // }}}
+
+ // {{{ _pathReduction()
+
+ /**
+ * Compress path by changing for example "/dir/foo/../bar" to "/dir/bar",
+ * rand emove double slashes.
+ *
+ * @param string $p_dir path to reduce
+ *
+ * @return string reduced path
+ *
+ * @access private
+ *
+ */
+ function _pathReduction($p_dir)
+ {
+ $v_result = '';
+
+ // ----- Look for not empty path
+ if ($p_dir != '') {
+ // ----- Explode path by directory names
+ $v_list = explode('/', $p_dir);
+
+ // ----- Study directories from last to first
+ for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+ // ----- Look for current path
+ if ($v_list[$i] == ".") {
+ // ----- Ignore this directory
+ // Should be the first $i=0, but no check is done
+ }
+ else if ($v_list[$i] == "..") {
+ // ----- Ignore it and ignore the $i-1
+ $i--;
+ }
+ else if ( ($v_list[$i] == '')
+ && ($i!=(sizeof($v_list)-1))
+ && ($i!=0)) {
+ // ----- Ignore only the double '//' in path,
+ // but not the first and last /
+ } else {
+ $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?'/'
+ .$v_result:'');
+ }
+ }
+ }
+ $v_result = strtr($v_result, '\\', '/');
+ return $v_result;
+ }
+
+ // }}}
+
+ // {{{ _translateWinPath()
+ function _translateWinPath($p_path, $p_remove_disk_letter=true)
+ {
+ if (OS_WINDOWS) {
+ // ----- Look for potential disk letter
+ if ( ($p_remove_disk_letter)
+ && (($v_position = strpos($p_path, ':')) != false)) {
+ $p_path = substr($p_path, $v_position+1);
+ }
+ // ----- Change potential windows directory separator
+ if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+ $p_path = strtr($p_path, '\\', '/');
+ }
+ }
+ return $p_path;
+ }
+ // }}}
+
+}
+?>
Index: /closed/version-2_5-dev/data/module/PEAR.php
===================================================================
--- /closed/version-2_5-dev/data/module/PEAR.php (revision 20116)
+++ /closed/version-2_5-dev/data/module/PEAR.php (revision 20116)
@@ -0,0 +1,1095 @@
+
+ * @author Stig Bakken
+ * @author Tomas V.V.Cox
+ * @author Greg Beaver
+ * @copyright 1997-2006 The PHP Group
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version CVS: $Id$
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 0.1
+ */
+
+/**#@+
+ * ERROR constants
+ */
+define('PEAR_ERROR_RETURN', 1);
+define('PEAR_ERROR_PRINT', 2);
+define('PEAR_ERROR_TRIGGER', 4);
+define('PEAR_ERROR_DIE', 8);
+define('PEAR_ERROR_CALLBACK', 16);
+/**
+ * WARNING: obsolete
+ * @deprecated
+ */
+define('PEAR_ERROR_EXCEPTION', 32);
+/**#@-*/
+define('PEAR_ZE2', (function_exists('version_compare') &&
+ version_compare(zend_version(), "2-dev", "ge")));
+
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+ define('OS_WINDOWS', true);
+ define('OS_UNIX', false);
+ define('PEAR_OS', 'Windows');
+} else {
+ define('OS_WINDOWS', false);
+ define('OS_UNIX', true);
+ define('PEAR_OS', 'Unix'); // blatant assumption
+}
+
+// instant backwards compatibility
+if (!defined('PATH_SEPARATOR')) {
+ if (OS_WINDOWS) {
+ define('PATH_SEPARATOR', ';');
+ } else {
+ define('PATH_SEPARATOR', ':');
+ }
+}
+
+$GLOBALS['_PEAR_default_error_mode'] = PEAR_ERROR_RETURN;
+$GLOBALS['_PEAR_default_error_options'] = E_USER_NOTICE;
+$GLOBALS['_PEAR_destructor_object_list'] = array();
+$GLOBALS['_PEAR_shutdown_funcs'] = array();
+$GLOBALS['_PEAR_error_handler_stack'] = array();
+
+@ini_set('track_errors', true);
+
+/**
+ * Base class for other PEAR classes. Provides rudimentary
+ * emulation of destructors.
+ *
+ * If you want a destructor in your class, inherit PEAR and make a
+ * destructor method called _yourclassname (same name as the
+ * constructor, but with a "_" prefix). Also, in your constructor you
+ * have to call the PEAR constructor: $this->PEAR();.
+ * The destructor method will be called without parameters. Note that
+ * at in some SAPI implementations (such as Apache), any output during
+ * the request shutdown (in which destructors are called) seems to be
+ * discarded. If you need to get any debug information from your
+ * destructor, use error_log(), syslog() or something similar.
+ *
+ * IMPORTANT! To use the emulated destructors you need to create the
+ * objects by reference: $obj =& new PEAR_child;
+ *
+ * @category pear
+ * @package PEAR
+ * @author Stig Bakken
+ * @author Tomas V.V. Cox
+ * @author Greg Beaver
+ * @copyright 1997-2006 The PHP Group
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version Release: 1.4.6
+ * @link http://pear.php.net/package/PEAR
+ * @see PEAR_Error
+ * @since Class available since PHP 4.0.2
+ * @link http://pear.php.net/manual/en/core.pear.php#core.pear.pear
+ */
+class PEAR
+{
+ // {{{ properties
+
+ /**
+ * Whether to enable internal debug messages.
+ *
+ * @var bool
+ * @access private
+ */
+ var $_debug = false;
+
+ /**
+ * Default error mode for this object.
+ *
+ * @var int
+ * @access private
+ */
+ var $_default_error_mode = null;
+
+ /**
+ * Default error options used for this object when error mode
+ * is PEAR_ERROR_TRIGGER.
+ *
+ * @var int
+ * @access private
+ */
+ var $_default_error_options = null;
+
+ /**
+ * Default error handler (callback) for this object, if error mode is
+ * PEAR_ERROR_CALLBACK.
+ *
+ * @var string
+ * @access private
+ */
+ var $_default_error_handler = '';
+
+ /**
+ * Which class to use for error objects.
+ *
+ * @var string
+ * @access private
+ */
+ var $_error_class = 'PEAR_Error';
+
+ /**
+ * An array of expected errors.
+ *
+ * @var array
+ * @access private
+ */
+ var $_expected_errors = array();
+
+ // }}}
+
+ // {{{ constructor
+
+ /**
+ * Constructor. Registers this object in
+ * $_PEAR_destructor_object_list for destructor emulation if a
+ * destructor object exists.
+ *
+ * @param string $error_class (optional) which class to use for
+ * error objects, defaults to PEAR_Error.
+ * @access public
+ * @return void
+ */
+ function PEAR($error_class = null)
+ {
+ $classname = strtolower(get_class($this));
+ if ($this->_debug) {
+ print "PEAR constructor called, class=$classname\n";
+ }
+ if ($error_class !== null) {
+ $this->_error_class = $error_class;
+ }
+ while ($classname && strcasecmp($classname, "pear")) {
+ $destructor = "_$classname";
+ if (method_exists($this, $destructor)) {
+ global $_PEAR_destructor_object_list;
+ $_PEAR_destructor_object_list[] = &$this;
+ if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+ register_shutdown_function("_PEAR_call_destructors");
+ $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+ }
+ break;
+ } else {
+ $classname = get_parent_class($classname);
+ }
+ }
+ }
+
+ // }}}
+ // {{{ destructor
+
+ /**
+ * Destructor (the emulated type of...). Does nothing right now,
+ * but is included for forward compatibility, so subclass
+ * destructors should always call it.
+ *
+ * See the note in the class desciption about output from
+ * destructors.
+ *
+ * @access public
+ * @return void
+ */
+ function _PEAR() {
+ if ($this->_debug) {
+ printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
+ }
+ }
+
+ // }}}
+ // {{{ getStaticProperty()
+
+ /**
+ * If you have a class that's mostly/entirely static, and you need static
+ * properties, you can use this method to simulate them. Eg. in your method(s)
+ * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
+ * You MUST use a reference, or they will not persist!
+ *
+ * @access public
+ * @param string $class The calling classname, to prevent clashes
+ * @param string $var The variable to retrieve.
+ * @return mixed A reference to the variable. If not set it will be
+ * auto initialised to NULL.
+ */
+ function &getStaticProperty($class, $var)
+ {
+ static $properties;
+ return $properties[$class][$var];
+ }
+
+ // }}}
+ // {{{ registerShutdownFunc()
+
+ /**
+ * Use this function to register a shutdown method for static
+ * classes.
+ *
+ * @access public
+ * @param mixed $func The function name (or array of class/method) to call
+ * @param mixed $args The arguments to pass to the function
+ * @return void
+ */
+ function registerShutdownFunc($func, $args = array())
+ {
+ $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
+ }
+
+ // }}}
+ // {{{ isError()
+
+ /**
+ * Tell whether a value is a PEAR error.
+ *
+ * @param mixed $data the value to test
+ * @param int $code if $data is an error object, return true
+ * only if $code is a string and
+ * $obj->getMessage() == $code or
+ * $code is an integer and $obj->getCode() == $code
+ * @access public
+ * @return bool true if parameter is an error
+ */
+ function isError($data, $code = null)
+ {
+ if (is_a($data, 'PEAR_Error')) {
+ if (is_null($code)) {
+ return true;
+ } elseif (is_string($code)) {
+ return $data->getMessage() == $code;
+ } else {
+ return $data->getCode() == $code;
+ }
+ }
+ return false;
+ }
+
+ // }}}
+ // {{{ setErrorHandling()
+
+ /**
+ * Sets how errors generated by this object should be handled.
+ * Can be invoked both in objects and statically. If called
+ * statically, setErrorHandling sets the default behaviour for all
+ * PEAR objects. If called in an object, setErrorHandling sets
+ * the default behaviour for that object.
+ *
+ * @param int $mode
+ * One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+ * PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+ * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
+ *
+ * @param mixed $options
+ * When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
+ * of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+ *
+ * When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
+ * to be the callback function or method. A callback
+ * function is a string with the name of the function, a
+ * callback method is an array of two elements: the element
+ * at index 0 is the object, and the element at index 1 is
+ * the name of the method to call in the object.
+ *
+ * When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
+ * a printf format string used when printing the error
+ * message.
+ *
+ * @access public
+ * @return void
+ * @see PEAR_ERROR_RETURN
+ * @see PEAR_ERROR_PRINT
+ * @see PEAR_ERROR_TRIGGER
+ * @see PEAR_ERROR_DIE
+ * @see PEAR_ERROR_CALLBACK
+ * @see PEAR_ERROR_EXCEPTION
+ *
+ * @since PHP 4.0.5
+ */
+
+ function setErrorHandling($mode = null, $options = null)
+ {
+ if (isset($this) && is_a($this, 'PEAR')) {
+ $setmode = &$this->_default_error_mode;
+ $setoptions = &$this->_default_error_options;
+ } else {
+ $setmode = &$GLOBALS['_PEAR_default_error_mode'];
+ $setoptions = &$GLOBALS['_PEAR_default_error_options'];
+ }
+
+ switch ($mode) {
+ case PEAR_ERROR_EXCEPTION:
+ case PEAR_ERROR_RETURN:
+ case PEAR_ERROR_PRINT:
+ case PEAR_ERROR_TRIGGER:
+ case PEAR_ERROR_DIE:
+ case null:
+ $setmode = $mode;
+ $setoptions = $options;
+ break;
+
+ case PEAR_ERROR_CALLBACK:
+ $setmode = $mode;
+ // class/object method callback
+ if (is_callable($options)) {
+ $setoptions = $options;
+ } else {
+ trigger_error("invalid error callback", E_USER_WARNING);
+ }
+ break;
+
+ default:
+ trigger_error("invalid error mode", E_USER_WARNING);
+ break;
+ }
+ }
+
+ // }}}
+ // {{{ expectError()
+
+ /**
+ * This method is used to tell which errors you expect to get.
+ * Expected errors are always returned with error mode
+ * PEAR_ERROR_RETURN. Expected error codes are stored in a stack,
+ * and this method pushes a new element onto it. The list of
+ * expected errors are in effect until they are popped off the
+ * stack with the popExpect() method.
+ *
+ * Note that this method can not be called statically
+ *
+ * @param mixed $code a single error code or an array of error codes to expect
+ *
+ * @return int the new depth of the "expected errors" stack
+ * @access public
+ */
+ function expectError($code = '*')
+ {
+ if (is_array($code)) {
+ array_push($this->_expected_errors, $code);
+ } else {
+ array_push($this->_expected_errors, array($code));
+ }
+ return sizeof($this->_expected_errors);
+ }
+
+ // }}}
+ // {{{ popExpect()
+
+ /**
+ * This method pops one element off the expected error codes
+ * stack.
+ *
+ * @return array the list of error codes that were popped
+ */
+ function popExpect()
+ {
+ return array_pop($this->_expected_errors);
+ }
+
+ // }}}
+ // {{{ _checkDelExpect()
+
+ /**
+ * This method checks unsets an error code if available
+ *
+ * @param mixed error code
+ * @return bool true if the error code was unset, false otherwise
+ * @access private
+ * @since PHP 4.3.0
+ */
+ function _checkDelExpect($error_code)
+ {
+ $deleted = false;
+
+ foreach ($this->_expected_errors AS $key => $error_array) {
+ if (in_array($error_code, $error_array)) {
+ unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
+ $deleted = true;
+ }
+
+ // clean up empty arrays
+ if (0 == count($this->_expected_errors[$key])) {
+ unset($this->_expected_errors[$key]);
+ }
+ }
+ return $deleted;
+ }
+
+ // }}}
+ // {{{ delExpect()
+
+ /**
+ * This method deletes all occurences of the specified element from
+ * the expected error codes stack.
+ *
+ * @param mixed $error_code error code that should be deleted
+ * @return mixed list of error codes that were deleted or error
+ * @access public
+ * @since PHP 4.3.0
+ */
+ function delExpect($error_code)
+ {
+ $deleted = false;
+
+ if ((is_array($error_code) && (0 != count($error_code)))) {
+ // $error_code is a non-empty array here;
+ // we walk through it trying to unset all
+ // values
+ foreach($error_code as $key => $error) {
+ if ($this->_checkDelExpect($error)) {
+ $deleted = true;
+ } else {
+ $deleted = false;
+ }
+ }
+ return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+ } elseif (!empty($error_code)) {
+ // $error_code comes alone, trying to unset it
+ if ($this->_checkDelExpect($error_code)) {
+ return true;
+ } else {
+ return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+ }
+ } else {
+ // $error_code is empty
+ return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
+ }
+ }
+
+ // }}}
+ // {{{ raiseError()
+
+ /**
+ * This method is a wrapper that returns an instance of the
+ * configured error class with this object's default error
+ * handling applied. If the $mode and $options parameters are not
+ * specified, the object's defaults are used.
+ *
+ * @param mixed $message a text error message or a PEAR error object
+ *
+ * @param int $code a numeric error code (it is up to your class
+ * to define these if you want to use codes)
+ *
+ * @param int $mode One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+ * PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+ * PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
+ *
+ * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
+ * specifies the PHP-internal error level (one of
+ * E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+ * If $mode is PEAR_ERROR_CALLBACK, this
+ * parameter specifies the callback function or
+ * method. In other error modes this parameter
+ * is ignored.
+ *
+ * @param string $userinfo If you need to pass along for example debug
+ * information, this parameter is meant for that.
+ *
+ * @param string $error_class The returned error object will be
+ * instantiated from this class, if specified.
+ *
+ * @param bool $skipmsg If true, raiseError will only pass error codes,
+ * the error message parameter will be dropped.
+ *
+ * @access public
+ * @return object a PEAR error object
+ * @see PEAR::setErrorHandling
+ * @since PHP 4.0.5
+ */
+ function &raiseError($message = null,
+ $code = null,
+ $mode = null,
+ $options = null,
+ $userinfo = null,
+ $error_class = null,
+ $skipmsg = false)
+ {
+ // The error is yet a PEAR error object
+ if (is_object($message)) {
+ $code = $message->getCode();
+ $userinfo = $message->getUserInfo();
+ $error_class = $message->getType();
+ $message->error_message_prefix = '';
+ $message = $message->getMessage();
+ }
+
+ if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
+ if ($exp[0] == "*" ||
+ (is_int(reset($exp)) && in_array($code, $exp)) ||
+ (is_string(reset($exp)) && in_array($message, $exp))) {
+ $mode = PEAR_ERROR_RETURN;
+ }
+ }
+ // No mode given, try global ones
+ if ($mode === null) {
+ // Class error handler
+ if (isset($this) && isset($this->_default_error_mode)) {
+ $mode = $this->_default_error_mode;
+ $options = $this->_default_error_options;
+ // Global error handler
+ } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
+ $mode = $GLOBALS['_PEAR_default_error_mode'];
+ $options = $GLOBALS['_PEAR_default_error_options'];
+ }
+ }
+
+ if ($error_class !== null) {
+ $ec = $error_class;
+ } elseif (isset($this) && isset($this->_error_class)) {
+ $ec = $this->_error_class;
+ } else {
+ $ec = 'PEAR_Error';
+ }
+ if ($skipmsg) {
+ $a = &new $ec($code, $mode, $options, $userinfo);
+ return $a;
+ } else {
+ $a = &new $ec($message, $code, $mode, $options, $userinfo);
+ return $a;
+ }
+ }
+
+ // }}}
+ // {{{ throwError()
+
+ /**
+ * Simpler form of raiseError with fewer options. In most cases
+ * message, code and userinfo are enough.
+ *
+ * @param string $message
+ *
+ */
+ function &throwError($message = null,
+ $code = null,
+ $userinfo = null)
+ {
+ if (isset($this) && is_a($this, 'PEAR')) {
+ $a = &$this->raiseError($message, $code, null, null, $userinfo);
+ return $a;
+ } else {
+ $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
+ return $a;
+ }
+ }
+
+ // }}}
+ function staticPushErrorHandling($mode, $options = null)
+ {
+ $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+ $def_mode = &$GLOBALS['_PEAR_default_error_mode'];
+ $def_options = &$GLOBALS['_PEAR_default_error_options'];
+ $stack[] = array($def_mode, $def_options);
+ switch ($mode) {
+ case PEAR_ERROR_EXCEPTION:
+ case PEAR_ERROR_RETURN:
+ case PEAR_ERROR_PRINT:
+ case PEAR_ERROR_TRIGGER:
+ case PEAR_ERROR_DIE:
+ case null:
+ $def_mode = $mode;
+ $def_options = $options;
+ break;
+
+ case PEAR_ERROR_CALLBACK:
+ $def_mode = $mode;
+ // class/object method callback
+ if (is_callable($options)) {
+ $def_options = $options;
+ } else {
+ trigger_error("invalid error callback", E_USER_WARNING);
+ }
+ break;
+
+ default:
+ trigger_error("invalid error mode", E_USER_WARNING);
+ break;
+ }
+ $stack[] = array($mode, $options);
+ return true;
+ }
+
+ function staticPopErrorHandling()
+ {
+ $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+ $setmode = &$GLOBALS['_PEAR_default_error_mode'];
+ $setoptions = &$GLOBALS['_PEAR_default_error_options'];
+ array_pop($stack);
+ list($mode, $options) = $stack[sizeof($stack) - 1];
+ array_pop($stack);
+ switch ($mode) {
+ case PEAR_ERROR_EXCEPTION:
+ case PEAR_ERROR_RETURN:
+ case PEAR_ERROR_PRINT:
+ case PEAR_ERROR_TRIGGER:
+ case PEAR_ERROR_DIE:
+ case null:
+ $setmode = $mode;
+ $setoptions = $options;
+ break;
+
+ case PEAR_ERROR_CALLBACK:
+ $setmode = $mode;
+ // class/object method callback
+ if (is_callable($options)) {
+ $setoptions = $options;
+ } else {
+ trigger_error("invalid error callback", E_USER_WARNING);
+ }
+ break;
+
+ default:
+ trigger_error("invalid error mode", E_USER_WARNING);
+ break;
+ }
+ return true;
+ }
+
+ // {{{ pushErrorHandling()
+
+ /**
+ * Push a new error handler on top of the error handler options stack. With this
+ * you can easily override the actual error handler for some code and restore
+ * it later with popErrorHandling.
+ *
+ * @param mixed $mode (same as setErrorHandling)
+ * @param mixed $options (same as setErrorHandling)
+ *
+ * @return bool Always true
+ *
+ * @see PEAR::setErrorHandling
+ */
+ function pushErrorHandling($mode, $options = null)
+ {
+ $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+ if (isset($this) && is_a($this, 'PEAR')) {
+ $def_mode = &$this->_default_error_mode;
+ $def_options = &$this->_default_error_options;
+ } else {
+ $def_mode = &$GLOBALS['_PEAR_default_error_mode'];
+ $def_options = &$GLOBALS['_PEAR_default_error_options'];
+ }
+ $stack[] = array($def_mode, $def_options);
+
+ if (isset($this) && is_a($this, 'PEAR')) {
+ $this->setErrorHandling($mode, $options);
+ } else {
+ PEAR::setErrorHandling($mode, $options);
+ }
+ $stack[] = array($mode, $options);
+ return true;
+ }
+
+ // }}}
+ // {{{ popErrorHandling()
+
+ /**
+ * Pop the last error handler used
+ *
+ * @return bool Always true
+ *
+ * @see PEAR::pushErrorHandling
+ */
+ function popErrorHandling()
+ {
+ $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+ array_pop($stack);
+ list($mode, $options) = $stack[sizeof($stack) - 1];
+ array_pop($stack);
+ if (isset($this) && is_a($this, 'PEAR')) {
+ $this->setErrorHandling($mode, $options);
+ } else {
+ PEAR::setErrorHandling($mode, $options);
+ }
+ return true;
+ }
+
+ // }}}
+ // {{{ loadExtension()
+
+ /**
+ * OS independant PHP extension load. Remember to take care
+ * on the correct extension name for case sensitive OSes.
+ *
+ * @param string $ext The extension name
+ * @return bool Success or not on the dl() call
+ */
+ function loadExtension($ext)
+ {
+ if (!extension_loaded($ext)) {
+ // if either returns true dl() will produce a FATAL error, stop that
+ if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
+ return false;
+ }
+ if (OS_WINDOWS) {
+ $suffix = '.dll';
+ } elseif (PHP_OS == 'HP-UX') {
+ $suffix = '.sl';
+ } elseif (PHP_OS == 'AIX') {
+ $suffix = '.a';
+ } elseif (PHP_OS == 'OSX') {
+ $suffix = '.bundle';
+ } else {
+ $suffix = '.so';
+ }
+ return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+ }
+ return true;
+ }
+
+ // }}}
+}
+
+// {{{ _PEAR_call_destructors()
+
+function _PEAR_call_destructors()
+{
+ global $_PEAR_destructor_object_list;
+ if (is_array($_PEAR_destructor_object_list) &&
+ sizeof($_PEAR_destructor_object_list))
+ {
+ reset($_PEAR_destructor_object_list);
+ if (@PEAR::getStaticProperty('PEAR', 'destructlifo')) {
+ $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
+ }
+ while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
+ $classname = get_class($objref);
+ while ($classname) {
+ $destructor = "_$classname";
+ if (method_exists($objref, $destructor)) {
+ $objref->$destructor();
+ break;
+ } else {
+ $classname = get_parent_class($classname);
+ }
+ }
+ }
+ // Empty the object list to ensure that destructors are
+ // not called more than once.
+ $_PEAR_destructor_object_list = array();
+ }
+
+ // Now call the shutdown functions
+ if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
+ foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
+ call_user_func_array($value[0], $value[1]);
+ }
+ }
+}
+
+// }}}
+/**
+ * Standard PEAR error class for PHP 4
+ *
+ * This class is supserseded by {@link PEAR_Exception} in PHP 5
+ *
+ * @category pear
+ * @package PEAR
+ * @author Stig Bakken
+ * @author Tomas V.V. Cox
+ * @author Gregory Beaver
+ * @copyright 1997-2006 The PHP Group
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version Release: 1.4.6
+ * @link http://pear.php.net/manual/en/core.pear.pear-error.php
+ * @see PEAR::raiseError(), PEAR::throwError()
+ * @since Class available since PHP 4.0.2
+ */
+class PEAR_Error
+{
+ // {{{ properties
+
+ var $error_message_prefix = '';
+ var $mode = PEAR_ERROR_RETURN;
+ var $level = E_USER_NOTICE;
+ var $code = -1;
+ var $message = '';
+ var $userinfo = '';
+ var $backtrace = null;
+
+ // }}}
+ // {{{ constructor
+
+ /**
+ * PEAR_Error constructor
+ *
+ * @param string $message message
+ *
+ * @param int $code (optional) error code
+ *
+ * @param int $mode (optional) error mode, one of: PEAR_ERROR_RETURN,
+ * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
+ * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
+ *
+ * @param mixed $options (optional) error level, _OR_ in the case of
+ * PEAR_ERROR_CALLBACK, the callback function or object/method
+ * tuple.
+ *
+ * @param string $userinfo (optional) additional user/debug info
+ *
+ * @access public
+ *
+ */
+ function PEAR_Error($message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null)
+ {
+ if ($mode === null) {
+ $mode = PEAR_ERROR_RETURN;
+ }
+ $this->message = $message;
+ $this->code = $code;
+ $this->mode = $mode;
+ $this->userinfo = $userinfo;
+ if (function_exists("debug_backtrace")) {
+ if (@!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
+ $this->backtrace = debug_backtrace();
+ }
+ }
+ if ($mode & PEAR_ERROR_CALLBACK) {
+ $this->level = E_USER_NOTICE;
+ $this->callback = $options;
+ } else {
+ if ($options === null) {
+ $options = E_USER_NOTICE;
+ }
+ $this->level = $options;
+ $this->callback = null;
+ }
+ if ($this->mode & PEAR_ERROR_PRINT) {
+ if (is_null($options) || is_int($options)) {
+ $format = "%s";
+ } else {
+ $format = $options;
+ }
+ printf($format, $this->getMessage());
+ }
+ if ($this->mode & PEAR_ERROR_TRIGGER) {
+ trigger_error($this->getMessage(), $this->level);
+ }
+ if ($this->mode & PEAR_ERROR_DIE) {
+ $msg = $this->getMessage();
+ if (is_null($options) || is_int($options)) {
+ $format = "%s";
+ if (substr($msg, -1) != "\n") {
+ $msg .= "\n";
+ }
+ } else {
+ $format = $options;
+ }
+ die(sprintf($format, $msg));
+ }
+ if ($this->mode & PEAR_ERROR_CALLBACK) {
+ if (is_callable($this->callback)) {
+ call_user_func($this->callback, $this);
+ }
+ }
+ if ($this->mode & PEAR_ERROR_EXCEPTION) {
+ trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
+ eval('$e = new Exception($this->message, $this->code);throw($e);');
+ }
+ }
+
+ // }}}
+ // {{{ getMode()
+
+ /**
+ * Get the error mode from an error object.
+ *
+ * @return int error mode
+ * @access public
+ */
+ function getMode() {
+ return $this->mode;
+ }
+
+ // }}}
+ // {{{ getCallback()
+
+ /**
+ * Get the callback function/method from an error object.
+ *
+ * @return mixed callback function or object/method array
+ * @access public
+ */
+ function getCallback() {
+ return $this->callback;
+ }
+
+ // }}}
+ // {{{ getMessage()
+
+
+ /**
+ * Get the error message from an error object.
+ *
+ * @return string full error message
+ * @access public
+ */
+ function getMessage()
+ {
+ return ($this->error_message_prefix . $this->message);
+ }
+
+
+ // }}}
+ // {{{ getCode()
+
+ /**
+ * Get error code from an error object
+ *
+ * @return int error code
+ * @access public
+ */
+ function getCode()
+ {
+ return $this->code;
+ }
+
+ // }}}
+ // {{{ getType()
+
+ /**
+ * Get the name of this error/exception.
+ *
+ * @return string error/exception name (type)
+ * @access public
+ */
+ function getType()
+ {
+ return get_class($this);
+ }
+
+ // }}}
+ // {{{ getUserInfo()
+
+ /**
+ * Get additional user-supplied information.
+ *
+ * @return string user-supplied information
+ * @access public
+ */
+ function getUserInfo()
+ {
+ return $this->userinfo;
+ }
+
+ // }}}
+ // {{{ getDebugInfo()
+
+ /**
+ * Get additional debug information supplied by the application.
+ *
+ * @return string debug information
+ * @access public
+ */
+ function getDebugInfo()
+ {
+ return $this->getUserInfo();
+ }
+
+ // }}}
+ // {{{ getBacktrace()
+
+ /**
+ * Get the call backtrace from where the error was generated.
+ * Supported with PHP 4.3.0 or newer.
+ *
+ * @param int $frame (optional) what frame to fetch
+ * @return array Backtrace, or NULL if not available.
+ * @access public
+ */
+ function getBacktrace($frame = null)
+ {
+ if (defined('PEAR_IGNORE_BACKTRACE')) {
+ return null;
+ }
+ if ($frame === null) {
+ return $this->backtrace;
+ }
+ return $this->backtrace[$frame];
+ }
+
+ // }}}
+ // {{{ addUserInfo()
+
+ function addUserInfo($info)
+ {
+ if (empty($this->userinfo)) {
+ $this->userinfo = $info;
+ } else {
+ $this->userinfo .= " ** $info";
+ }
+ }
+
+ // }}}
+ // {{{ toString()
+
+ /**
+ * Make a string representation of this object.
+ *
+ * @return string a string with an object summary
+ * @access public
+ */
+ function toString() {
+ $modes = array();
+ $levels = array(E_USER_NOTICE => 'notice',
+ E_USER_WARNING => 'warning',
+ E_USER_ERROR => 'error');
+ if ($this->mode & PEAR_ERROR_CALLBACK) {
+ if (is_array($this->callback)) {
+ $callback = (is_object($this->callback[0]) ?
+ strtolower(get_class($this->callback[0])) :
+ $this->callback[0]) . '::' .
+ $this->callback[1];
+ } else {
+ $callback = $this->callback;
+ }
+ return sprintf('[%s: message="%s" code=%d mode=callback '.
+ 'callback=%s prefix="%s" info="%s"]',
+ strtolower(get_class($this)), $this->message, $this->code,
+ $callback, $this->error_message_prefix,
+ $this->userinfo);
+ }
+ if ($this->mode & PEAR_ERROR_PRINT) {
+ $modes[] = 'print';
+ }
+ if ($this->mode & PEAR_ERROR_TRIGGER) {
+ $modes[] = 'trigger';
+ }
+ if ($this->mode & PEAR_ERROR_DIE) {
+ $modes[] = 'die';
+ }
+ if ($this->mode & PEAR_ERROR_RETURN) {
+ $modes[] = 'return';
+ }
+ return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
+ 'prefix="%s" info="%s"]',
+ strtolower(get_class($this)), $this->message, $this->code,
+ implode("|", $modes), $levels[$this->level],
+ $this->error_message_prefix,
+ $this->userinfo);
+ }
+
+ // }}}
+}
+
+/*
+ * Local Variables:
+ * mode: php
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+?>
Index: /closed/version-2_5-dev/data/module/Request.php
===================================================================
--- /closed/version-2_5-dev/data/module/Request.php (revision 20116)
+++ /closed/version-2_5-dev/data/module/Request.php (revision 20116)
@@ -0,0 +1,1408 @@
+ |
+// +-----------------------------------------------------------------------+
+//
+// $Id$
+//
+// HTTP_Request Class
+//
+// Simple example, (Fetches yahoo.com and displays it):
+//
+// $a = &new HTTP_Request('http://www.yahoo.com/');
+// $a->sendRequest();
+// echo $a->getResponseBody();
+//
+
+if(!defined('REQUEST_PHP_DIR')) {
+ $REQUEST_PHP_DIR = realpath(dirname( __FILE__));
+ define("REQUEST_PHP_DIR", $REQUEST_PHP_DIR);
+}
+
+require_once REQUEST_PHP_DIR . '/PEAR.php';
+require_once REQUEST_PHP_DIR . '/Net/Socket.php';
+require_once REQUEST_PHP_DIR . '/Net/URL.php';
+
+define('HTTP_REQUEST_METHOD_GET', 'GET', true);
+define('HTTP_REQUEST_METHOD_HEAD', 'HEAD', true);
+define('HTTP_REQUEST_METHOD_POST', 'POST', true);
+define('HTTP_REQUEST_METHOD_PUT', 'PUT', true);
+define('HTTP_REQUEST_METHOD_DELETE', 'DELETE', true);
+define('HTTP_REQUEST_METHOD_OPTIONS', 'OPTIONS', true);
+define('HTTP_REQUEST_METHOD_TRACE', 'TRACE', true);
+
+define('HTTP_REQUEST_HTTP_VER_1_0', '1.0', true);
+define('HTTP_REQUEST_HTTP_VER_1_1', '1.1', true);
+
+class HTTP_Request {
+
+ /**
+ * Instance of Net_URL
+ * @var object Net_URL
+ */
+ var $_url;
+
+ /**
+ * Type of request
+ * @var string
+ */
+ var $_method;
+
+ /**
+ * HTTP Version
+ * @var string
+ */
+ var $_http;
+
+ /**
+ * Request headers
+ * @var array
+ */
+ var $_requestHeaders;
+
+ /**
+ * Basic Auth Username
+ * @var string
+ */
+ var $_user;
+
+ /**
+ * Basic Auth Password
+ * @var string
+ */
+ var $_pass;
+
+ /**
+ * Socket object
+ * @var object Net_Socket
+ */
+ var $_sock;
+
+ /**
+ * Proxy server
+ * @var string
+ */
+ var $_proxy_host;
+
+ /**
+ * Proxy port
+ * @var integer
+ */
+ var $_proxy_port;
+
+ /**
+ * Proxy username
+ * @var string
+ */
+ var $_proxy_user;
+
+ /**
+ * Proxy password
+ * @var string
+ */
+ var $_proxy_pass;
+
+ /**
+ * Post data
+ * @var array
+ */
+ var $_postData;
+
+ /**
+ * Request body
+ * @var string
+ */
+ var $_body;
+
+ /**
+ * A list of methods that MUST NOT have a request body, per RFC 2616
+ * @var array
+ */
+ var $_bodyDisallowed = array('TRACE');
+
+ /**
+ * Files to post
+ * @var array
+ */
+ var $_postFiles = array();
+
+ /**
+ * Connection timeout.
+ * @var float
+ */
+ var $_timeout;
+
+ /**
+ * HTTP_Response object
+ * @var object HTTP_Response
+ */
+ var $_response;
+
+ /**
+ * Whether to allow redirects
+ * @var boolean
+ */
+ var $_allowRedirects;
+
+ /**
+ * Maximum redirects allowed
+ * @var integer
+ */
+ var $_maxRedirects;
+
+ /**
+ * Current number of redirects
+ * @var integer
+ */
+ var $_redirects;
+
+ /**
+ * Whether to append brackets [] to array variables
+ * @var bool
+ */
+ var $_useBrackets = true;
+
+ /**
+ * Attached listeners
+ * @var array
+ */
+ var $_listeners = array();
+
+ /**
+ * Whether to save response body in response object property
+ * @var bool
+ */
+ var $_saveBody = true;
+
+ /**
+ * Timeout for reading from socket (array(seconds, microseconds))
+ * @var array
+ */
+ var $_readTimeout = null;
+
+ /**
+ * Options to pass to Net_Socket::connect. See stream_context_create
+ * @var array
+ */
+ var $_socketOptions = null;
+
+ /**
+ * Constructor
+ *
+ * Sets up the object
+ * @param string The url to fetch/access
+ * @param array Associative array of parameters which can have the following keys:
+ *
+ * - method - Method to use, GET, POST etc (string)
+ * - http - HTTP Version to use, 1.0 or 1.1 (string)
+ * - user - Basic Auth username (string)
+ * - pass - Basic Auth password (string)
+ * - proxy_host - Proxy server host (string)
+ * - proxy_port - Proxy server port (integer)
+ * - proxy_user - Proxy auth username (string)
+ * - proxy_pass - Proxy auth password (string)
+ * - timeout - Connection timeout in seconds (float)
+ * - allowRedirects - Whether to follow redirects or not (bool)
+ * - maxRedirects - Max number of redirects to follow (integer)
+ * - useBrackets - Whether to append [] to array variable names (bool)
+ * - saveBody - Whether to save response body in response object property (bool)
+ * - readTimeout - Timeout for reading / writing data over the socket (array (seconds, microseconds))
+ * - socketOptions - Options to pass to Net_Socket object (array)
+ *
+ * @access public
+ */
+ function HTTP_Request($url = '', $params = array())
+ {
+ $this->_method = HTTP_REQUEST_METHOD_GET;
+ $this->_http = HTTP_REQUEST_HTTP_VER_1_1;
+ $this->_requestHeaders = array();
+ $this->_postData = array();
+ $this->_body = null;
+
+ $this->_user = null;
+ $this->_pass = null;
+
+ $this->_proxy_host = null;
+ $this->_proxy_port = null;
+ $this->_proxy_user = null;
+ $this->_proxy_pass = null;
+
+ $this->_allowRedirects = false;
+ $this->_maxRedirects = 3;
+ $this->_redirects = 0;
+
+ $this->_timeout = null;
+ $this->_response = null;
+
+ foreach ($params as $key => $value) {
+ $this->{'_' . $key} = $value;
+ }
+
+ if (!empty($url)) {
+ $this->setURL($url);
+ }
+
+ // Default useragent
+ //$this->addHeader('User-Agent', 'PEAR HTTP_Request class ( http://pear.php.net/ )');
+
+ // We don't do keep-alives by default
+ $this->addHeader('Connection', 'close');
+
+ // Basic authentication
+ if (!empty($this->_user)) {
+ $this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
+ }
+
+ // Proxy authentication (see bug #5913)
+ if (!empty($this->_proxy_user)) {
+ $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
+ }
+
+ // Use gzip encoding if possible
+ // Avoid gzip encoding if using multibyte functions (see #1781)
+ if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib') &&
+ 0 == (2 & ini_get('mbstring.func_overload'))) {
+
+ $this->addHeader('Accept-Encoding', 'gzip');
+ }
+ }
+
+ /**
+ * Generates a Host header for HTTP/1.1 requests
+ *
+ * @access private
+ * @return string
+ */
+ function _generateHostHeader()
+ {
+ if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
+ $host = $this->_url->host . ':' . $this->_url->port;
+
+ } elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
+ $host = $this->_url->host . ':' . $this->_url->port;
+
+ } elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
+ $host = $this->_url->host . ':' . $this->_url->port;
+
+ } else {
+ $host = $this->_url->host;
+ }
+
+ return $host;
+ }
+
+ /**
+ * Resets the object to its initial state (DEPRECATED).
+ * Takes the same parameters as the constructor.
+ *
+ * @param string $url The url to be requested
+ * @param array $params Associative array of parameters
+ * (see constructor for details)
+ * @access public
+ * @deprecated deprecated since 1.2, call the constructor if this is necessary
+ */
+ function reset($url, $params = array())
+ {
+ $this->HTTP_Request($url, $params);
+ }
+
+ /**
+ * Sets the URL to be requested
+ *
+ * @param string The url to be requested
+ * @access public
+ */
+ function setURL($url)
+ {
+ $this->_url = &new Net_URL($url, $this->_useBrackets);
+
+ if (!empty($this->_url->user) || !empty($this->_url->pass)) {
+ $this->setBasicAuth($this->_url->user, $this->_url->pass);
+ }
+
+ if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http) {
+ $this->addHeader('Host', $this->_generateHostHeader());
+ }
+
+ // set '/' instead of empty path rather than check later (see bug #8662)
+ if (empty($this->_url->path)) {
+ $this->_url->path = '/';
+ }
+ }
+
+ /**
+ * Returns the current request URL
+ *
+ * @return string Current request URL
+ * @access public
+ */
+ function getUrl($url)
+ {
+ return empty($this->_url)? '': $this->_url->getUrl();
+ }
+
+ /**
+ * Sets a proxy to be used
+ *
+ * @param string Proxy host
+ * @param int Proxy port
+ * @param string Proxy username
+ * @param string Proxy password
+ * @access public
+ */
+ function setProxy($host, $port = 8080, $user = null, $pass = null)
+ {
+ $this->_proxy_host = $host;
+ $this->_proxy_port = $port;
+ $this->_proxy_user = $user;
+ $this->_proxy_pass = $pass;
+
+ if (!empty($user)) {
+ $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+ }
+ }
+
+ /**
+ * Sets basic authentication parameters
+ *
+ * @param string Username
+ * @param string Password
+ */
+ function setBasicAuth($user, $pass)
+ {
+ $this->_user = $user;
+ $this->_pass = $pass;
+
+ $this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+ }
+
+ /**
+ * Sets the method to be used, GET, POST etc.
+ *
+ * @param string Method to use. Use the defined constants for this
+ * @access public
+ */
+ function setMethod($method)
+ {
+ $this->_method = $method;
+ }
+
+ /**
+ * Sets the HTTP version to use, 1.0 or 1.1
+ *
+ * @param string Version to use. Use the defined constants for this
+ * @access public
+ */
+ function setHttpVer($http)
+ {
+ $this->_http = $http;
+ }
+
+ /**
+ * Adds a request header
+ *
+ * @param string Header name
+ * @param string Header value
+ * @access public
+ */
+ function addHeader($name, $value)
+ {
+ $this->_requestHeaders[strtolower($name)] = $value;
+ }
+
+ /**
+ * Removes a request header
+ *
+ * @param string Header name to remove
+ * @access public
+ */
+ function removeHeader($name)
+ {
+ if (isset($this->_requestHeaders[strtolower($name)])) {
+ unset($this->_requestHeaders[strtolower($name)]);
+ }
+ }
+
+ /**
+ * Adds a querystring parameter
+ *
+ * @param string Querystring parameter name
+ * @param string Querystring parameter value
+ * @param bool Whether the value is already urlencoded or not, default = not
+ * @access public
+ */
+ function addQueryString($name, $value, $preencoded = false)
+ {
+ $this->_url->addQueryString($name, $value, $preencoded);
+ }
+
+ /**
+ * Sets the querystring to literally what you supply
+ *
+ * @param string The querystring data. Should be of the format foo=bar&x=y etc
+ * @param bool Whether data is already urlencoded or not, default = already encoded
+ * @access public
+ */
+ function addRawQueryString($querystring, $preencoded = true)
+ {
+ $this->_url->addRawQueryString($querystring, $preencoded);
+ }
+
+ /**
+ * Adds postdata items
+ *
+ * @param string Post data name
+ * @param string Post data value
+ * @param bool Whether data is already urlencoded or not, default = not
+ * @access public
+ */
+ function addPostData($name, $value, $preencoded = false)
+ {
+ if ($preencoded) {
+ $this->_postData[$name] = $value;
+ } else {
+ $this->_postData[$name] = $this->_arrayMapRecursive('urlencode', $value);
+ }
+ }
+
+ function addPostDataArray($array, $preencoded = false)
+ {
+ foreach($array as $key => $val){
+ $this->addPostData($key, $val, $preencoded);
+ }
+ }
+
+ /**
+ * Recursively applies the callback function to the value
+ *
+ * @param mixed Callback function
+ * @param mixed Value to process
+ * @access private
+ * @return mixed Processed value
+ */
+ function _arrayMapRecursive($callback, $value)
+ {
+ if (!is_array($value)) {
+ return call_user_func($callback, $value);
+ } else {
+ $map = array();
+ foreach ($value as $k => $v) {
+ $map[$k] = $this->_arrayMapRecursive($callback, $v);
+ }
+ return $map;
+ }
+ }
+
+ /**
+ * Adds a file to upload
+ *
+ * This also changes content-type to 'multipart/form-data' for proper upload
+ *
+ * @access public
+ * @param string name of file-upload field
+ * @param mixed file name(s)
+ * @param mixed content-type(s) of file(s) being uploaded
+ * @return bool true on success
+ * @throws PEAR_Error
+ */
+ function addFile($inputName, $fileName, $contentType = 'application/octet-stream')
+ {
+ if (!is_array($fileName) && !is_readable($fileName)) {
+ return PEAR::raiseError("File '{$fileName}' is not readable");
+ } elseif (is_array($fileName)) {
+ foreach ($fileName as $name) {
+ if (!is_readable($name)) {
+ return PEAR::raiseError("File '{$name}' is not readable");
+ }
+ }
+ }
+ $this->addHeader('Content-Type', 'multipart/form-data');
+ $this->_postFiles[$inputName] = array(
+ 'name' => $fileName,
+ 'type' => $contentType
+ );
+ return true;
+ }
+
+ /**
+ * Adds raw postdata (DEPRECATED)
+ *
+ * @param string The data
+ * @param bool Whether data is preencoded or not, default = already encoded
+ * @access public
+ * @deprecated deprecated since 1.3.0, method setBody() should be used instead
+ */
+ function addRawPostData($postdata, $preencoded = true)
+ {
+ $this->_body = $preencoded ? $postdata : urlencode($postdata);
+ }
+
+ /**
+ * Sets the request body (for POST, PUT and similar requests)
+ *
+ * @param string Request body
+ * @access public
+ */
+ function setBody($body)
+ {
+ $this->_body = $body;
+ }
+
+ /**
+ * Clears any postdata that has been added (DEPRECATED).
+ *
+ * Useful for multiple request scenarios.
+ *
+ * @access public
+ * @deprecated deprecated since 1.2
+ */
+ function clearPostData()
+ {
+ $this->_postData = null;
+ }
+
+ /**
+ * Appends a cookie to "Cookie:" header
+ *
+ * @param string $name cookie name
+ * @param string $value cookie value
+ * @access public
+ */
+ function addCookie($name, $value)
+ {
+ $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
+ $this->addHeader('Cookie', $cookies . $name . '=' . $value);
+ }
+
+ /**
+ * Clears any cookies that have been added (DEPRECATED).
+ *
+ * Useful for multiple request scenarios
+ *
+ * @access public
+ * @deprecated deprecated since 1.2
+ */
+ function clearCookies()
+ {
+ $this->removeHeader('Cookie');
+ }
+
+ /**
+ * Sends the request
+ *
+ * @access public
+ * @param bool Whether to store response body in Response object property,
+ * set this to false if downloading a LARGE file and using a Listener
+ * @return mixed PEAR error on error, true otherwise
+ */
+ function sendRequest($saveBody = true)
+ {
+ if (!is_a($this->_url, 'Net_URL')) {
+ return PEAR::raiseError('No URL given.');
+ }
+
+ $host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
+ $port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
+
+ // 4.3.0 supports SSL connections using OpenSSL. The function test determines
+ // we running on at least 4.3.0
+ if (strcasecmp($this->_url->protocol, 'https') == 0 AND function_exists('file_get_contents') AND extension_loaded('openssl')) {
+ if (isset($this->_proxy_host)) {
+ return PEAR::raiseError('HTTPS proxies are not supported.');
+ }
+ $host = 'ssl://' . $host;
+ }
+
+ // magic quotes may fuck up file uploads and chunked response processing
+ $magicQuotes = ini_get('magic_quotes_runtime');
+ ini_set('magic_quotes_runtime', false);
+
+ // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
+ // connection token to a proxy server...
+ if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
+ 'Keep-Alive' == $this->_requestHeaders['connection'])
+ {
+ $this->removeHeader('connection');
+ }
+
+ $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
+ (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
+ $sockets = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
+ $sockKey = $host . ':' . $port;
+ unset($this->_sock);
+
+ // There is a connected socket in the "static" property?
+ if ($keepAlive && !empty($sockets[$sockKey]) &&
+ !empty($sockets[$sockKey]->fp))
+ {
+ $this->_sock =& $sockets[$sockKey];
+ $err = null;
+ } else {
+ $this->_notify('connect');
+ $this->_sock =& new Net_Socket();
+ $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
+ }
+ PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
+
+ if (!PEAR::isError($err)) {
+ if (!empty($this->_readTimeout)) {
+ $this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
+ }
+
+ $this->_notify('sentRequest');
+
+ // Read the response
+ $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
+ $err = $this->_response->process(
+ $this->_saveBody && $saveBody,
+ HTTP_REQUEST_METHOD_HEAD != $this->_method
+ );
+
+ if ($keepAlive) {
+ $keepAlive = (isset($this->_response->_headers['content-length'])
+ || (isset($this->_response->_headers['transfer-encoding'])
+ && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
+ if ($keepAlive) {
+ if (isset($this->_response->_headers['connection'])) {
+ $keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
+ } else {
+ $keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
+ }
+ }
+ }
+ }
+
+ ini_set('magic_quotes_runtime', $magicQuotes);
+
+ if (PEAR::isError($err)) {
+ return $err;
+ }
+
+ if (!$keepAlive) {
+ $this->disconnect();
+ // Store the connected socket in "static" property
+ } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
+ $sockets[$sockKey] =& $this->_sock;
+ }
+
+ // Check for redirection
+ if ( $this->_allowRedirects
+ AND $this->_redirects <= $this->_maxRedirects
+ AND $this->getResponseCode() > 300
+ AND $this->getResponseCode() < 399
+ AND !empty($this->_response->_headers['location'])) {
+
+
+ $redirect = $this->_response->_headers['location'];
+
+ // Absolute URL
+ if (preg_match('/^https?:\/\//i', $redirect)) {
+ $this->_url = &new Net_URL($redirect);
+ $this->addHeader('Host', $this->_generateHostHeader());
+ // Absolute path
+ } elseif ($redirect{0} == '/') {
+ $this->_url->path = $redirect;
+
+ // Relative path
+ } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
+ if (substr($this->_url->path, -1) == '/') {
+ $redirect = $this->_url->path . $redirect;
+ } else {
+ $redirect = dirname($this->_url->path) . '/' . $redirect;
+ }
+ $redirect = Net_URL::resolvePath($redirect);
+ $this->_url->path = $redirect;
+
+ // Filename, no path
+ } else {
+ if (substr($this->_url->path, -1) == '/') {
+ $redirect = $this->_url->path . $redirect;
+ } else {
+ $redirect = dirname($this->_url->path) . '/' . $redirect;
+ }
+ $this->_url->path = $redirect;
+ }
+
+ $this->_redirects++;
+ return $this->sendRequest($saveBody);
+
+ // Too many redirects
+ } elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
+ return PEAR::raiseError('Too many redirects');
+ }
+
+ return true;
+ }
+
+ /**
+ * Disconnect the socket, if connected. Only useful if using Keep-Alive.
+ *
+ * @access public
+ */
+ function disconnect()
+ {
+ if (!empty($this->_sock) && !empty($this->_sock->fp)) {
+ $this->_notify('disconnect');
+ $this->_sock->disconnect();
+ }
+ }
+
+ /**
+ * Returns the response code
+ *
+ * @access public
+ * @return mixed Response code, false if not set
+ */
+ function getResponseCode()
+ {
+ return isset($this->_response->_code) ? $this->_response->_code : false;
+ }
+
+ /**
+ * Returns either the named header or all if no name given
+ *
+ * @access public
+ * @param string The header name to return, do not set to get all headers
+ * @return mixed either the value of $headername (false if header is not present)
+ * or an array of all headers
+ */
+ function getResponseHeader($headername = null)
+ {
+ if (!isset($headername)) {
+ return isset($this->_response->_headers)? $this->_response->_headers: array();
+ } else {
+ $headername = strtolower($headername);
+ return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
+ }
+ }
+
+ /**
+ * Returns the body of the response
+ *
+ * @access public
+ * @return mixed response body, false if not set
+ */
+ function getResponseBody()
+ {
+ return isset($this->_response->_body) ? $this->_response->_body : false;
+ }
+
+ /**
+ * Returns cookies set in response
+ *
+ * @access public
+ * @return mixed array of response cookies, false if none are present
+ */
+ function getResponseCookies()
+ {
+ return isset($this->_response->_cookies) ? $this->_response->_cookies : false;
+ }
+
+ /**
+ * Builds the request string
+ *
+ * @access private
+ * @return string The request string
+ */
+ function _buildRequest()
+ {
+ $separator = ini_get('arg_separator.output');
+ ini_set('arg_separator.output', '&');
+ $querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
+ ini_set('arg_separator.output', $separator);
+
+ $host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
+ $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
+ $path = $this->_url->path . $querystring;
+ $url = $host . $port . $path;
+
+ $request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
+
+ if (in_array($this->_method, $this->_bodyDisallowed) ||
+ (empty($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method ||
+ (empty($this->_postData) && empty($this->_postFiles)))))
+ {
+ $this->removeHeader('Content-Type');
+ } else {
+ if (empty($this->_requestHeaders['content-type'])) {
+ // Add default content-type
+ $this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
+ } elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
+ $boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
+ $this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
+ }
+ }
+
+ // Request Headers
+ if (!empty($this->_requestHeaders)) {
+ foreach ($this->_requestHeaders as $name => $value) {
+ $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+ $request .= $canonicalName . ': ' . $value . "\r\n";
+ }
+ }
+
+ // No post data or wrong method, so simply add a final CRLF
+ if (in_array($this->_method, $this->_bodyDisallowed) ||
+ (HTTP_REQUEST_METHOD_POST != $this->_method && empty($this->_body))) {
+
+ $request .= "\r\n";
+
+ // Post data if it's an array
+ } elseif (HTTP_REQUEST_METHOD_POST == $this->_method &&
+ (!empty($this->_postData) || !empty($this->_postFiles))) {
+
+ // "normal" POST request
+ if (!isset($boundary)) {
+ $postdata = implode('&', array_map(
+ create_function('$a', 'return $a[0] . \'=\' . $a[1];'),
+ $this->_flattenArray('', $this->_postData)
+ ));
+
+ // multipart request, probably with file uploads
+ } else {
+ $postdata = '';
+ if (!empty($this->_postData)) {
+ $flatData = $this->_flattenArray('', $this->_postData);
+ foreach ($flatData as $item) {
+ $postdata .= '--' . $boundary . "\r\n";
+ $postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
+ $postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
+ }
+ }
+ foreach ($this->_postFiles as $name => $value) {
+ if (is_array($value['name'])) {
+ $varname = $name . ($this->_useBrackets? '[]': '');
+ } else {
+ $varname = $name;
+ $value['name'] = array($value['name']);
+ }
+ foreach ($value['name'] as $key => $filename) {
+ $fp = fopen($filename, 'r');
+ $data = fread($fp, filesize($filename));
+ fclose($fp);
+ $basename = basename($filename);
+ $type = is_array($value['type'])? @$value['type'][$key]: $value['type'];
+
+ $postdata .= '--' . $boundary . "\r\n";
+ $postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
+ $postdata .= "\r\nContent-Type: " . $type;
+ $postdata .= "\r\n\r\n" . $data . "\r\n";
+ }
+ }
+ $postdata .= '--' . $boundary . "--\r\n";
+ }
+ $request .= 'Content-Length: ' . strlen($postdata) . "\r\n\r\n";
+ $request .= $postdata;
+
+ // Explicitly set request body
+ } elseif (!empty($this->_body)) {
+
+ $request .= 'Content-Length: ' . strlen($this->_body) . "\r\n\r\n";
+ $request .= $this->_body;
+ }
+
+ return $request;
+ }
+
+ /**
+ * Helper function to change the (probably multidimensional) associative array
+ * into the simple one.
+ *
+ * @param string name for item
+ * @param mixed item's values
+ * @return array array with the following items: array('item name', 'item value');
+ */
+ function _flattenArray($name, $values)
+ {
+ if (!is_array($values)) {
+ return array(array($name, $values));
+ } else {
+ $ret = array();
+ foreach ($values as $k => $v) {
+ if (empty($name)) {
+ $newName = $k;
+ } elseif ($this->_useBrackets) {
+ $newName = $name . '[' . $k . ']';
+ } else {
+ $newName = $name;
+ }
+ $ret = array_merge($ret, $this->_flattenArray($newName, $v));
+ }
+ return $ret;
+ }
+ }
+
+
+ /**
+ * Adds a Listener to the list of listeners that are notified of
+ * the object's events
+ *
+ * @param object HTTP_Request_Listener instance to attach
+ * @return boolean whether the listener was successfully attached
+ * @access public
+ */
+ function attach(&$listener)
+ {
+ if (!is_a($listener, 'HTTP_Request_Listener')) {
+ return false;
+ }
+ $this->_listeners[$listener->getId()] =& $listener;
+ return true;
+ }
+
+
+ /**
+ * Removes a Listener from the list of listeners
+ *
+ * @param object HTTP_Request_Listener instance to detach
+ * @return boolean whether the listener was successfully detached
+ * @access public
+ */
+ function detach(&$listener)
+ {
+ if (!is_a($listener, 'HTTP_Request_Listener') ||
+ !isset($this->_listeners[$listener->getId()])) {
+ return false;
+ }
+ unset($this->_listeners[$listener->getId()]);
+ return true;
+ }
+
+
+ /**
+ * Notifies all registered listeners of an event.
+ *
+ * Events sent by HTTP_Request object
+ * - 'connect': on connection to server
+ * - 'sentRequest': after the request was sent
+ * - 'disconnect': on disconnection from server
+ *
+ * Events sent by HTTP_Response object
+ * - 'gotHeaders': after receiving response headers (headers are passed in $data)
+ * - 'tick': on receiving a part of response body (the part is passed in $data)
+ * - 'gzTick': on receiving a gzip-encoded part of response body (ditto)
+ * - 'gotBody': after receiving the response body (passes the decoded body in $data if it was gzipped)
+ *
+ * @param string Event name
+ * @param mixed Additional data
+ * @access private
+ */
+ function _notify($event, $data = null)
+ {
+ foreach (array_keys($this->_listeners) as $id) {
+ $this->_listeners[$id]->update($this, $event, $data);
+ }
+ }
+}
+
+
+/**
+* Response class to complement the Request class
+*/
+class HTTP_Response
+{
+ /**
+ * Socket object
+ * @var object
+ */
+ var $_sock;
+
+ /**
+ * Protocol
+ * @var string
+ */
+ var $_protocol;
+
+ /**
+ * Return code
+ * @var string
+ */
+ var $_code;
+
+ /**
+ * Response headers
+ * @var array
+ */
+ var $_headers;
+
+ /**
+ * Cookies set in response
+ * @var array
+ */
+ var $_cookies;
+
+ /**
+ * Response body
+ * @var string
+ */
+ var $_body = '';
+
+ /**
+ * Used by _readChunked(): remaining length of the current chunk
+ * @var string
+ */
+ var $_chunkLength = 0;
+
+ /**
+ * Attached listeners
+ * @var array
+ */
+ var $_listeners = array();
+
+ /**
+ * Bytes left to read from message-body
+ * @var null|int
+ */
+ var $_toRead;
+
+ /**
+ * Constructor
+ *
+ * @param object Net_Socket socket to read the response from
+ * @param array listeners attached to request
+ * @return mixed PEAR Error on error, true otherwise
+ */
+ function HTTP_Response(&$sock, &$listeners)
+ {
+ $this->_sock =& $sock;
+ $this->_listeners =& $listeners;
+ }
+
+
+ /**
+ * Processes a HTTP response
+ *
+ * This extracts response code, headers, cookies and decodes body if it
+ * was encoded in some way
+ *
+ * @access public
+ * @param bool Whether to store response body in object property, set
+ * this to false if downloading a LARGE file and using a Listener.
+ * This is assumed to be true if body is gzip-encoded.
+ * @param bool Whether the response can actually have a message-body.
+ * Will be set to false for HEAD requests.
+ * @throws PEAR_Error
+ * @return mixed true on success, PEAR_Error in case of malformed response
+ */
+ function process($saveBody = true, $canHaveBody = true)
+ {
+ do {
+ $line = $this->_sock->readLine();
+ if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
+ return PEAR::raiseError('Malformed response.');
+ } else {
+ $this->_protocol = 'HTTP/' . $http_version;
+ $this->_code = intval($returncode);
+ }
+ while ('' !== ($header = $this->_sock->readLine())) {
+ $this->_processHeader($header);
+ }
+ } while (100 == $this->_code);
+
+ $this->_notify('gotHeaders', $this->_headers);
+
+ // RFC 2616, section 4.4:
+ // 1. Any response message which "MUST NOT" include a message-body ...
+ // is always terminated by the first empty line after the header fields
+ // 3. ... If a message is received with both a
+ // Transfer-Encoding header field and a Content-Length header field,
+ // the latter MUST be ignored.
+ $canHaveBody = $canHaveBody && $this->_code >= 200 &&
+ $this->_code != 204 && $this->_code != 304;
+
+ // If response body is present, read it and decode
+ $chunked = isset($this->_headers['transfer-encoding']) && ('chunked' == $this->_headers['transfer-encoding']);
+ $gzipped = isset($this->_headers['content-encoding']) && ('gzip' == $this->_headers['content-encoding']);
+ $hasBody = false;
+ if ($canHaveBody && ($chunked || !isset($this->_headers['content-length']) ||
+ 0 != $this->_headers['content-length']))
+ {
+ if ($chunked || !isset($this->_headers['content-length'])) {
+ $this->_toRead = null;
+ } else {
+ $this->_toRead = $this->_headers['content-length'];
+ }
+ while (!$this->_sock->eof() && (is_null($this->_toRead) || 0 < $this->_toRead)) {
+ if ($chunked) {
+ $data = $this->_readChunked();
+ } elseif (is_null($this->_toRead)) {
+ $data = $this->_sock->read(4096);
+ } else {
+ $data = $this->_sock->read(min(4096, $this->_toRead));
+ $this->_toRead -= strlen($data);
+ }
+ if ('' == $data) {
+ break;
+ } else {
+ $hasBody = true;
+ if ($saveBody || $gzipped) {
+ $this->_body .= $data;
+ }
+ $this->_notify($gzipped? 'gzTick': 'tick', $data);
+ }
+ }
+ }
+
+ if ($hasBody) {
+ // Uncompress the body if needed
+ if ($gzipped) {
+ $body = $this->_decodeGzip($this->_body);
+ if (PEAR::isError($body)) {
+ return $body;
+ }
+ $this->_body = $body;
+ $this->_notify('gotBody', $this->_body);
+ } else {
+ $this->_notify('gotBody');
+ }
+ }
+ return true;
+ }
+
+
+ /**
+ * Processes the response header
+ *
+ * @access private
+ * @param string HTTP header
+ */
+ function _processHeader($header)
+ {
+ if (false === strpos($header, ':')) {
+ return;
+ }
+ list($headername, $headervalue) = explode(':', $header, 2);
+ $headername = strtolower($headername);
+ $headervalue = ltrim($headervalue);
+
+ if ('set-cookie' != $headername) {
+ if (isset($this->_headers[$headername])) {
+ $this->_headers[$headername] .= ',' . $headervalue;
+ } else {
+ $this->_headers[$headername] = $headervalue;
+ }
+ } else {
+ $this->_parseCookie($headervalue);
+ }
+ }
+
+
+ /**
+ * Parse a Set-Cookie header to fill $_cookies array
+ *
+ * @access private
+ * @param string value of Set-Cookie header
+ */
+ function _parseCookie($headervalue)
+ {
+ $cookie = array(
+ 'expires' => null,
+ 'domain' => null,
+ 'path' => null,
+ 'secure' => false
+ );
+
+ // Only a name=value pair
+ if (!strpos($headervalue, ';')) {
+ $pos = strpos($headervalue, '=');
+ $cookie['name'] = trim(substr($headervalue, 0, $pos));
+ $cookie['value'] = trim(substr($headervalue, $pos + 1));
+
+ // Some optional parameters are supplied
+ } else {
+ $elements = explode(';', $headervalue);
+ $pos = strpos($elements[0], '=');
+ $cookie['name'] = trim(substr($elements[0], 0, $pos));
+ $cookie['value'] = trim(substr($elements[0], $pos + 1));
+
+ for ($i = 1; $i < count($elements); $i++) {
+ if (false === strpos($elements[$i], '=')) {
+ $elName = trim($elements[$i]);
+ $elValue = null;
+ } else {
+ list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
+ }
+ $elName = strtolower($elName);
+ if ('secure' == $elName) {
+ $cookie['secure'] = true;
+ } elseif ('expires' == $elName) {
+ $cookie['expires'] = str_replace('"', '', $elValue);
+ } elseif ('path' == $elName || 'domain' == $elName) {
+ $cookie[$elName] = urldecode($elValue);
+ } else {
+ $cookie[$elName] = $elValue;
+ }
+ }
+ }
+ $this->_cookies[] = $cookie;
+ }
+
+
+ /**
+ * Read a part of response body encoded with chunked Transfer-Encoding
+ *
+ * @access private
+ * @return string
+ */
+ function _readChunked()
+ {
+ // at start of the next chunk?
+ if (0 == $this->_chunkLength) {
+ $line = $this->_sock->readLine();
+ if (preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+ $this->_chunkLength = hexdec($matches[1]);
+ // Chunk with zero length indicates the end
+ if (0 == $this->_chunkLength) {
+ $this->_sock->readLine(); // make this an eof()
+ return '';
+ }
+ } else {
+ return '';
+ }
+ }
+ $data = $this->_sock->read($this->_chunkLength);
+ $this->_chunkLength -= strlen($data);
+ if (0 == $this->_chunkLength) {
+ $this->_sock->readLine(); // Trailing CRLF
+ }
+ return $data;
+ }
+
+
+ /**
+ * Notifies all registered listeners of an event.
+ *
+ * @param string Event name
+ * @param mixed Additional data
+ * @access private
+ * @see HTTP_Request::_notify()
+ */
+ function _notify($event, $data = null)
+ {
+ foreach (array_keys($this->_listeners) as $id) {
+ $this->_listeners[$id]->update($this, $event, $data);
+ }
+ }
+
+
+ /**
+ * Decodes the message-body encoded by gzip
+ *
+ * The real decoding work is done by gzinflate() built-in function, this
+ * method only parses the header and checks data for compliance with
+ * RFC 1952
+ *
+ * @access private
+ * @param string gzip-encoded data
+ * @return string decoded data
+ */
+ function _decodeGzip($data)
+ {
+ $length = strlen($data);
+ // If it doesn't look like gzip-encoded data, don't bother
+ if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
+ return $data;
+ }
+ $method = ord(substr($data, 2, 1));
+ if (8 != $method) {
+ return PEAR::raiseError('_decodeGzip(): unknown compression method');
+ }
+ $flags = ord(substr($data, 3, 1));
+ if ($flags & 224) {
+ return PEAR::raiseError('_decodeGzip(): reserved bits are set');
+ }
+
+ // header is 10 bytes minimum. may be longer, though.
+ $headerLength = 10;
+ // extra fields, need to skip 'em
+ if ($flags & 4) {
+ if ($length - $headerLength - 2 < 8) {
+ return PEAR::raiseError('_decodeGzip(): data too short');
+ }
+ $extraLength = unpack('v', substr($data, 10, 2));
+ if ($length - $headerLength - 2 - $extraLength[1] < 8) {
+ return PEAR::raiseError('_decodeGzip(): data too short');
+ }
+ $headerLength += $extraLength[1] + 2;
+ }
+ // file name, need to skip that
+ if ($flags & 8) {
+ if ($length - $headerLength - 1 < 8) {
+ return PEAR::raiseError('_decodeGzip(): data too short');
+ }
+ $filenameLength = strpos(substr($data, $headerLength), chr(0));
+ if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
+ return PEAR::raiseError('_decodeGzip(): data too short');
+ }
+ $headerLength += $filenameLength + 1;
+ }
+ // comment, need to skip that also
+ if ($flags & 16) {
+ if ($length - $headerLength - 1 < 8) {
+ return PEAR::raiseError('_decodeGzip(): data too short');
+ }
+ $commentLength = strpos(substr($data, $headerLength), chr(0));
+ if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
+ return PEAR::raiseError('_decodeGzip(): data too short');
+ }
+ $headerLength += $commentLength + 1;
+ }
+ // have a CRC for header. let's check
+ if ($flags & 1) {
+ if ($length - $headerLength - 2 < 8) {
+ return PEAR::raiseError('_decodeGzip(): data too short');
+ }
+ $crcReal = 0xffff & crc32(substr($data, 0, $headerLength));
+ $crcStored = unpack('v', substr($data, $headerLength, 2));
+ if ($crcReal != $crcStored[1]) {
+ return PEAR::raiseError('_decodeGzip(): header CRC check failed');
+ }
+ $headerLength += 2;
+ }
+ // unpacked data CRC and size at the end of encoded data
+ $tmp = unpack('V2', substr($data, -8));
+ $dataCrc = $tmp[1];
+ $dataSize = $tmp[2];
+
+ // finally, call the gzinflate() function
+ $unpacked = @gzinflate(substr($data, $headerLength, -8), $dataSize);
+ if (false === $unpacked) {
+ return PEAR::raiseError('_decodeGzip(): gzinflate() call failed');
+ } elseif ($dataSize != strlen($unpacked)) {
+ return PEAR::raiseError('_decodeGzip(): data size check failed');
+ } elseif ($dataCrc != crc32($unpacked)) {
+ return PEAR::raiseError('_decodeGzip(): data CRC check failed');
+ }
+ return $unpacked;
+ }
+} // End class HTTP_Response
+?>
Index: /closed/version-2_5-dev/data/module/Smarty/BUGS
===================================================================
--- /closed/version-2_5-dev/data/module/Smarty/BUGS (revision 20119)
+++ /closed/version-2_5-dev/data/module/Smarty/BUGS (revision 20119)
@@ -0,0 +1,7 @@
+Smarty is supported only in PHP 4.0.6 or later.
+
+Smarty versions previous to 2.0 require the PEAR libraries. Be sure to include
+the path to the PEAR libraries in your php include_path. Config_file.class.php
+uses the PEAR library for its error handling routines. PEAR comes with the PHP
+distribution. Unix users check /usr/local/lib/php, windows users check
+C:/php/pear.
Index: /closed/version-2_5-dev/data/module/Smarty/TODO
===================================================================
--- /closed/version-2_5-dev/data/module/Smarty/TODO (revision 20119)
+++ /closed/version-2_5-dev/data/module/Smarty/TODO (revision 20119)
@@ -0,0 +1,10 @@
+* handle asp style tags in $php_handler
+* fix all E_NOTICE warnings
+* make simple math easier
+* caching all but parts of the template
+* change plugins so $smarty variable always comes first
+* get cache ttl with function call
+FIX: make inserts use normal functions before plugins
+UPD: change it so that if template comes from some resource,
+ that resource stays as the default, no need to specify it
+ in includes.
Index: /closed/version-2_5-dev/data/module/Smarty/INSTALL
===================================================================
--- /closed/version-2_5-dev/data/module/Smarty/INSTALL (revision 20119)
+++ /closed/version-2_5-dev/data/module/Smarty/INSTALL (revision 20119)
@@ -0,0 +1,29 @@
+REQUIREMENTS:
+
+Smarty requires PHP 4.0.6 or later.
+See the on-line documentation for complete install instructions.
+
+INSTALLATION (quick):
+
+* copy the files under the libs/ directory to a directory that is in your PHP
+ include_path, or set the SMARTY_DIR constant and put them in this directory.
+ (if you upgrade from versions before 2.5.0 be aware that up to Smarty 2.4.2
+ all necessary files where in the distribution's root directory, but are now
+ in libs/.)
+
+* for each application using Smarty, create a "templates", "configs", and a
+ "templates_c" directory, be sure to set the appropriate directory settings in
+ Smarty for them. If they are located in the same directory as your
+ application, they shouldn't need to be modified. Be sure the "templates_c"
+ directory is writable by your web server user (usually nobody). chown
+ nobody:nobody templates_c; chmod 700 templates_c You can also chmod 777 this
+ directory, but be aware of security issues for multi-user systems. If you are
+ using Smarty's built-in caching, create a "cache" directory and also chown
+ nobody:nobody.
+
+* setup your php and template files. A good working example is in the on-line
+ documentation.
+
+* TECHNICAL NOTE: If you do not have access to the php.ini file, you can change
+ non-server settings (such as your include_path) with the ini_set() command.
+ example: ini_set("include_path",".:/usr/local/lib/php");
Index: /closed/version-2_5-dev/data/module/Smarty/ChangeLog
===================================================================
--- /closed/version-2_5-dev/data/module/Smarty/ChangeLog (revision 20119)
+++ /closed/version-2_5-dev/data/module/Smarty/ChangeLog (revision 20119)
@@ -0,0 +1,9179 @@
+2007-09-27 TAKAGI Masahiro
+
+ * docs/ja/designers/language-custom-functions/language-function-html-checkboxes.xml:
+ sync with en.
+
+2007-09-27 Monte Ohrt
+
+ * docs/en/designers/language-custom-functions/language-function-html-checkboxes.xml:
+ remove redundant attribute
+
+2007-09-18 Messju Mohr
+
+ * docs/id/programmers/plugins/plugins-functions.xml:
+ removed errornous whitespace
+
+2007-09-18 Zaenal Mutaqin
+
+ * docs/id/designers/language-basic-syntax/language-escaping.xml
+ docs/id/designers/language-basic-syntax/language-math.xml
+ docs/id/designers/language-basic-syntax/language-syntax-attributes.xml
+ docs/id/designers/language-basic-syntax/language-syntax-comments.xml
+ docs/id/designers/language-basic-syntax/language-syntax-functions.xml
+ docs/id/designers/language-basic-syntax/language-syntax-quotes.xml
+ docs/id/designers/language-basic-syntax/language-syntax-variables.xml
+ docs/id/designers/language-builtin-functions/language-function-capture.xml
+ docs/id/designers/language-builtin-functions/language-function-config-load.xml
+ docs/id/designers/language-builtin-functions/language-function-foreach.xml
+ docs/id/designers/language-builtin-functions/language-function-if.xml
+ docs/id/designers/language-builtin-functions/language-function-include-php.xml
+ docs/id/designers/language-builtin-functions/language-function-include.xml
+ docs/id/designers/language-builtin-functions/language-function-insert.xml
+ docs/id/designers/language-builtin-functions/language-function-ldelim.xml
+ docs/id/designers/language-builtin-functions/language-function-literal.xml
+ docs/id/designers/language-builtin-functions/language-function-php.xml
+ docs/id/designers/language-builtin-functions/language-function-section.xml
+ docs/id/designers/language-builtin-functions/language-function-strip.xml
+ docs/id/designers/language-custom-functions/language-function-assign.xml
+ docs/id/designers/language-custom-functions/language-function-counter.xml
+ docs/id/designers/language-custom-functions/language-function-cycle.xml
+ docs/id/designers/language-custom-functions/language-function-debug.xml
+ docs/id/designers/language-custom-functions/language-function-eval.xml
+ docs/id/designers/language-custom-functions/language-function-fetch.xml
+ docs/id/designers/language-custom-functions/language-function-html-checkboxes.xml
+ docs/id/designers/language-custom-functions/language-function-html-image.xml
+ docs/id/designers/language-custom-functions/language-function-html-options.xml
+ docs/id/designers/language-custom-functions/language-function-html-radios.xml
+ docs/id/designers/language-custom-functions/language-function-html-select-date.xml
+ docs/id/designers/language-custom-functions/language-function-html-select-time.xml
+ docs/id/designers/language-custom-functions/language-function-html-table.xml
+ docs/id/designers/language-custom-functions/language-function-mailto.xml
+ docs/id/designers/language-custom-functions/language-function-math.xml
+ docs/id/designers/language-custom-functions/language-function-popup-init.xml
+ docs/id/designers/language-custom-functions/language-function-popup.xml
+ docs/id/designers/language-custom-functions/language-function-textformat.xml
+ docs/id/designers/language-modifiers/language-modifier-capitalize.xml
+ docs/id/designers/language-modifiers/language-modifier-cat.xml
+ docs/id/designers/language-modifiers/language-modifier-count-characters.xml
+ docs/id/designers/language-modifiers/language-modifier-count-paragraphs.xml
+ docs/id/designers/language-modifiers/language-modifier-count-sentences.xml
+ docs/id/designers/language-modifiers/language-modifier-count-words.xml
+ docs/id/designers/language-modifiers/language-modifier-date-format.xml
+ docs/id/designers/language-modifiers/language-modifier-default.xml
+ docs/id/designers/language-modifiers/language-modifier-escape.xml
+ docs/id/designers/language-modifiers/language-modifier-indent.xml
+ docs/id/designers/language-modifiers/language-modifier-lower.xml
+ docs/id/designers/language-modifiers/language-modifier-nl2br.xml
+ docs/id/designers/language-modifiers/language-modifier-regex-replace.xml
+ docs/id/designers/language-modifiers/language-modifier-replace.xml
+ docs/id/designers/language-modifiers/language-modifier-spacify.xml
+ docs/id/designers/language-modifiers/language-modifier-string-format.xml
+ docs/id/designers/language-modifiers/language-modifier-strip-tags.xml
+ docs/id/designers/language-modifiers/language-modifier-strip.xml
+ docs/id/designers/language-modifiers/language-modifier-truncate.xml
+ docs/id/designers/language-modifiers/language-modifier-upper.xml
+ docs/id/designers/language-modifiers/language-modifier-wordwrap.xml
+ docs/id/designers/language-variables/language-assigned-variables.xml
+ docs/id/designers/language-variables/language-config-variables.xml
+ docs/id/designers/language-variables/language-variables-smarty.xml
+ docs/id/programmers/advanced-features/advanced-features-objects.xml
+ docs/id/programmers/advanced-features/advanced-features-outputfilters.xml
+ docs/id/programmers/advanced-features/advanced-features-postfilters.xml
+ docs/id/programmers/advanced-features/advanced-features-prefilters.xml
+ docs/id/programmers/advanced-features/section-template-cache-handler-func.xml
+ docs/id/programmers/advanced-features/template-resources.xml
+ docs/id/programmers/api-functions/api-append-by-ref.xml
+ docs/id/programmers/api-functions/api-append.xml
+ docs/id/programmers/api-functions/api-assign-by-ref.xml
+ docs/id/programmers/api-functions/api-assign.xml
+ docs/id/programmers/api-functions/api-clear-all-assign.xml
+ docs/id/programmers/api-functions/api-clear-all-cache.xml
+ docs/id/programmers/api-functions/api-clear-assign.xml
+ docs/id/programmers/api-functions/api-clear-cache.xml
+ docs/id/programmers/api-functions/api-clear-compiled-tpl.xml
+ docs/id/programmers/api-functions/api-clear-config.xml
+ docs/id/programmers/api-functions/api-config-load.xml
+ docs/id/programmers/api-functions/api-display.xml
+ docs/id/programmers/api-functions/api-fetch.xml
+ docs/id/programmers/api-functions/api-get-config-vars.xml
+ docs/id/programmers/api-functions/api-get-registered-object.xml
+ docs/id/programmers/api-functions/api-get-template-vars.xml
+ docs/id/programmers/api-functions/api-is-cached.xml
+ docs/id/programmers/api-functions/api-load-filter.xml
+ docs/id/programmers/api-functions/api-register-block.xml
+ docs/id/programmers/api-functions/api-register-compiler-function.xml
+ docs/id/programmers/api-functions/api-register-function.xml
+ docs/id/programmers/api-functions/api-register-modifier.xml
+ docs/id/programmers/api-functions/api-register-object.xml
+ docs/id/programmers/api-functions/api-register-outputfilter.xml
+ docs/id/programmers/api-functions/api-register-postfilter.xml
+ docs/id/programmers/api-functions/api-register-prefilter.xml
+ docs/id/programmers/api-functions/api-register-resource.xml
+ docs/id/programmers/api-functions/api-template-exists.xml
+ docs/id/programmers/api-functions/api-trigger-error.xml
+ docs/id/programmers/api-functions/api-unregister-block.xml
+ docs/id/programmers/api-functions/api-unregister-compiler-function.xml
+ docs/id/programmers/api-functions/api-unregister-function.xml
+ docs/id/programmers/api-functions/api-unregister-modifier.xml
+ docs/id/programmers/api-functions/api-unregister-object.xml
+ docs/id/programmers/api-functions/api-unregister-outputfilter.xml
+ docs/id/programmers/api-functions/api-unregister-postfilter.xml
+ docs/id/programmers/api-functions/api-unregister-prefilter.xml
+ docs/id/programmers/api-functions/api-unregister-resource.xml
+ docs/id/programmers/api-variables/variable-autoload-filters.xml
+ docs/id/programmers/api-variables/variable-cache-dir.xml
+ docs/id/programmers/api-variables/variable-cache-handler-func.xml
+ docs/id/programmers/api-variables/variable-cache-lifetime.xml
+ docs/id/programmers/api-variables/variable-cache-modified-check.xml
+ docs/id/programmers/api-variables/variable-caching.xml
+ docs/id/programmers/api-variables/variable-compile-check.xml
+ docs/id/programmers/api-variables/variable-compile-dir.xml
+ docs/id/programmers/api-variables/variable-compile-id.xml
+ docs/id/programmers/api-variables/variable-compiler-class.xml
+ docs/id/programmers/api-variables/variable-config-booleanize.xml
+ docs/id/programmers/api-variables/variable-config-dir.xml
+ docs/id/programmers/api-variables/variable-config-fix-newlines.xml
+ docs/id/programmers/api-variables/variable-config-overwrite.xml
+ docs/id/programmers/api-variables/variable-config-read-hidden.xml
+ docs/id/programmers/api-variables/variable-debug-tpl.xml
+ docs/id/programmers/api-variables/variable-debugging-ctrl.xml
+ docs/id/programmers/api-variables/variable-debugging.xml
+ docs/id/programmers/api-variables/variable-default-modifiers.xml
+ docs/id/programmers/api-variables/variable-default-resource-type.xml
+ docs/id/programmers/api-variables/variable-default-template-handler-func.xml
+ docs/id/programmers/api-variables/variable-error-reporting.xml
+ docs/id/programmers/api-variables/variable-force-compile.xml
+ docs/id/programmers/api-variables/variable-left-delimiter.xml
+ docs/id/programmers/api-variables/variable-php-handling.xml
+ docs/id/programmers/api-variables/variable-plugins-dir.xml
+ docs/id/programmers/api-variables/variable-request-use-auto-globals.xml
+ docs/id/programmers/api-variables/variable-request-vars-order.xml
+ docs/id/programmers/api-variables/variable-right-delimiter.xml
+ docs/id/programmers/api-variables/variable-secure-dir.xml
+ docs/id/programmers/api-variables/variable-security-settings.xml
+ docs/id/programmers/api-variables/variable-security.xml
+ docs/id/programmers/api-variables/variable-template-dir.xml
+ docs/id/programmers/api-variables/variable-trusted-dir.xml
+ docs/id/programmers/api-variables/variable-use-sub-dirs.xml
+ docs/id/programmers/caching/caching-cacheable.xml
+ docs/id/programmers/caching/caching-groups.xml
+ docs/id/programmers/caching/caching-multiple-caches.xml
+ docs/id/programmers/caching/caching-setting-up.xml
+ docs/id/programmers/plugins/plugins-block-functions.xml
+ docs/id/programmers/plugins/plugins-compiler-functions.xml
+ docs/id/programmers/plugins/plugins-functions.xml
+ docs/id/programmers/plugins/plugins-howto.xml
+ docs/id/programmers/plugins/plugins-inserts.xml
+ docs/id/programmers/plugins/plugins-modifiers.xml
+ docs/id/programmers/plugins/plugins-naming-conventions.xml
+ docs/id/programmers/plugins/plugins-outputfilters.xml
+ docs/id/programmers/plugins/plugins-prefilters-postfilters.xml
+ docs/id/programmers/plugins/plugins-resources.xml
+ docs/id/programmers/plugins/plugins-writing.xml:
+ Typos correction and all translated now.
+
+2007-09-17 Messju Mohr
+
+ * docs/id/bookinfo.xml
+ docs/id/getting-started.xml
+ docs/id/language-defs.ent
+ docs/id/language-snippets.ent
+ docs/id/livedocs.ent
+ docs/id/preface.xml:
+ added indonesian docs - thanks Zaenal Mutaqin
+
+ * docs/scripts/generate_web.php:
+ raise pcre.backtrack_limit - thanks to takagi
+
+2007-09-16 Monte Ohrt
+
+ * libs/Smarty_Compiler.class.php:
+ fix typo
+
+2007-08-22 George Miroshnikov
+
+ * docs/ru/getting-started.xml
+ docs/ru/getting-started.xml:
+ Sync with EN.
+
+2007-08-01 Monte Ohrt
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ add append feature to capture
+
+2007-06-24 TAKAGI Masahiro
+
+ * docs/ja/getting-started.xml:
+ sync with en.
+
+2007-06-24 Messju Mohr
+
+ * docs/Makefile.in:
+ reverted accidently modified file
+
+ * docs/Makefile.in
+ docs/de/getting-started.xml:
+ sync with en
+
+ * docs/en/getting-started.xml:
+ fixed link to ini_set(). thanks to Lee Yunyoung.
+
+2007-06-18 TAKAGI Masahiro
+
+ * docs/ja/language-snippets.ent
+ docs/ja/programmers/api-functions/api-register-outputfilter.xml
+ docs/ja/programmers/api-functions/api-register-postfilter.xml
+ docs/ja/programmers/api-functions/api-register-prefilter.xml:
+ sync with en.
+
+2007-06-18 Danilo Buerger
+
+ * docs/en/language-snippets.ent
+ docs/en/programmers/api-functions/api-register-outputfilter.xml
+ docs/en/programmers/api-functions/api-register-postfilter.xml
+ docs/en/programmers/api-functions/api-register-prefilter.xml:
+ Updated docs according to the changes from the previous commit
+
+ * NEWS
+ libs/Smarty.class.php:
+ Added the ability to (un)register multiple filters of the same type with
+ the same method name but different class name. Before it was not possible
+ due to the fact that only the method name was used to distinguish between
+ different filters of the same type. This does however not allow (same as
+ before) to register multiple filters of the same type with the same method
+ and class name (i.e. different instances of the same class).
+
+2007-05-29 Messju Mohr
+
+ * libs/plugins/compiler.assign.php:
+ fixed typo
+
+2007-05-11 Messju Mohr
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ fixed calling registered objects' methods with an empty argument list.
+ thanks marcello
+
+2007-05-03 TAKAGI Masahiro
+
+ * docs/ja/designers/language-variables.xml
+ docs/ja/designers/language-builtin-functions/language-function-config-load.xml
+ docs/ja/designers/language-builtin-functions/language-function-foreach.xml
+ docs/ja/designers/language-builtin-functions/language-function-if.xml
+ docs/ja/designers/language-modifiers/language-modifier-cat.xml
+ docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml
+ docs/ja/designers/language-variables/language-variables-smarty.xml:
+ sync with en.
+
+2007-05-03 Monte Ohrt
+
+ * docs/en/designers/language-variables.xml
+ docs/en/designers/language-builtin-functions/language-function-config-load.xml
+ docs/en/designers/language-builtin-functions/language-function-foreach.xml
+ docs/en/designers/language-builtin-functions/language-function-if.xml
+ docs/en/designers/language-modifiers/language-modifier-cat.xml
+ docs/en/designers/language-modifiers/language-modifier-wordwrap.xml
+ docs/en/designers/language-variables/language-variables-smarty.xml:
+ update documentation corrections from marcello in the forums. Thanks
+ marcello!
+
+2007-04-22 TAKAGI Masahiro
+
+ * docs/ja/programmers/advanced-features.xml
+ docs/ja/programmers/api-functions.xml
+ docs/ja/programmers/api-variables.xml:
+ corrected the garbled text.
+
+2007-04-21 TAKAGI Masahiro
+
+ * docs/ja/bookinfo.xml
+ docs/ja/getting-started.xml
+ docs/ja/language-defs.ent
+ docs/ja/language-snippets.ent
+ docs/ja/livedocs.ent
+ docs/ja/make_chm_index.html
+ docs/ja/preface.xml
+ docs/ja/translation.xml
+ docs/ja/appendixes/bugs.xml
+ docs/ja/appendixes/resources.xml
+ docs/ja/appendixes/tips.xml
+ docs/ja/appendixes/troubleshooting.xml
+ docs/ja/designers/chapter-debugging-console.xml
+ docs/ja/designers/config-files.xml
+ docs/ja/designers/language-basic-syntax.xml
+ docs/ja/designers/language-builtin-functions.xml
+ docs/ja/designers/language-combining-modifiers.xml
+ docs/ja/designers/language-custom-functions.xml
+ docs/ja/designers/language-modifiers.xml
+ docs/ja/designers/language-variables.xml
+ docs/ja/designers/language-basic-syntax/language-escaping.xml
+ docs/ja/designers/language-basic-syntax/language-math.xml
+ docs/ja/designers/language-basic-syntax/language-syntax-attributes.xml
+ docs/ja/designers/language-basic-syntax/language-syntax-comments.xml
+ docs/ja/designers/language-basic-syntax/language-syntax-functions.xml
+ docs/ja/designers/language-basic-syntax/language-syntax-quotes.xml
+ docs/ja/designers/language-basic-syntax/language-syntax-variables.xml
+ docs/ja/designers/language-builtin-functions/language-function-capture.xml
+ docs/ja/designers/language-builtin-functions/language-function-config-load.xml
+ docs/ja/designers/language-builtin-functions/language-function-foreach.xml
+ docs/ja/designers/language-builtin-functions/language-function-if.xml
+ docs/ja/designers/language-builtin-functions/language-function-include-php.xml
+ docs/ja/designers/language-builtin-functions/language-function-include.xml
+ docs/ja/designers/language-builtin-functions/language-function-insert.xml
+ docs/ja/designers/language-builtin-functions/language-function-ldelim.xml
+ docs/ja/designers/language-builtin-functions/language-function-literal.xml
+ docs/ja/designers/language-builtin-functions/language-function-php.xml
+ docs/ja/designers/language-builtin-functions/language-function-section.xml
+ docs/ja/designers/language-builtin-functions/language-function-strip.xml
+ docs/ja/designers/language-custom-functions/language-function-assign.xml
+ docs/ja/designers/language-custom-functions/language-function-counter.xml
+ docs/ja/designers/language-custom-functions/language-function-cycle.xml
+ docs/ja/designers/language-custom-functions/language-function-debug.xml
+ docs/ja/designers/language-custom-functions/language-function-eval.xml
+ docs/ja/designers/language-custom-functions/language-function-fetch.xml
+ docs/ja/designers/language-custom-functions/language-function-html-checkboxes.xml
+ docs/ja/designers/language-custom-functions/language-function-html-image.xml
+ docs/ja/designers/language-custom-functions/language-function-html-options.xml
+ docs/ja/designers/language-custom-functions/language-function-html-radios.xml
+ docs/ja/designers/language-custom-functions/language-function-html-select-date.xml
+ docs/ja/designers/language-custom-functions/language-function-html-select-time.xml
+ docs/ja/designers/language-custom-functions/language-function-html-table.xml
+ docs/ja/designers/language-custom-functions/language-function-mailto.xml
+ docs/ja/designers/language-custom-functions/language-function-math.xml
+ docs/ja/designers/language-custom-functions/language-function-popup-init.xml
+ docs/ja/designers/language-custom-functions/language-function-popup.xml
+ docs/ja/designers/language-custom-functions/language-function-textformat.xml
+ docs/ja/designers/language-modifiers/language-modifier-capitalize.xml
+ docs/ja/designers/language-modifiers/language-modifier-cat.xml
+ docs/ja/designers/language-modifiers/language-modifier-count-characters.xml
+ docs/ja/designers/language-modifiers/language-modifier-count-paragraphs.xml
+ docs/ja/designers/language-modifiers/language-modifier-count-sentences.xml
+ docs/ja/designers/language-modifiers/language-modifier-count-words.xml
+ docs/ja/designers/language-modifiers/language-modifier-date-format.xml
+ docs/ja/designers/language-modifiers/language-modifier-default.xml
+ docs/ja/designers/language-modifiers/language-modifier-escape.xml
+ docs/ja/designers/language-modifiers/language-modifier-indent.xml
+ docs/ja/designers/language-modifiers/language-modifier-lower.xml
+ docs/ja/designers/language-modifiers/language-modifier-nl2br.xml
+ docs/ja/designers/language-modifiers/language-modifier-regex-replace.xml
+ docs/ja/designers/language-modifiers/language-modifier-replace.xml
+ docs/ja/designers/language-modifiers/language-modifier-spacify.xml
+ docs/ja/designers/language-modifiers/language-modifier-string-format.xml
+ docs/ja/designers/language-modifiers/language-modifier-strip-tags.xml
+ docs/ja/designers/language-modifiers/language-modifier-strip.xml
+ docs/ja/designers/language-modifiers/language-modifier-truncate.xml
+ docs/ja/designers/language-modifiers/language-modifier-upper.xml
+ docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml
+ docs/ja/designers/language-variables/language-assigned-variables.xml
+ docs/ja/designers/language-variables/language-config-variables.xml
+ docs/ja/designers/language-variables/language-variables-smarty.xml
+ docs/ja/programmers/advanced-features.xml
+ docs/ja/programmers/api-functions.xml
+ docs/ja/programmers/api-variables.xml
+ docs/ja/programmers/caching.xml
+ docs/ja/programmers/plugins.xml
+ docs/ja/programmers/smarty-constants.xml
+ docs/ja/programmers/advanced-features/advanced-features-objects.xml
+ docs/ja/programmers/advanced-features/advanced-features-outputfilters.xml
+ docs/ja/programmers/advanced-features/advanced-features-postfilters.xml
+ docs/ja/programmers/advanced-features/advanced-features-prefilters.xml
+ docs/ja/programmers/advanced-features/section-template-cache-handler-func.xml
+ docs/ja/programmers/advanced-features/template-resources.xml
+ docs/ja/programmers/api-functions/api-append-by-ref.xml
+ docs/ja/programmers/api-functions/api-append.xml
+ docs/ja/programmers/api-functions/api-assign-by-ref.xml
+ docs/ja/programmers/api-functions/api-assign.xml
+ docs/ja/programmers/api-functions/api-clear-all-assign.xml
+ docs/ja/programmers/api-functions/api-clear-all-cache.xml
+ docs/ja/programmers/api-functions/api-clear-assign.xml
+ docs/ja/programmers/api-functions/api-clear-cache.xml
+ docs/ja/programmers/api-functions/api-clear-compiled-tpl.xml
+ docs/ja/programmers/api-functions/api-clear-config.xml
+ docs/ja/programmers/api-functions/api-config-load.xml
+ docs/ja/programmers/api-functions/api-display.xml
+ docs/ja/programmers/api-functions/api-fetch.xml
+ docs/ja/programmers/api-functions/api-get-config-vars.xml
+ docs/ja/programmers/api-functions/api-get-registered-object.xml
+ docs/ja/programmers/api-functions/api-get-template-vars.xml
+ docs/ja/programmers/api-functions/api-is-cached.xml
+ docs/ja/programmers/api-functions/api-load-filter.xml
+ docs/ja/programmers/api-functions/api-register-block.xml
+ docs/ja/programmers/api-functions/api-register-compiler-function.xml
+ docs/ja/programmers/api-functions/api-register-function.xml
+ docs/ja/programmers/api-functions/api-register-modifier.xml
+ docs/ja/programmers/api-functions/api-register-object.xml
+ docs/ja/programmers/api-functions/api-register-outputfilter.xml
+ docs/ja/programmers/api-functions/api-register-postfilter.xml
+ docs/ja/programmers/api-functions/api-register-prefilter.xml
+ docs/ja/programmers/api-functions/api-register-resource.xml
+ docs/ja/programmers/api-functions/api-template-exists.xml
+ docs/ja/programmers/api-functions/api-trigger-error.xml
+ docs/ja/programmers/api-functions/api-unregister-block.xml
+ docs/ja/programmers/api-functions/api-unregister-compiler-function.xml
+ docs/ja/programmers/api-functions/api-unregister-function.xml
+ docs/ja/programmers/api-functions/api-unregister-modifier.xml
+ docs/ja/programmers/api-functions/api-unregister-object.xml
+ docs/ja/programmers/api-functions/api-unregister-outputfilter.xml
+ docs/ja/programmers/api-functions/api-unregister-postfilter.xml
+ docs/ja/programmers/api-functions/api-unregister-prefilter.xml
+ docs/ja/programmers/api-functions/api-unregister-resource.xml
+ docs/ja/programmers/api-variables/variable-autoload-filters.xml
+ docs/ja/programmers/api-variables/variable-cache-dir.xml
+ docs/ja/programmers/api-variables/variable-cache-handler-func.xml
+ docs/ja/programmers/api-variables/variable-cache-lifetime.xml
+ docs/ja/programmers/api-variables/variable-cache-modified-check.xml
+ docs/ja/programmers/api-variables/variable-caching.xml
+ docs/ja/programmers/api-variables/variable-compile-check.xml
+ docs/ja/programmers/api-variables/variable-compile-dir.xml
+ docs/ja/programmers/api-variables/variable-compile-id.xml
+ docs/ja/programmers/api-variables/variable-compiler-class.xml
+ docs/ja/programmers/api-variables/variable-config-booleanize.xml
+ docs/ja/programmers/api-variables/variable-config-dir.xml
+ docs/ja/programmers/api-variables/variable-config-fix-newlines.xml
+ docs/ja/programmers/api-variables/variable-config-overwrite.xml
+ docs/ja/programmers/api-variables/variable-config-read-hidden.xml
+ docs/ja/programmers/api-variables/variable-debug-tpl.xml
+ docs/ja/programmers/api-variables/variable-debugging-ctrl.xml
+ docs/ja/programmers/api-variables/variable-debugging.xml
+ docs/ja/programmers/api-variables/variable-default-modifiers.xml
+ docs/ja/programmers/api-variables/variable-default-resource-type.xml
+ docs/ja/programmers/api-variables/variable-default-template-handler-func.xml
+ docs/ja/programmers/api-variables/variable-error-reporting.xml
+ docs/ja/programmers/api-variables/variable-force-compile.xml
+ docs/ja/programmers/api-variables/variable-left-delimiter.xml
+ docs/ja/programmers/api-variables/variable-php-handling.xml
+ docs/ja/programmers/api-variables/variable-plugins-dir.xml
+ docs/ja/programmers/api-variables/variable-request-use-auto-globals.xml
+ docs/ja/programmers/api-variables/variable-request-vars-order.xml
+ docs/ja/programmers/api-variables/variable-right-delimiter.xml
+ docs/ja/programmers/api-variables/variable-secure-dir.xml
+ docs/ja/programmers/api-variables/variable-security-settings.xml
+ docs/ja/programmers/api-variables/variable-security.xml
+ docs/ja/programmers/api-variables/variable-template-dir.xml
+ docs/ja/programmers/api-variables/variable-trusted-dir.xml
+ docs/ja/programmers/api-variables/variable-use-sub-dirs.xml
+ docs/ja/programmers/caching/caching-cacheable.xml
+ docs/ja/programmers/caching/caching-groups.xml
+ docs/ja/programmers/caching/caching-multiple-caches.xml
+ docs/ja/programmers/caching/caching-setting-up.xml
+ docs/ja/programmers/plugins/plugins-block-functions.xml
+ docs/ja/programmers/plugins/plugins-compiler-functions.xml
+ docs/ja/programmers/plugins/plugins-functions.xml
+ docs/ja/programmers/plugins/plugins-howto.xml
+ docs/ja/programmers/plugins/plugins-inserts.xml
+ docs/ja/programmers/plugins/plugins-modifiers.xml
+ docs/ja/programmers/plugins/plugins-naming-conventions.xml
+ docs/ja/programmers/plugins/plugins-outputfilters.xml
+ docs/ja/programmers/plugins/plugins-prefilters-postfilters.xml
+ docs/ja/programmers/plugins/plugins-resources.xml
+ docs/ja/programmers/plugins/plugins-writing.xml:
+ added Japanese translation files.
+
+ * docs/Makefile.in
+ docs/configure.in:
+ added the configuration for Japanese translation.
+
+2007-04-11 Messju Mohr
+
+ * docs/en/programmers/smarty-constants.xml:
+ fixed typo
+
+2007-04-04 Messju Mohr
+
+ * docs/ru/getting-started.xml:
+ fixed uri for Zend Accelerator
+
+2007-04-03 Messju Mohr
+
+ * docs/de/getting-started.xml
+ docs/es/getting-started.xml
+ docs/it/getting-started.xml
+ docs/pt_BR/getting-started.xml:
+ fixed uris for php-accelerator
+
+2007-03-08 Monte Ohrt
+
+ * libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ update version numbers
+
+2007-03-07 Monte Ohrt
+
+ * (Smarty_2_6_18)
+ NEWS:
+ update NEWS file with patch
+
+ * (Smarty_2_6_18)
+ docs/en/designers/language-builtin-functions/language-function-section.xml:
+ note the fact that section loop will accept an integer
+
+2007-03-06 Monte Ohrt
+
+ * NEWS
+ libs/plugins/function.html_select_date.php:
+ fix html_select_date separator when parts are missing (thanks to kayk for
+ the patch)
+
+2007-03-06 Messju Mohr
+
+ * libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ bumped version number
+
+ * NEWS:
+ added release headline
+
+ * libs/internals/core.write_compiled_include.php:
+ fixed detection of non-cached block when writing compiled includes
+
+2007-03-01 Danilo Buerger
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ Applied boots clean up patch and removed commented out code.
+ Updated NEWS file
+
+2007-02-27 Danilo Buerger
+
+ * NEWS
+ docs/en/designers/language-modifiers/language-modifier-date-format.xml
+ libs/internals/core.write_file.php
+ libs/plugins/modifier.date_format.php:
+ Updated smarty_core_write_file() and smarty_modifier_date_format() to speed
+ up Windows detection.
+ Emulated more parameters for Windows in smarty_modifier_date_format() and
+ fixed some old ones.
+ Updated the docs to tell what parameters are emulated on Windows.
+ Updated NEWS file.
+
+ * NEWS:
+ Updated NEWS file to reflect changes commited in the last revision
+
+2007-02-27 Monte Ohrt
+
+ * docs/en/appendixes/troubleshooting.xml:
+ fix typo
+
+2007-02-27 Danilo Buerger
+
+ * libs/Smarty_Compiler.class.php:
+ Modified _(push|pop)_cacheable_state() to embedd alternate syntax. See this
+ bug report: http://www.phpinsider.com/smarty-forum/viewtopic.php?t=10502
+
+2007-02-26 Peter 'Mash' Morgan
+
+ * docs/en/designers/language-custom-functions/language-function-html-options.xml:
+ Fix incorrect var name
+
+2007-02-23 Monte Ohrt
+
+ * libs/Smarty_Compiler.class.php:
+ escape creating of language=php from interleaving
+
+ * libs/Smarty_Compiler.class.php:
+ add removed line back in
+
+ * libs/Smarty_Compiler.class.php:
+ fix up last patch, remove unnecessary lines
+
+ * libs/Smarty_Compiler.class.php:
+ fix situation when no compiled tags are present
+
+ * libs/Smarty_Compiler.class.php:
+ fix problem with php open tags generated from tag interleaving
+
+2007-02-06 boots
+
+ * docs/en/programmers/advanced-features/template-resources.xml:
+ Correct default template handler function example.
+
+2007-01-17 Messju Mohr
+
+ * NEWS
+ libs/plugins/modifier.truncate.php:
+ fixed handling of $etc in the truncate modifier when $etc is longer
+ than $length.
+
+ thanks to Sylvinus!
+
+2007-01-10 boots
+
+ * NEWS
+ libs/plugins/modifier.date_format.php
+ libs/plugins/modifier.date_format.php:
+ fix handling of %I with mysql timestamps
+
+ Thanks to Danilo Buerger
+
+ * NEWS
+ libs/internals/core.write_file.php:
+ Better recognize Windows filesystems to reduce warnings
+
+ * NEWS
+ libs/plugins/modifier.date_format.php:
+ Emulate %R in the date_format modifier on Windows
+
+ Thanks to Danilo Buerger
+
+2006-12-10 Yannick Torres
+
+ * docs/fr/getting-started.xml:
+ fix build
+
+ * docs/fr/language-snippets.ent
+ docs/fr/designers/language-builtin-functions/language-function-include-php.xml
+ docs/fr/designers/language-modifiers/language-modifier-truncate.xml
+ docs/fr/designers/language-variables/language-variables-smarty.xml:
+ sync with EN
+
+2006-12-02 Peter 'Mash' Morgan
+
+ * docs/en/designers/language-builtin-functions/language-function-include-php.xml:
+ Tidy example, speeling andd add links
+
+ * docs/en/getting-started.xml:
+ Add/correct entities
+
+ * docs/entities/global.ent:
+ Fix entities (strange)
+
+2006-12-01 Monte Ohrt
+
+ * libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ update dev version numbers
+
+2006-12-01 boots
+
+ * (Smarty_2_6_16)
+ NEWS:
+ Fixed replacement bug introduced in trimwhitespaces output filter that
+ was introduced in the last release.
+
+ Thanks to Spuerhund from the forums.
+
+ * (Smarty_2_6_16)
+ libs/plugins/outputfilter.trimwhitespace.php:
+ Fixed replacement bug introduced by last changes.
+
+ Thanks to Spuerhund from the forums.
+
+2006-11-30 Monte Ohrt
+
+ * NEWS
+ docs/en/designers/language-modifiers/language-modifier-truncate.xml
+ libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ update dev version numbers, fix manual typo
+
+2006-11-22 George Miroshnikov
+
+ * docs/ru/getting-started.xml
+ docs/ru/language-snippets.ent:
+ sync with EN
+
+ * docs/en/getting-started.xml:
+ replaced hardcoded path separator with PATH_SEPARATOR constant
+
+2006-11-20 boots
+
+ * libs/plugins/modifier.debug_print_var.php:
+ fix depth formatting of arrays and objects in modifier debug_print_var
+
+2006-11-10 Messju Mohr
+
+ * docs/en/designers/language-variables/language-variables-smarty.xml:
+ fixed typo. thanks jonez.
+
+2006-11-08 boots
+
+ * NEWS
+ libs/internals/core.write_file.php:
+ change file writing semantics in smarty_core_write_file()
+
+ This avoids unlink() unless rename() fails or a Windows system is detected
+
+ see: http://www.phpinsider.com/smarty-forum/viewtopic.php?t=6956
+
+ Thanks to c960657 from the forums.
+
+2006-11-07 boots
+
+ * NEWS
+ libs/debug.tpl:
+ update debug.tpl to xhtml 1.1 compliance, fix javascript escaping in debug
+ output and apply a Smarty based color scheme
+
+ see: http://www.phpinsider.com/smarty-forum/viewtopic.php?t=7178
+
+ thanks to cybot from the forums!
+
+ * NEWS
+ libs/plugins/modifier.debug_print_var.php:
+ enhance reporting precision of debug_print_var modifier
+
+ see: http://www.phpinsider.com/smarty-forum/viewtopic.php?t=9281
+
+ thanks to cybot from the forums
+
+2006-11-01 boots
+
+ * NEWS
+ libs/plugins/function.html_select_date.php:
+ make html_select_date work consistently with 0000-00-00 00:00:00 and
+ 0000-00-00 inputs
+
+ Thanks to cybot from forums
+
+2006-10-16 George Miroshnikov
+
+ * docs/en/language-snippets.ent:
+ minor typo fix - &$class doesn't make sense.
+
+2006-10-14 Yannick Torres
+
+ * docs/fr/designers/language-basic-syntax.xml
+ docs/fr/designers/language-builtin-functions.xml
+ docs/fr/designers/language-basic-syntax/language-syntax-attributes.xml
+ docs/fr/designers/language-basic-syntax/language-syntax-comments.xml
+ docs/fr/designers/language-basic-syntax/language-syntax-quotes.xml
+ docs/fr/designers/language-builtin-functions/language-function-capture.xml
+ docs/fr/designers/language-builtin-functions/language-function-php.xml
+ docs/fr/designers/language-builtin-functions/language-function-section.xml
+ docs/fr/designers/language-custom-functions/language-function-popup-init.xml
+ docs/fr/designers/language-modifiers/language-modifier-escape.xml
+ docs/fr/programmers/api-functions/api-display.xml
+ docs/fr/programmers/plugins/plugins-inserts.xml:
+ sync with EN
+
+2006-10-14 Fernando Correa da Conceição
+
+ * docs/pt_BR/programmers/api-variables/variable-error-reporting.xml:
+ New Translation
+
+ * docs/pt_BR/designers/language-basic-syntax/language-escaping.xml
+ docs/pt_BR/designers/language-basic-syntax/language-syntax-variables.xml:
+ New Translations
+
+ * docs/pt_BR/translation.xml:
+ Used in revcheck
+
+ * docs/pt_BR/getting-started.xml
+ docs/pt_BR/language-snippets.ent
+ docs/pt_BR/make_chm_index.html
+ docs/pt_BR/preface.xml
+ docs/pt_BR/appendixes/resources.xml
+ docs/pt_BR/appendixes/troubleshooting.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-capitalize.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-cat.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-count-characters.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-count-paragraphs.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-count-sentences.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-count-words.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-date-format.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-default.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-escape.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-indent.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-lower.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-nl2br.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-regex-replace.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-replace.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-spacify.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-string-format.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-strip-tags.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-strip.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-truncate.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-upper.xml
+ docs/pt_BR/designers/language-modifiers/language-modifier-wordwrap.xml
+ docs/pt_BR/designers/language-variables/language-assigned-variables.xml
+ docs/pt_BR/designers/language-variables/language-config-variables.xml
+ docs/pt_BR/designers/language-variables/language-variables-smarty.xml
+ docs/pt_BR/programmers/advanced-features.xml
+ docs/pt_BR/programmers/api-functions.xml
+ docs/pt_BR/programmers/api-variables.xml
+ docs/pt_BR/programmers/caching.xml
+ docs/pt_BR/programmers/plugins.xml
+ docs/pt_BR/programmers/smarty-constants.xml
+ docs/pt_BR/programmers/advanced-features/advanced-features-objects.xml
+ docs/pt_BR/programmers/advanced-features/advanced-features-outputfilters.xml
+ docs/pt_BR/programmers/advanced-features/advanced-features-postfilters.xml
+ docs/pt_BR/programmers/advanced-features/advanced-features-prefilters.xml
+ docs/pt_BR/programmers/advanced-features/section-template-cache-handler-func.xml
+ docs/pt_BR/programmers/advanced-features/template-resources.xml
+ docs/pt_BR/programmers/api-functions/api-append-by-ref.xml
+ docs/pt_BR/programmers/api-functions/api-append.xml
+ docs/pt_BR/programmers/api-functions/api-assign-by-ref.xml
+ docs/pt_BR/programmers/api-functions/api-assign.xml
+ docs/pt_BR/programmers/api-functions/api-clear-all-assign.xml
+ docs/pt_BR/programmers/api-functions/api-clear-all-cache.xml
+ docs/pt_BR/programmers/api-functions/api-clear-assign.xml
+ docs/pt_BR/programmers/api-functions/api-clear-cache.xml
+ docs/pt_BR/programmers/api-functions/api-clear-compiled-tpl.xml
+ docs/pt_BR/programmers/api-functions/api-clear-config.xml
+ docs/pt_BR/programmers/api-functions/api-config-load.xml
+ docs/pt_BR/programmers/api-functions/api-display.xml
+ docs/pt_BR/programmers/api-functions/api-fetch.xml
+ docs/pt_BR/programmers/api-functions/api-get-config-vars.xml
+ docs/pt_BR/programmers/api-functions/api-get-registered-object.xml
+ docs/pt_BR/programmers/api-functions/api-get-template-vars.xml
+ docs/pt_BR/programmers/api-functions/api-is-cached.xml
+ docs/pt_BR/programmers/api-functions/api-load-filter.xml
+ docs/pt_BR/programmers/api-functions/api-register-block.xml
+ docs/pt_BR/programmers/api-functions/api-register-compiler-function.xml
+ docs/pt_BR/programmers/api-functions/api-register-function.xml
+ docs/pt_BR/programmers/api-functions/api-register-modifier.xml
+ docs/pt_BR/programmers/api-functions/api-register-object.xml
+ docs/pt_BR/programmers/api-functions/api-register-outputfilter.xml
+ docs/pt_BR/programmers/api-functions/api-register-postfilter.xml
+ docs/pt_BR/programmers/api-functions/api-register-prefilter.xml
+ docs/pt_BR/programmers/api-functions/api-register-resource.xml
+ docs/pt_BR/programmers/api-functions/api-template-exists.xml
+ docs/pt_BR/programmers/api-functions/api-trigger-error.xml
+ docs/pt_BR/programmers/api-functions/api-unregister-block.xml
+ docs/pt_BR/programmers/api-functions/api-unregister-compiler-function.xml
+ docs/pt_BR/programmers/api-functions/api-unregister-function.xml
+ docs/pt_BR/programmers/api-functions/api-unregister-modifier.xml
+ docs/pt_BR/programmers/api-functions/api-unregister-object.xml
+ docs/pt_BR/programmers/api-functions/api-unregister-outputfilter.xml
+ docs/pt_BR/programmers/api-functions/api-unregister-postfilter.xml
+ docs/pt_BR/programmers/api-functions/api-unregister-prefilter.xml
+ docs/pt_BR/programmers/api-functions/api-unregister-resource.xml
+ docs/pt_BR/programmers/api-variables/variable-autoload-filters.xml
+ docs/pt_BR/programmers/api-variables/variable-cache-dir.xml
+ docs/pt_BR/programmers/api-variables/variable-cache-handler-func.xml
+ docs/pt_BR/programmers/api-variables/variable-cache-lifetime.xml
+ docs/pt_BR/programmers/api-variables/variable-cache-modified-check.xml
+ docs/pt_BR/programmers/api-variables/variable-caching.xml
+ docs/pt_BR/programmers/api-variables/variable-compile-check.xml
+ docs/pt_BR/programmers/api-variables/variable-compile-dir.xml
+ docs/pt_BR/programmers/api-variables/variable-compile-id.xml
+ docs/pt_BR/programmers/api-variables/variable-compiler-class.xml
+ docs/pt_BR/programmers/api-variables/variable-config-booleanize.xml
+ docs/pt_BR/programmers/api-variables/variable-config-dir.xml
+ docs/pt_BR/programmers/api-variables/variable-config-fix-newlines.xml
+ docs/pt_BR/programmers/api-variables/variable-config-overwrite.xml
+ docs/pt_BR/programmers/api-variables/variable-config-read-hidden.xml
+ docs/pt_BR/programmers/api-variables/variable-debug-tpl.xml
+ docs/pt_BR/programmers/api-variables/variable-debugging-ctrl.xml
+ docs/pt_BR/programmers/api-variables/variable-debugging.xml
+ docs/pt_BR/programmers/api-variables/variable-default-modifiers.xml
+ docs/pt_BR/programmers/api-variables/variable-default-resource-type.xml
+ docs/pt_BR/programmers/api-variables/variable-default-template-handler-func.xml
+ docs/pt_BR/programmers/api-variables/variable-force-compile.xml
+ docs/pt_BR/programmers/api-variables/variable-global-assign.xml
+ docs/pt_BR/programmers/api-variables/variable-left-delimiter.xml
+ docs/pt_BR/programmers/api-variables/variable-php-handling.xml
+ docs/pt_BR/programmers/api-variables/variable-plugins-dir.xml
+ docs/pt_BR/programmers/api-variables/variable-request-use-auto-globals.xml
+ docs/pt_BR/programmers/api-variables/variable-request-vars-order.xml
+ docs/pt_BR/programmers/api-variables/variable-right-delimiter.xml
+ docs/pt_BR/programmers/api-variables/variable-secure-dir.xml
+ docs/pt_BR/programmers/api-variables/variable-security-settings.xml
+ docs/pt_BR/programmers/api-variables/variable-security.xml
+ docs/pt_BR/programmers/api-variables/variable-template-dir.xml
+ docs/pt_BR/programmers/api-variables/variable-trusted-dir.xml
+ docs/pt_BR/programmers/api-variables/variable-undefined.xml
+ docs/pt_BR/programmers/api-variables/variable-use-sub-dirs.xml
+ docs/pt_BR/programmers/caching/caching-cacheable.xml
+ docs/pt_BR/programmers/caching/caching-groups.xml
+ docs/pt_BR/programmers/caching/caching-multiple-caches.xml
+ docs/pt_BR/programmers/caching/caching-setting-up.xml
+ docs/pt_BR/programmers/plugins/plugins-block-functions.xml
+ docs/pt_BR/programmers/plugins/plugins-compiler-functions.xml
+ docs/pt_BR/programmers/plugins/plugins-functions.xml
+ docs/pt_BR/programmers/plugins/plugins-howto.xml
+ docs/pt_BR/programmers/plugins/plugins-inserts.xml
+ docs/pt_BR/programmers/plugins/plugins-modifiers.xml
+ docs/pt_BR/programmers/plugins/plugins-naming-conventions.xml
+ docs/pt_BR/programmers/plugins/plugins-outputfilters.xml
+ docs/pt_BR/programmers/plugins/plugins-prefilters-postfilters.xml
+ docs/pt_BR/programmers/plugins/plugins-resources.xml
+ docs/pt_BR/programmers/plugins/plugins-writing.xml:
+ Big update. Revision tag for all files. Some updates. Now I can update it
+
+2006-10-09 Peter 'Mash' Morgan
+
+ * docs/en/getting-started.xml
+ docs/en/designers/language-basic-syntax.xml
+ docs/en/designers/language-custom-functions/language-function-popup-init.xml
+ docs/en/designers/language-modifiers/language-modifier-escape.xml
+ docs/en/programmers/api-functions/api-display.xml
+ docs/en/programmers/plugins/plugins-inserts.xml:
+ Minor changes and corrections
+
+ * docs/en/designers/language-basic-syntax.xml
+ docs/en/designers/language-builtin-functions.xml
+ docs/en/designers/language-basic-syntax/language-syntax-attributes.xml
+ docs/en/designers/language-basic-syntax/language-syntax-comments.xml
+ docs/en/designers/language-basic-syntax/language-syntax-quotes.xml
+ docs/en/designers/language-modifiers/language-modifier-escape.xml:
+ Minor formatting and error correction
+
+ * docs/en/designers/language-builtin-functions/language-function-capture.xml
+ docs/en/designers/language-builtin-functions/language-function-php.xml
+ docs/en/designers/language-builtin-functions/language-function-section.xml:
+ minor formatting and changes
+
+ * docs/en/getting-started.xml:
+ Tidied up formatting so more readable, tidied up the install to the paths
+ are more clear (ta jj)
+
+2006-10-09 Yannick Torres
+
+ * docs/fr/designers/language-builtin-functions/language-function-section.xml:
+ sync with EN
+
+2006-10-08 Yannick Torres
+
+ * docs/fr/designers/language-builtin-functions/language-function-php.xml
+ docs/fr/designers/language-modifiers/language-modifier-escape.xml
+ docs/fr/designers/language-variables/language-variables-smarty.xml
+ docs/fr/programmers/api-variables/variable-request-use-auto-globals.xml:
+ fix build
+
+ * docs/fr/designers/language-builtin-functions/language-function-strip.xml
+ docs/fr/programmers/caching.xml
+ docs/fr/programmers/smarty-constants.xml
+ docs/fr/programmers/api-variables/variable-autoload-filters.xml
+ docs/fr/programmers/api-variables/variable-cache-dir.xml
+ docs/fr/programmers/api-variables/variable-cache-handler-func.xml
+ docs/fr/programmers/api-variables/variable-cache-lifetime.xml
+ docs/fr/programmers/api-variables/variable-cache-modified-check.xml
+ docs/fr/programmers/api-variables/variable-caching.xml
+ docs/fr/programmers/api-variables/variable-compile-check.xml
+ docs/fr/programmers/api-variables/variable-compile-dir.xml
+ docs/fr/programmers/api-variables/variable-compile-id.xml
+ docs/fr/programmers/api-variables/variable-compiler-class.xml
+ docs/fr/programmers/api-variables/variable-config-booleanize.xml
+ docs/fr/programmers/api-variables/variable-config-dir.xml
+ docs/fr/programmers/api-variables/variable-config-fix-newlines.xml
+ docs/fr/programmers/api-variables/variable-config-overwrite.xml
+ docs/fr/programmers/api-variables/variable-config-read-hidden.xml
+ docs/fr/programmers/api-variables/variable-debug-tpl.xml
+ docs/fr/programmers/api-variables/variable-debugging-ctrl.xml
+ docs/fr/programmers/api-variables/variable-debugging.xml
+ docs/fr/programmers/api-variables/variable-default-modifiers.xml
+ docs/fr/programmers/api-variables/variable-default-resource-type.xml
+ docs/fr/programmers/api-variables/variable-default-template-handler-func.xml
+ docs/fr/programmers/api-variables/variable-error-reporting.xml
+ docs/fr/programmers/api-variables/variable-force-compile.xml
+ docs/fr/programmers/api-variables/variable-left-delimiter.xml
+ docs/fr/programmers/api-variables/variable-php-handling.xml
+ docs/fr/programmers/api-variables/variable-plugins-dir.xml
+ docs/fr/programmers/api-variables/variable-request-use-auto-globals.xml
+ docs/fr/programmers/api-variables/variable-request-vars-order.xml
+ docs/fr/programmers/api-variables/variable-right-delimiter.xml
+ docs/fr/programmers/api-variables/variable-secure-dir.xml
+ docs/fr/programmers/api-variables/variable-security-settings.xml
+ docs/fr/programmers/api-variables/variable-security.xml
+ docs/fr/programmers/api-variables/variable-template-dir.xml
+ docs/fr/programmers/api-variables/variable-trusted-dir.xml
+ docs/fr/programmers/api-variables/variable-use-sub-dirs.xml
+ docs/fr/programmers/caching/caching-cacheable.xml
+ docs/fr/programmers/caching/caching-groups.xml
+ docs/fr/programmers/caching/caching-multiple-caches.xml
+ docs/fr/programmers/caching/caching-setting-up.xml
+ docs/fr/programmers/plugins/plugins-block-functions.xml
+ docs/fr/programmers/plugins/plugins-compiler-functions.xml
+ docs/fr/programmers/plugins/plugins-functions.xml
+ docs/fr/programmers/plugins/plugins-inserts.xml
+ docs/fr/programmers/plugins/plugins-modifiers.xml
+ docs/fr/programmers/plugins/plugins-naming-conventions.xml
+ docs/fr/programmers/plugins/plugins-outputfilters.xml
+ docs/fr/programmers/plugins/plugins-prefilters-postfilters.xml
+ docs/fr/programmers/plugins/plugins-resources.xml
+ docs/fr/programmers/plugins/plugins-writing.xml:
+ sync with EN
+
+2006-10-07 Yannick Torres
+
+ * docs/fr/programmers/advanced-features/advanced-features-objects.xml
+ docs/fr/programmers/advanced-features/advanced-features-outputfilters.xml
+ docs/fr/programmers/advanced-features/advanced-features-postfilters.xml
+ docs/fr/programmers/advanced-features/advanced-features-prefilters.xml
+ docs/fr/programmers/advanced-features/section-template-cache-handler-func.xml
+ docs/fr/programmers/advanced-features/template-resources.xml
+ docs/fr/programmers/api-functions/api-append-by-ref.xml
+ docs/fr/programmers/api-functions/api-append.xml
+ docs/fr/programmers/api-functions/api-assign-by-ref.xml
+ docs/fr/programmers/api-functions/api-assign.xml
+ docs/fr/programmers/api-functions/api-clear-all-assign.xml
+ docs/fr/programmers/api-functions/api-clear-all-cache.xml
+ docs/fr/programmers/api-functions/api-clear-assign.xml
+ docs/fr/programmers/api-functions/api-clear-cache.xml
+ docs/fr/programmers/api-functions/api-clear-compiled-tpl.xml
+ docs/fr/programmers/api-functions/api-clear-config.xml
+ docs/fr/programmers/api-functions/api-config-load.xml
+ docs/fr/programmers/api-functions/api-display.xml
+ docs/fr/programmers/api-functions/api-fetch.xml
+ docs/fr/programmers/api-functions/api-get-config-vars.xml
+ docs/fr/programmers/api-functions/api-get-registered-object.xml
+ docs/fr/programmers/api-functions/api-get-template-vars.xml
+ docs/fr/programmers/api-functions/api-is-cached.xml
+ docs/fr/programmers/api-functions/api-load-filter.xml
+ docs/fr/programmers/api-functions/api-register-block.xml
+ docs/fr/programmers/api-functions/api-register-compiler-function.xml
+ docs/fr/programmers/api-functions/api-register-function.xml
+ docs/fr/programmers/api-functions/api-register-modifier.xml
+ docs/fr/programmers/api-functions/api-register-object.xml
+ docs/fr/programmers/api-functions/api-register-outputfilter.xml
+ docs/fr/programmers/api-functions/api-register-postfilter.xml
+ docs/fr/programmers/api-functions/api-register-prefilter.xml
+ docs/fr/programmers/api-functions/api-register-resource.xml
+ docs/fr/programmers/api-functions/api-template-exists.xml
+ docs/fr/programmers/api-functions/api-trigger-error.xml
+ docs/fr/programmers/api-functions/api-unregister-block.xml
+ docs/fr/programmers/api-functions/api-unregister-compiler-function.xml
+ docs/fr/programmers/api-functions/api-unregister-function.xml
+ docs/fr/programmers/api-functions/api-unregister-modifier.xml
+ docs/fr/programmers/api-functions/api-unregister-object.xml
+ docs/fr/programmers/api-functions/api-unregister-outputfilter.xml
+ docs/fr/programmers/api-functions/api-unregister-postfilter.xml
+ docs/fr/programmers/api-functions/api-unregister-prefilter.xml
+ docs/fr/programmers/api-functions/api-unregister-resource.xml:
+ sync with EN
+
+2006-10-03 Yannick Torres
+
+ * docs/fr/designers/language-custom-functions/language-function-html-select-time.xml
+ docs/fr/designers/language-custom-functions/language-function-html-table.xml
+ docs/fr/designers/language-custom-functions/language-function-mailto.xml
+ docs/fr/designers/language-custom-functions/language-function-math.xml
+ docs/fr/designers/language-custom-functions/language-function-popup-init.xml
+ docs/fr/designers/language-custom-functions/language-function-popup.xml
+ docs/fr/designers/language-custom-functions/language-function-textformat.xml
+ docs/fr/designers/language-modifiers/language-modifier-capitalize.xml
+ docs/fr/designers/language-modifiers/language-modifier-cat.xml
+ docs/fr/designers/language-modifiers/language-modifier-count-characters.xml
+ docs/fr/designers/language-modifiers/language-modifier-count-paragraphs.xml
+ docs/fr/designers/language-modifiers/language-modifier-count-sentences.xml
+ docs/fr/designers/language-modifiers/language-modifier-count-words.xml
+ docs/fr/designers/language-modifiers/language-modifier-date-format.xml
+ docs/fr/designers/language-modifiers/language-modifier-default.xml
+ docs/fr/designers/language-modifiers/language-modifier-escape.xml
+ docs/fr/designers/language-modifiers/language-modifier-indent.xml
+ docs/fr/designers/language-modifiers/language-modifier-lower.xml
+ docs/fr/designers/language-modifiers/language-modifier-nl2br.xml
+ docs/fr/designers/language-modifiers/language-modifier-regex-replace.xml
+ docs/fr/designers/language-modifiers/language-modifier-replace.xml
+ docs/fr/designers/language-modifiers/language-modifier-spacify.xml
+ docs/fr/designers/language-modifiers/language-modifier-string-format.xml
+ docs/fr/designers/language-modifiers/language-modifier-strip-tags.xml
+ docs/fr/designers/language-modifiers/language-modifier-strip.xml
+ docs/fr/designers/language-modifiers/language-modifier-truncate.xml
+ docs/fr/designers/language-modifiers/language-modifier-upper.xml
+ docs/fr/designers/language-modifiers/language-modifier-wordwrap.xml
+ docs/fr/designers/language-variables/language-assigned-variables.xml
+ docs/fr/designers/language-variables/language-config-variables.xml
+ docs/fr/designers/language-variables/language-variables-smarty.xml:
+ sync with EN
+
+2006-10-01 Yannick Torres
+
+ * docs/fr/designers/language-builtin-functions/language-function-include-php.xml
+ docs/fr/designers/language-builtin-functions/language-function-include.xml
+ docs/fr/designers/language-builtin-functions/language-function-insert.xml
+ docs/fr/designers/language-builtin-functions/language-function-ldelim.xml
+ docs/fr/designers/language-builtin-functions/language-function-literal.xml
+ docs/fr/designers/language-builtin-functions/language-function-php.xml
+ docs/fr/designers/language-custom-functions/language-function-assign.xml
+ docs/fr/designers/language-custom-functions/language-function-counter.xml
+ docs/fr/designers/language-custom-functions/language-function-cycle.xml
+ docs/fr/designers/language-custom-functions/language-function-debug.xml
+ docs/fr/designers/language-custom-functions/language-function-eval.xml
+ docs/fr/designers/language-custom-functions/language-function-fetch.xml
+ docs/fr/designers/language-custom-functions/language-function-html-checkboxes.xml
+ docs/fr/designers/language-custom-functions/language-function-html-image.xml
+ docs/fr/designers/language-custom-functions/language-function-html-options.xml
+ docs/fr/designers/language-custom-functions/language-function-html-radios.xml
+ docs/fr/designers/language-custom-functions/language-function-html-select-date.xml:
+ sync with EN
+
+2006-09-30 Yannick Torres
+
+ * docs/fr/getting-started.xml:
+ fix build
+
+ * docs/fr/designers/chapter-debugging-console.xml
+ docs/fr/designers/config-files.xml
+ docs/fr/designers/language-builtin-functions.xml
+ docs/fr/designers/language-modifiers.xml
+ docs/fr/designers/language-variables.xml
+ docs/fr/designers/language-basic-syntax/language-escaping.xml
+ docs/fr/designers/language-basic-syntax/language-math.xml
+ docs/fr/designers/language-basic-syntax/language-syntax-comments.xml
+ docs/fr/designers/language-basic-syntax/language-syntax-functions.xml
+ docs/fr/designers/language-basic-syntax/language-syntax-quotes.xml
+ docs/fr/designers/language-basic-syntax/language-syntax-variables.xml
+ docs/fr/designers/language-builtin-functions/language-function-capture.xml
+ docs/fr/designers/language-builtin-functions/language-function-config-load.xml
+ docs/fr/designers/language-builtin-functions/language-function-foreach.xml
+ docs/fr/designers/language-builtin-functions/language-function-if.xml:
+ sync with EN
+
+ * docs/fr/getting-started.xml
+ docs/fr/language-snippets.ent
+ docs/fr/appendixes/resources.xml
+ docs/fr/appendixes/tips.xml
+ docs/fr/appendixes/troubleshooting.xml:
+ sync with EN
+
+2006-09-27 Peter 'Mash' Morgan
+
+ * docs/en/designers/language-builtin-functions/language-function-section.xml:
+ Minor tweaks and corrections
+
+ * docs/en/getting-started.xml
+ docs/en/designers/chapter-debugging-console.xml
+ docs/en/designers/language-basic-syntax/language-syntax-comments.xml
+ docs/en/designers/language-custom-functions/language-function-html-image.xml
+ docs/en/designers/language-custom-functions/language-function-html-options.xml
+ docs/en/designers/language-custom-functions/language-function-html-radios.xml
+ docs/en/designers/language-custom-functions/language-function-html-select-date.xml
+ docs/en/designers/language-custom-functions/language-function-html-select-time.xml
+ docs/en/designers/language-custom-functions/language-function-html-table.xml
+ docs/en/designers/language-custom-functions/language-function-mailto.xml
+ docs/en/designers/language-custom-functions/language-function-popup-init.xml
+ docs/en/designers/language-custom-functions/language-function-textformat.xml
+ docs/en/designers/language-variables/language-config-variables.xml
+ docs/en/designers/language-variables/language-variables-smarty.xml:
+ Add literal tags to html, general formatting
+
+ * docs/en/getting-started.xml
+ docs/en/appendixes/resources.xml
+ docs/en/appendixes/tips.xml
+ docs/en/appendixes/troubleshooting.xml
+ docs/en/designers/config-files.xml
+ docs/en/programmers/caching.xml
+ docs/en/programmers/smarty-constants.xml
+ docs/en/programmers/advanced-features/advanced-features-objects.xml
+ docs/en/programmers/advanced-features/advanced-features-outputfilters.xml
+ docs/en/programmers/advanced-features/advanced-features-postfilters.xml
+ docs/en/programmers/advanced-features/advanced-features-prefilters.xml
+ docs/en/programmers/advanced-features/section-template-cache-handler-func.xml
+ docs/en/programmers/advanced-features/template-resources.xml
+ docs/en/programmers/api-variables/variable-autoload-filters.xml
+ docs/en/programmers/api-variables/variable-cache-dir.xml
+ docs/en/programmers/api-variables/variable-cache-handler-func.xml
+ docs/en/programmers/api-variables/variable-cache-lifetime.xml
+ docs/en/programmers/api-variables/variable-cache-modified-check.xml
+ docs/en/programmers/api-variables/variable-caching.xml
+ docs/en/programmers/api-variables/variable-compile-check.xml
+ docs/en/programmers/api-variables/variable-compile-dir.xml
+ docs/en/programmers/api-variables/variable-compile-id.xml
+ docs/en/programmers/api-variables/variable-config-booleanize.xml
+ docs/en/programmers/api-variables/variable-config-dir.xml
+ docs/en/programmers/api-variables/variable-config-fix-newlines.xml
+ docs/en/programmers/api-variables/variable-config-overwrite.xml
+ docs/en/programmers/api-variables/variable-config-read-hidden.xml
+ docs/en/programmers/api-variables/variable-debug-tpl.xml
+ docs/en/programmers/api-variables/variable-debugging-ctrl.xml
+ docs/en/programmers/api-variables/variable-debugging.xml
+ docs/en/programmers/api-variables/variable-default-modifiers.xml
+ docs/en/programmers/api-variables/variable-default-resource-type.xml
+ docs/en/programmers/api-variables/variable-error-reporting.xml
+ docs/en/programmers/api-variables/variable-force-compile.xml
+ docs/en/programmers/api-variables/variable-left-delimiter.xml
+ docs/en/programmers/api-variables/variable-php-handling.xml
+ docs/en/programmers/api-variables/variable-plugins-dir.xml
+ docs/en/programmers/api-variables/variable-request-use-auto-globals.xml
+ docs/en/programmers/api-variables/variable-request-vars-order.xml
+ docs/en/programmers/api-variables/variable-right-delimiter.xml
+ docs/en/programmers/api-variables/variable-secure-dir.xml
+ docs/en/programmers/api-variables/variable-security-settings.xml
+ docs/en/programmers/api-variables/variable-security.xml
+ docs/en/programmers/api-variables/variable-template-dir.xml
+ docs/en/programmers/api-variables/variable-trusted-dir.xml
+ docs/en/programmers/api-variables/variable-use-sub-dirs.xml
+ docs/en/programmers/caching/caching-cacheable.xml
+ docs/en/programmers/caching/caching-groups.xml
+ docs/en/programmers/caching/caching-multiple-caches.xml
+ docs/en/programmers/caching/caching-setting-up.xml:
+ Tidy up of formatting
+
+ * docs/entities/global.ent:
+ Adding some more resources
+
+ * docs/en/programmers/plugins/plugins-block-functions.xml
+ docs/en/programmers/plugins/plugins-compiler-functions.xml
+ docs/en/programmers/plugins/plugins-functions.xml
+ docs/en/programmers/plugins/plugins-inserts.xml
+ docs/en/programmers/plugins/plugins-modifiers.xml
+ docs/en/programmers/plugins/plugins-naming-conventions.xml
+ docs/en/programmers/plugins/plugins-outputfilters.xml
+ docs/en/programmers/plugins/plugins-prefilters-postfilters.xml
+ docs/en/programmers/plugins/plugins-resources.xml
+ docs/en/programmers/plugins/plugins-writing.xml:
+ Tidy up some formatting
+
+2006-09-26 Peter 'Mash' Morgan
+
+ * docs/en/programmers/api-functions/api-append-by-ref.xml
+ docs/en/programmers/api-functions/api-append.xml
+ docs/en/programmers/api-functions/api-assign-by-ref.xml
+ docs/en/programmers/api-functions/api-assign.xml
+ docs/en/programmers/api-functions/api-clear-all-assign.xml
+ docs/en/programmers/api-functions/api-clear-all-cache.xml
+ docs/en/programmers/api-functions/api-clear-assign.xml
+ docs/en/programmers/api-functions/api-clear-cache.xml
+ docs/en/programmers/api-functions/api-clear-compiled-tpl.xml
+ docs/en/programmers/api-functions/api-clear-config.xml
+ docs/en/programmers/api-functions/api-config-load.xml
+ docs/en/programmers/api-functions/api-display.xml
+ docs/en/programmers/api-functions/api-fetch.xml
+ docs/en/programmers/api-functions/api-get-config-vars.xml
+ docs/en/programmers/api-functions/api-get-registered-object.xml
+ docs/en/programmers/api-functions/api-get-template-vars.xml
+ docs/en/programmers/api-functions/api-is-cached.xml
+ docs/en/programmers/api-functions/api-load-filter.xml
+ docs/en/programmers/api-functions/api-register-block.xml
+ docs/en/programmers/api-functions/api-register-compiler-function.xml
+ docs/en/programmers/api-functions/api-register-function.xml
+ docs/en/programmers/api-functions/api-register-modifier.xml
+ docs/en/programmers/api-functions/api-register-object.xml
+ docs/en/programmers/api-functions/api-register-outputfilter.xml
+ docs/en/programmers/api-functions/api-register-postfilter.xml
+ docs/en/programmers/api-functions/api-register-prefilter.xml
+ docs/en/programmers/api-functions/api-register-resource.xml
+ docs/en/programmers/api-functions/api-template-exists.xml
+ docs/en/programmers/api-functions/api-trigger-error.xml
+ docs/en/programmers/api-functions/api-unregister-block.xml
+ docs/en/programmers/api-functions/api-unregister-compiler-function.xml
+ docs/en/programmers/api-functions/api-unregister-function.xml
+ docs/en/programmers/api-functions/api-unregister-modifier.xml
+ docs/en/programmers/api-functions/api-unregister-object.xml
+ docs/en/programmers/api-functions/api-unregister-outputfilter.xml
+ docs/en/programmers/api-functions/api-unregister-postfilter.xml
+ docs/en/programmers/api-functions/api-unregister-prefilter.xml
+ docs/en/programmers/api-functions/api-unregister-resource.xml:
+ Tidy up formatting and examples
+
+ * docs/en/language-snippets.ent:
+ Moved recurring para for register_*
+
+ * docs/en/designers/language-modifiers.xml:
+ Spelling on modifiers
+
+ * docs/en/designers/language-builtin-functions.xml
+ docs/en/designers/language-modifiers.xml
+ docs/en/designers/language-custom-functions/language-function-html-options.xml
+ docs/en/designers/language-modifiers/language-modifier-capitalize.xml
+ docs/en/designers/language-modifiers/language-modifier-cat.xml
+ docs/en/designers/language-modifiers/language-modifier-count-characters.xml
+ docs/en/designers/language-modifiers/language-modifier-count-paragraphs.xml
+ docs/en/designers/language-modifiers/language-modifier-count-sentences.xml
+ docs/en/designers/language-modifiers/language-modifier-count-words.xml
+ docs/en/designers/language-modifiers/language-modifier-date-format.xml
+ docs/en/designers/language-modifiers/language-modifier-default.xml
+ docs/en/designers/language-modifiers/language-modifier-escape.xml
+ docs/en/designers/language-modifiers/language-modifier-indent.xml
+ docs/en/designers/language-modifiers/language-modifier-lower.xml
+ docs/en/designers/language-modifiers/language-modifier-nl2br.xml
+ docs/en/designers/language-modifiers/language-modifier-regex-replace.xml
+ docs/en/designers/language-modifiers/language-modifier-replace.xml
+ docs/en/designers/language-modifiers/language-modifier-spacify.xml
+ docs/en/designers/language-modifiers/language-modifier-string-format.xml
+ docs/en/designers/language-modifiers/language-modifier-strip-tags.xml
+ docs/en/designers/language-modifiers/language-modifier-strip.xml
+ docs/en/designers/language-modifiers/language-modifier-truncate.xml
+ docs/en/designers/language-modifiers/language-modifier-upper.xml
+ docs/en/designers/language-modifiers/language-modifier-wordwrap.xml:
+ Tidying up some markup
+
+ * docs/en/designers/language-variables.xml:
+ typo
+
+ * docs/en/designers/language-variables.xml
+ docs/en/designers/language-variables/language-assigned-variables.xml
+ docs/en/designers/language-variables/language-config-variables.xml
+ docs/en/designers/language-variables/language-variables-smarty.xml:
+ Tidy up formatting on variables
+
+ * docs/en/designers/language-basic-syntax/language-escaping.xml
+ docs/en/designers/language-basic-syntax/language-math.xml
+ docs/en/designers/language-basic-syntax/language-syntax-comments.xml
+ docs/en/designers/language-basic-syntax/language-syntax-functions.xml
+ docs/en/designers/language-basic-syntax/language-syntax-quotes.xml
+ docs/en/designers/language-basic-syntax/language-syntax-variables.xml:
+ Formatting of the basic-syntax dir
+
+ * docs/en/designers/language-custom-functions/language-function-assign.xml
+ docs/en/designers/language-custom-functions/language-function-counter.xml
+ docs/en/designers/language-custom-functions/language-function-cycle.xml
+ docs/en/designers/language-custom-functions/language-function-debug.xml
+ docs/en/designers/language-custom-functions/language-function-eval.xml
+ docs/en/designers/language-custom-functions/language-function-fetch.xml
+ docs/en/designers/language-custom-functions/language-function-html-checkboxes.xml
+ docs/en/designers/language-custom-functions/language-function-html-image.xml
+ docs/en/designers/language-custom-functions/language-function-html-options.xml
+ docs/en/designers/language-custom-functions/language-function-html-radios.xml
+ docs/en/designers/language-custom-functions/language-function-html-select-date.xml
+ docs/en/designers/language-custom-functions/language-function-html-select-time.xml
+ docs/en/designers/language-custom-functions/language-function-html-table.xml
+ docs/en/designers/language-custom-functions/language-function-mailto.xml
+ docs/en/designers/language-custom-functions/language-function-math.xml
+ docs/en/designers/language-custom-functions/language-function-popup-init.xml
+ docs/en/designers/language-custom-functions/language-function-popup.xml
+ docs/en/designers/language-custom-functions/language-function-textformat.xml:
+ More formatting and cleaning up examples
+
+2006-09-25 Peter 'Mash' Morgan
+
+ * docs/en/designers/language-builtin-functions/language-function-foreach.xml
+ docs/en/designers/language-builtin-functions/language-function-section.xml:
+ Doh! removing tabs
+
+ * docs/en/designers/language-builtin-functions/language-function-capture.xml
+ docs/en/designers/language-builtin-functions/language-function-config-load.xml
+ docs/en/designers/language-builtin-functions/language-function-foreach.xml
+ docs/en/designers/language-builtin-functions/language-function-if.xml
+ docs/en/designers/language-builtin-functions/language-function-include-php.xml
+ docs/en/designers/language-builtin-functions/language-function-include.xml
+ docs/en/designers/language-builtin-functions/language-function-insert.xml
+ docs/en/designers/language-builtin-functions/language-function-ldelim.xml
+ docs/en/designers/language-builtin-functions/language-function-literal.xml
+ docs/en/designers/language-builtin-functions/language-function-php.xml
+ docs/en/designers/language-builtin-functions/language-function-section.xml
+ docs/en/designers/language-builtin-functions/language-function-strip.xml:
+ A lot of formatting, tagging and tidy up. Some consistency at last
+
+ * docs/en/designers/language-builtin-functions/language-function-section.xml:
+ Major tidy up
+
+ * docs/en/designers/language-builtin-functions/language-function-foreach.xml:
+ Major tidy up, added index property and some examples
+
+2006-09-03 Yannick Torres
+
+ * docs/fr/designers/language-custom-functions/language-function-popup-init.xml
+ docs/fr/programmers/advanced-features/advanced-features-outputfilters.xml
+ docs/fr/programmers/advanced-features/advanced-features-postfilters.xml
+ docs/fr/programmers/advanced-features/advanced-features-prefilters.xml:
+ sync with EN
+
+2006-09-01 George Miroshnikov
+
+ * docs/ru/programmers/api-functions/api-append-by-ref.xml
+ docs/ru/programmers/api-functions/api-append.xml
+ docs/ru/programmers/api-functions/api-assign-by-ref.xml
+ docs/ru/programmers/api-functions/api-assign.xml
+ docs/ru/programmers/api-functions/api-clear-all-assign.xml
+ docs/ru/programmers/api-functions/api-clear-all-cache.xml
+ docs/ru/programmers/api-functions/api-clear-assign.xml
+ docs/ru/programmers/api-functions/api-clear-cache.xml
+ docs/ru/programmers/api-functions/api-clear-compiled-tpl.xml
+ docs/ru/programmers/api-functions/api-clear-config.xml
+ docs/ru/programmers/api-functions/api-config-load.xml
+ docs/ru/programmers/api-functions/api-display.xml:
+ sync with EN
+
+2006-08-25 Messju Mohr
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ fixed wrong handling of name attribute in {insert}
+ thanks to Ivan Kravets for reporting this
+
+ * libs/Smarty_Compiler.class.php:
+ fixed typo
+
+2006-08-21 George Miroshnikov
+
+ * docs/ru/designers/language-custom-functions/language-function-popup-init.xml
+ docs/ru/programmers/advanced-features/advanced-features-objects.xml
+ docs/ru/programmers/advanced-features/advanced-features-outputfilters.xml
+ docs/ru/programmers/advanced-features/advanced-features-postfilters.xml
+ docs/ru/programmers/advanced-features/advanced-features-prefilters.xml
+ docs/ru/programmers/advanced-features/section-template-cache-handler-func.xml
+ docs/ru/programmers/advanced-features/template-resources.xml:
+ sync with EN
+
+ * docs/en/programmers/advanced-features/advanced-features-prefilters.xml:
+ another missing dot
+
+ * docs/en/programmers/advanced-features/advanced-features-postfilters.xml:
+ missing dot
+
+ * docs/en/programmers/advanced-features/advanced-features-outputfilters.xml:
+ missing comma
+
+2006-08-19 Peter 'Mash' Morgan
+
+ * docs/en/designers/language-custom-functions/language-function-popup-init.xml:
+ avoid dupes and added remote paths
+
+2006-08-06 Yannick Torres
+
+ * docs/fr/designers/language-custom-functions/language-function-html-table.xml
+ docs/fr/designers/language-custom-functions/language-function-mailto.xml:
+ sync with EN
+
+2006-08-03 Messju Mohr
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ fix false replacement of "$t" inside double quotes
+ thanks to checat for reporting this
+
+2006-07-20 George Miroshnikov
+
+ * docs/ru/designers/language-custom-functions/language-function-html-table.xml
+ docs/ru/designers/language-custom-functions/language-function-mailto.xml:
+ incrementing EN-Revision
+
+ * docs/ru/designers/language-custom-functions/language-function-assign.xml
+ docs/ru/designers/language-custom-functions/language-function-eval.xml
+ docs/ru/designers/language-custom-functions/language-function-fetch.xml
+ docs/ru/designers/language-custom-functions/language-function-html-checkboxes.xml
+ docs/ru/designers/language-custom-functions/language-function-html-image.xml
+ docs/ru/designers/language-custom-functions/language-function-html-options.xml
+ docs/ru/designers/language-custom-functions/language-function-html-radios.xml
+ docs/ru/designers/language-custom-functions/language-function-html-table.xml
+ docs/ru/designers/language-custom-functions/language-function-mailto.xml
+ docs/ru/designers/language-custom-functions/language-function-popup-init.xml
+ docs/ru/designers/language-custom-functions/language-function-popup.xml
+ docs/ru/designers/language-modifiers/language-modifier-date-format.xml
+ docs/ru/designers/language-modifiers/language-modifier-default.xml
+ docs/ru/designers/language-modifiers/language-modifier-escape.xml
+ docs/ru/designers/language-modifiers/language-modifier-indent.xml
+ docs/ru/designers/language-modifiers/language-modifier-lower.xml
+ docs/ru/designers/language-modifiers/language-modifier-nl2br.xml
+ docs/ru/designers/language-modifiers/language-modifier-strip.xml
+ docs/ru/designers/language-modifiers/language-modifier-truncate.xml
+ docs/ru/designers/language-modifiers/language-modifier-upper.xml
+ docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml
+ docs/ru/designers/language-variables/language-variables-smarty.xml:
+ sync with EN
+
+ * docs/en/designers/language-custom-functions/language-function-mailto.xml:
+ typo
+
+2006-07-10 boots
+
+ * libs/plugins/function.html_table.php:
+ fixed email address in comments
+
+ * NEWS
+ libs/plugins/function.html_table.php:
+ html_table: fixed th/tr output, added hdir support for column
+ headings,update docs to reflect new features
+
+2006-07-08 Messju Mohr
+
+ * libs/plugins/function.html_table.php:
+ fix occasional notices on undefined variables
+
+2006-07-08 boots
+
+ * libs/plugins/function.html_table.php:
+ Added ability to specify column headings in {html_table}
+
+ Added th_attrs attribute which works similary to td_attr and tr_attr but
+ for TH elements. Changes the cols attribute to allow mixed values; a
+ numeric still specifies the number of columns to render but now an array
+ of values can be used to specify TH column values. The number of columns
+ is determine from the size of the array. Further, a comma-separated
+ string of column names can be used which is internally coverted to an
+ array and used as if it was specified as a normal array.
+
+ Thanks for lynlyn for the feature request.
+
+2006-06-23 boots
+
+ * libs/plugins/outputfilter.trimwhitespace.php:
+ fix comments in outputfilter.trimwhitespace
+
+ * NEWS
+ libs/plugins/outputfilter.trimwhitespace.php:
+ fixed ordering of replacements in trimwhitespace output filter
+
+ Thanks to Getty from IRC for reporting this.
+
+2006-06-20 boots
+
+ * NEWS
+ libs/plugins/function.mailto.php:
+ update mailto function plugin to work around a firefox/thunderbird escaping
+ bug
+
+ Thanks to elijahlofgren from the forums for reporting this and providing
+ the necessary patch
+
+ * NEWS
+ libs/plugins/modifier.date_format.php:
+ emulate %l in the date_format modifier on windows
+
+ thanks to Gibberish from the forums for reporting this
+
+2006-06-14 boots
+
+ * NEWS
+ libs/plugins/modifier.capitalize.php:
+ Fix handling of apostrophes in the capitalize modifier.
+
+ Thanks to asmecher from the forums for reporting this and providing a
+ partial solution.
+
+2006-05-28 Monte Ohrt
+
+ * NEWS
+ libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ update version numbers
+
+2006-05-25 boots
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ un-hide hidden xml open tags
+
+2006-05-09 boots
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ separate handling of comment blocks from "special blocks"
+
+ * NEWS
+ libs/plugins/function.popup_init.php:
+ reverted {popup_init} as proposed change to insertion behviour was not BC
+
+2006-05-04 boots
+
+ * NEWS
+ libs/plugins/function.popup_init.php:
+ changed {popup_init} to only emit code once during a request
+
+ Thanks to TGKnIght from forums
+
+2006-04-22 Messju Mohr
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ fix handling of block-methods of registered objects
+ thanks to El Hombre Gris
+
+2006-04-04 Monte Ohrt
+
+ * libs/plugins/function.html_select_date.php:
+ fix typo
+
+2006-03-09 Monte Ohrt
+
+ * (Smarty_2_6_13)
+ NEWS:
+ update for release
+
+2006-03-08 Monte Ohrt
+
+ * libs/plugins/modifier.regex_replace.php:
+ remove delim quote
+
+ * libs/plugins/modifier.regex_replace.php:
+ fix delimiter issue
+
+2006-03-03 Monte Ohrt
+
+ * libs/plugins/modifier.regex_replace.php:
+ use preg_replace to cover any space chars
+
+ * libs/plugins/modifier.regex_replace.php:
+ fix problem with allowing "e" modifier
+
+2006-01-29 Messju Mohr
+
+ * libs/Smarty_Compiler.class.php:
+ removed possiblity for E_NOTICE on an undefined variable in
+ Smarty_Compiler::_compile_if_tag() - thanks to sbeh
+
+2006-01-18 Monte Ohrt
+
+ * libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ update version numbers
+
+ * (Smarty_2_6_12)
+ NEWS:
+ commit 2.6.12 release
+
+2006-01-15 Messju Mohr
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ fixed use of references $cache_attrs and $repeat in Smarty_Compiler.
+
+ php does not allow to pass an assigned by reference to a function. since
+ php-5.1.2
+ the reference to the lval gets lost when passing an assignment.
+
+2005-12-31 Messju Mohr
+
+ * NEWS
+ libs/Smarty.class.php:
+ fixed incompatible use of fread() in Smarty::_read_file()
+ it choke on php-5.1.1 and later.
+ thanks to andig for pointing this out.
+
+2005-12-21 boots
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ Fix improper tokenization of certain inline math expressions.
+
+ Thanks to gerard at forums for reporting this.
+
+2005-12-19 Messju Mohr
+
+ * libs/plugins/function.math.php:
+ fixed problem with math in certain LC_NUMERIC locales.
+ thanks to wiebren for providing problem+solution.
+
+2005-12-14 Messju Mohr
+
+ * NEWS:
+ fixed iso-latin1 special chars
+
+2005-12-14 Monte Ohrt
+
+ * libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ update version numbers
+
+ * (Smarty_2_6_11)
+ NEWS:
+ commit NEWS file for 2.6.11
+
+2005-12-08 Messju Mohr
+
+ * docs/de/getting-started.xml:
+ sync with en
+
+2005-11-29 Messju Mohr
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ fixed code generation of non-cacheable blocks to play well with php's
+ "Alternative syntax" used for example in compiled {if}..{else}..{/if}
+ blocks.
+
+ (see: http://php.net/manual/en/control-structures.alternative-syntax.php
+ on "Alternative syntax")
+
+ thanks to kihara from the forum.
+
+2005-11-26 Messju Mohr
+
+ * NEWS:
+ fixed handling of multiple identical calls to {insert}.
+
+ the function was called multiple times, but all inserts where replaced
+ by the results of the first call to the insert function.
+
+ * libs/plugins/compiler.assign.php
+ libs/plugins/function.config_load.php:
+ added credits
+
+ * libs/plugins/function.popup.php:
+ added "closeclick" from
+ http://www.bosrup.com/web/overlib/?Command_Reference
+
+2005-11-23 boots
+
+ * NEWS
+ libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php
+ libs/plugins/modifier.escape.php:
+ replace {} string access with equivalent substr() to avoid E_STRICT
+ warnings in PHP 5.1
+
+2005-11-09 boots
+
+ * NEWS
+ libs/Smarty.class.php:
+ return valid reference in get_config_vars() when given var is non-existant
+
+2005-10-11 Monte Ohrt
+
+ * libs/plugins/block.textformat.php
+ libs/plugins/compiler.assign.php
+ libs/plugins/function.assign_debug_info.php
+ libs/plugins/function.config_load.php
+ libs/plugins/function.counter.php
+ libs/plugins/function.eval.php
+ libs/plugins/function.fetch.php
+ libs/plugins/function.html_options.php
+ libs/plugins/function.html_select_date.php
+ libs/plugins/function.html_select_time.php
+ libs/plugins/function.math.php
+ libs/plugins/function.popup.php
+ libs/plugins/function.popup_init.php
+ libs/plugins/modifier.capitalize.php
+ libs/plugins/modifier.count_characters.php
+ libs/plugins/modifier.count_paragraphs.php
+ libs/plugins/modifier.count_sentences.php
+ libs/plugins/modifier.count_words.php
+ libs/plugins/modifier.date_format.php
+ libs/plugins/modifier.debug_print_var.php
+ libs/plugins/modifier.default.php
+ libs/plugins/modifier.escape.php
+ libs/plugins/modifier.indent.php
+ libs/plugins/modifier.lower.php
+ libs/plugins/modifier.regex_replace.php
+ libs/plugins/modifier.replace.php
+ libs/plugins/modifier.spacify.php
+ libs/plugins/modifier.string_format.php
+ libs/plugins/modifier.strip_tags.php
+ libs/plugins/modifier.truncate.php
+ libs/plugins/modifier.upper.php
+ libs/plugins/modifier.wordwrap.php
+ libs/plugins/shared.escape_special_chars.php
+ libs/plugins/shared.make_timestamp.php:
+ Added author title to plugins where they don't exist. I put my name where I
+ was the original or co-author. If there needs to be more credit given
+ somewhere, speak up!
+
+2005-10-10 Monte Ohrt
+
+ * NEWS
+ libs/plugins/function.html_image.php:
+ add path_prefix to html_image, fix incorrect secure_dir error when image
+ file is missing
+
+2005-10-04 Monte Ohrt
+
+ * demo/templates/index.tpl:
+ remove popup example, update section var syntax
+
+2005-09-16 Nuno Lopes
+
+ * docs/de/getting-started.xml:
+ more fixes
+
+ * docs/de/getting-started.xml:
+ fix php bug #34520: broken example display (de only)
+
+2005-08-30 Monte Ohrt
+
+ * libs/plugins/modifier.escape.php:
+ change default charset from utf8 to iso-8859-1
+
+ * NEWS
+ libs/plugins/modifier.escape.php:
+ add char_set param
+
+2005-08-17 Monte Ohrt
+
+ * NEWS:
+ fix notice in debug security check
+
+ * libs/Smarty.class.php:
+ fix typo
+
+ * NEWS
+ libs/Smarty.class.php:
+ return valid reference in get_template_vars() when given var is
+ non-existant
+
+2005-08-12 Monte Ohrt
+
+ * NEWS
+ libs/plugins/modifier.escape.php:
+ add "urlpathinfo" escape type to escape modifier. (apache does not like %2F
+ in the PATH_INFO)
+
+2005-08-05 Monte Ohrt
+
+ * NEWS
+ libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ update version numbers
+
+2005-08-04 Monte Ohrt
+
+ * NEWS:
+ update secure_dir notes
+
+ * NEWS:
+ allow debug.tpl to work from arbitrary dir
+
+2005-08-04 Messju Mohr
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ fixed proper escaping for literal strings passed to
+ Smarty_Compiler::_expand_quoted_text() by
+ Smarty_Compiler::_parse_var_props()
+
+2005-07-27 Messju Mohr
+
+ * NEWS
+ libs/plugins/shared.make_timestamp.php:
+ removed ambiguity for numeric values passed to smarty_make_timestamp().
+ numeric values are *always* treated as timestamps now.
+
+2005-07-18 Messju Mohr
+
+ * libs/Config_File.class.php:
+ removed E_NOTICE from Config_File::get()
+
+ * libs/Smarty.class.php:
+ removed E_NOTICE
+
+2005-07-10 Yannick Torres
+
+ * docs/fr/getting-started.xml:
+ sync with EN
+
+2005-07-08 Monte Ohrt
+
+ * NEWS:
+ correct username in NEWS file
+
+ * NEWS
+ libs/plugins/function.html_select_date.php:
+ added passthru attribute feature to html_select_date
+
+2005-07-03 Yannick Torres
+
+ * docs/fr/language-snippets.ent
+ docs/fr/preface.xml:
+ sync with EN
+
+2005-06-16 Messju Mohr
+
+ * docs/de/preface.xml
+ docs/de/preface.xml:
+ sync with en
+
+2005-06-13 Monte Ohrt
+
+ * NEWS
+ libs/plugins/modifier.truncate.php:
+ add "middle" parameter to truncate modifier
+
+2005-06-10 Messju Mohr
+
+ * docs/de/livedocs.ent:
+ added german livedocs.ent
+
+ * docs/de/language-snippets.ent
+ docs/de/preface.xml:
+ sync with en
+
+2005-06-09 Messju Mohr
+
+ * docs/de/bookinfo.xml
+ docs/de/getting-started.xml
+ docs/de/getting-started.xml:
+ sync with en
+
+2005-05-24 Yannick Torres
+
+ * docs/fr/getting-started.xml
+ docs/fr/language-snippets.ent:
+ sync with EN
+
+2005-05-20 Monte Ohrt
+
+ * libs/plugins/function.html_radios.php:
+ fix allowable label id characters
+
+2005-05-06 Monte Ohrt
+
+ * NEWS
+ libs/plugins/function.html_radios.php:
+ make form input label ids optional (monte)
+
+2005-05-02 Monte Ohrt
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ add error message for empty if/elseif statements
+
+2005-04-15 Monte Ohrt
+
+ * NEWS
+ libs/plugins/function.html_radios.php:
+ cast selected value to string for comparison in html_radios
+
+2005-04-07 Messju Mohr
+
+ * NEWS
+ libs/plugins/function.html_select_date.php:
+ added xhtml compliance to html_select_date's year_as_text-feature
+ thanks to Mark West
+
+ * NEWS
+ libs/plugins/function.html_select_date.php:
+ fixed handling of selected month html_select_date
+ thanks to Yuri Weseman for providing problem+solution
+
+2005-04-07 Nuno Lopes
+
+ * docs/configure.in:
+ sync configure and file-entities scripts with phpdoc, for better
+ windows/cygwin support
+
+2005-03-31 Monte Ohrt
+
+ * libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ update version numbers
+
+ * (Smarty_2_6_9)
+ NEWS:
+ update NEWS file
+
+2005-03-30 Messju Mohr
+
+ * libs/plugins/function.math.php:
+ re-enabled hex-constant. i hope in a sane way this time.
+
+2005-03-30 Monte Ohrt
+
+ * libs/plugins/function.math.php:
+ fix function testing logic
+
+ * libs/Smarty_Compiler.class.php:
+ disable variable func calls completely
+
+ * libs/Smarty_Compiler.class.php:
+ disallow variable func calls when security is enabled
+
+2005-03-22 Messju Mohr
+
+ * NEWS
+ libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ bumped version-number to 2.6.9-dev
+ added headline of 2.6.6 release to NEWS file
+
+2005-03-21 Messju Mohr
+
+ * (Smarty_2_6_8)
+ NEWS:
+ maybe even better this way. thanks monte :)
+
+ * NEWS:
+ little more clear news-entry
+
+2005-03-21 Monte Ohrt
+
+ * NEWS:
+ update NEWS with e-modifier removal
+
+ * (Smarty_2_6_8)
+ libs/plugins/modifier.regex_replace.php:
+ remove e-modifier
+
+2005-03-19 Messju Mohr
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ objects don't get casted to arrays anymore in {foreach}
+
+2005-02-26 Messju Mohr
+
+ * NEWS
+ libs/Smarty.class.php:
+ add "null" as a valid token for {if} when security is enabled
+
+2005-02-25 Monte Ohrt
+
+ * NEWS
+ libs/plugins/function.mailto.php:
+ add javascript_charcode option to mailto
+
+2005-02-24 Monte Ohrt
+
+ * NEWS:
+ update NEWS file
+
+ * QUICK_START
+ libs/plugins/function.html_radios.php:
+ add label ids to html_radios
+
+2005-02-10 Monte Ohrt
+
+ * QUICK_START:
+ update with directory structure
+
+2005-02-10 Nuno Lopes
+
+ * docs/Makefile.in:
+ fix chm generation
+
+2005-02-10 Messju Mohr
+
+ * libs/Smarty_Compiler.class.php:
+ fixed too agressive {strip} around delimiters inside strip-blocks
+
+2005-02-10 Monte Ohrt
+
+ * QUICK_START:
+ fix a couple errors
+
+2005-02-10 Nuno Lopes
+
+ * docs/Makefile.in
+ docs/README:
+ commiting the new tools to make the CHM manual.
+
+2005-02-09 Messju Mohr
+
+ * NEWS
+ libs/Smarty_Compiler.class.php:
+ fixed handling of strip-tags with non-default delimiters
+
+2005-02-04 Messju Mohr
+
+ * libs/plugins/function.html_radios.php:
+ fixed syntax error. shame on me.
+
+2005-02-03 Monte Ohrt
+
+ * QUICK_START:
+ fix example
+
+ * QUICK_START:
+ initial commit
+
+ * RELEASE_NOTES
+ libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ update version numbers in cvs
+
+ * (Smarty_2_6_7)
+ NEWS
+ libs/Config_File.class.php
+ libs/Smarty.class.php
+ libs/Smarty_Compiler.class.php:
+ commit version numbers for new release
+
+2005-02-03 Messju Mohr
+
+ * (Smarty_2_6_7)
+ libs/plugins/function.html_image.php:
+ fixed comment (thanks to CirTap)
+
+2005-02-01 Monte Ohrt
+
+ * libs/plugins/function.html_image.php:
+ remove border tag
+
+2005-02-01 Messju Mohr
+
+ * libs/Smarty.class.php:
+ fixed serialization of values containing newlines (like _cache_attrs)
+ in core_write_cache_file()
+
+ bumped version to 2.6.6-dev-3 to indicate that the fileformat of cache
+ has changed
+
+2005-01-30 Messju Mohr