[geeklog-cvs] Geeklog-2/system/Propel/Geeklog-2/om BaseGl2Action.php,1.1.1.1,1.2 BaseGl2ActionPeer.php,1.1.1.1,1.2 BaseGl2Actionlistener.php,1.1.1.1,1.2 BaseGl2ActionlistenerPeer.php,1.1.1.1,1.2 BaseGl2Block.php,1.1.1.1,1.2 BaseGl2BlockPeer.php,1.1.1.1,1.2 BaseGl2Category.php,1.1.1.1,1.2 BaseGl2CategoryPeer.php,1.1.1.1,1.2 BaseGl2Comment.php,1.1.1.1,1.2 BaseGl2CommentPeer.php,1.1.1.1,1.2 BaseGl2Group.php,1.1.1.1,1.2 BaseGl2GroupAssignment.php,1.1.1.1,1.2 BaseGl2GroupAssignmentPeer.php,1.1.1.1,1.2 BaseGl2GroupPeer.php,1.1.1.1,1.2 BaseGl2Item.php,1.1.1.1,1.2 BaseGl2ItemAcl.php,1.1.1.1,1.2 BaseGl2ItemAclPeer.php,1.1.1.1,1.2 BaseGl2ItemCategory.php,1.1.1.1,1.2 BaseGl2ItemCategoryPeer.php,1.1.1.1,1.2 BaseGl2ItemPeer.php,1.1.1.1,1.2 BaseGl2ListOfValues.php,1.1.1.1,1.2 BaseGl2ListOfValuesPeer.php,1.1.1.1,1.2 BaseGl2Plugin.php,1.1.1.1,1.2 BaseGl2PluginPeer.php,1.1.1.1,1.2 BaseGl2Privilege.php,1.1.1.1,1.2 BaseGl2PrivilegeAccess.php,1.1.1.1,1.2 BaseGl2PrivilegeAccessPeer.php,1.1.1.1,1.2 Bas eGl2PrivilegePeer.php,1.1.1.1,1.2 BaseGl2User.php,1.1.1.1,1.2 BaseGl2UserBlock.php,1.1.1.1,1.2 BaseGl2UserBlockPeer.php,1.1.1.1,1.2 BaseGl2UserPeer.php,1.1.1.1,1.2
tony at iowaoutdoors.org
tony at iowaoutdoors.org
Sat Dec 18 02:09:54 EST 2004
- Previous message (by thread): [geeklog-cvs] Geeklog-2/system/Propel/Geeklog-2/map Gl2ActionMapBuilder.php,1.1.1.1,1.2 Gl2ActionlistenerMapBuilder.php,1.1.1.1,1.2 Gl2BlockMapBuilder.php,1.1.1.1,1.2 Gl2CategoryMapBuilder.php,1.1.1.1,1.2 Gl2CommentMapBuilder.php,1.1.1.1,1.2 Gl2GroupAssignmentMapBuilder.php,1.1.1.1,1.2 Gl2GroupMapBuilder.php,1.1.1.1,1.2 Gl2ItemAclMapBuilder.php,1.1.1.1,1.2 Gl2ItemCategoryMapBuilder.php,1.1.1.1,1.2 Gl2ItemMapBuilder.php,1.1.1.1,1.2 Gl2ListOfValuesMapBuilder.php,1.1.1.1,1.2 Gl2PluginMapBuilder.php,1.1.1.1,1.2 Gl2PrivilegeAccessMapBuilder.php,1.1.1.1,1.2 Gl2PrivilegeMapBuilder.php,1.1.1.1,1.2 Gl2UserBlockMapBuilder.php,1.1.1.1,1.2 Gl2UserMapBuilder.php,1.1.1.1,1.2
- Next message (by thread): [geeklog-cvs] Geeklog-2/system/Propel/classes/propel/adapter DBAdapter.php,1.1.1.1,1.2 DBMSSQL.php,1.1.1.1,1.2 DBMySQL.php,1.1.1.1,1.2 DBNone.php,1.1.1.1,1.2 DBOracle.php,1.1.1.1,1.2 DBPostgres.php,1.1.1.1,1.2 DBSQLite.php,1.1.1.1,1.2 DBSybase.php,1.1.1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om
In directory www:/tmp/cvs-serv31636/Geeklog-2/om
Modified Files:
BaseGl2Action.php BaseGl2ActionPeer.php
BaseGl2Actionlistener.php BaseGl2ActionlistenerPeer.php
BaseGl2Block.php BaseGl2BlockPeer.php BaseGl2Category.php
BaseGl2CategoryPeer.php BaseGl2Comment.php
BaseGl2CommentPeer.php BaseGl2Group.php
BaseGl2GroupAssignment.php BaseGl2GroupAssignmentPeer.php
BaseGl2GroupPeer.php BaseGl2Item.php BaseGl2ItemAcl.php
BaseGl2ItemAclPeer.php BaseGl2ItemCategory.php
BaseGl2ItemCategoryPeer.php BaseGl2ItemPeer.php
BaseGl2ListOfValues.php BaseGl2ListOfValuesPeer.php
BaseGl2Plugin.php BaseGl2PluginPeer.php BaseGl2Privilege.php
BaseGl2PrivilegeAccess.php BaseGl2PrivilegeAccessPeer.php
BaseGl2PrivilegePeer.php BaseGl2User.php BaseGl2UserBlock.php
BaseGl2UserBlockPeer.php BaseGl2UserPeer.php
Log Message:
All from new build to reflect recent database changes
Index: BaseGl2Item.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2Item.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2Item.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2Item.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 28,32 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 28,32 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
***************
*** 269,280 ****
}
!
/**
! * Get the DateCreated column value.
! * * @return int
*/
! public function getDateCreated()
{
! return $this->date_created;
}
--- 269,300 ----
}
!
/**
! * Get the [optionally formatted] `date_created` column value.
! * * @param string $format The date/time format string (either date()-style or strftime()-style).
! * If format is NULL, then the integer unix timestamp will be returned.
! * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL).
! * @throws PropelException - if unable to convert the date/time to timestamp.
*/
! public function getDateCreated($format = 'Y-m-d H:i:s')
{
! if ($this->date_created === null || $this->date_created === '') {
! return null;
! } elseif (!is_int($this->date_created)) {
! // a non-timestamp value was set externally, so we convert it
! $ts = strtotime($this->date_created);
! if ($ts === -1) {
! throw new PropelException("Unable to parse value of date_created as date/time value: " . var_export($this->date_created, true));
! }
! } else {
! $ts = $this->date_created;
! }
! if ($format === null) {
! return $ts;
! } elseif (strpos($format, '%') !== false) {
! return strftime($format, $ts);
! } else {
! return date($format, $ts);
! }
}
***************
*** 284,296 ****
* * @param int $v new value
* @return void
! *
*/
public function setDateCreated($v)
{
if ($this->date_created !== $v) {
! $this->date_created = $v;
$this->modifiedColumns[] = Gl2ItemPeer::DATE_CREATED;
}
!
}
--- 304,324 ----
* * @param int $v new value
* @return void
! * @throws PropelException - If passed [not-null] date/time is in an invalid format.
*/
public function setDateCreated($v)
{
if ($this->date_created !== $v) {
! if ($v !== null && !is_int($v)) {
! $ts = strtotime($v);
! if ($ts === -1) {
! throw new PropelException("Unable to parse date/time value for date_created from input: " . var_export($v, true));
! }
! } else {
! $ts = $v;
! }
! $this->date_created = $ts;
$this->modifiedColumns[] = Gl2ItemPeer::DATE_CREATED;
}
!
}
***************
*** 429,440 ****
}
!
/**
! * Get the ExpirationDate column value.
! * * @return int
*/
! public function getExpirationDate()
{
! return $this->expiration_date;
}
--- 457,488 ----
}
!
/**
! * Get the [optionally formatted] `expiration_date` column value.
! * * @param string $format The date/time format string (either date()-style or strftime()-style).
! * If format is NULL, then the integer unix timestamp will be returned.
! * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL).
! * @throws PropelException - if unable to convert the date/time to timestamp.
*/
! public function getExpirationDate($format = 'Y-m-d H:i:s')
{
! if ($this->expiration_date === null || $this->expiration_date === '') {
! return null;
! } elseif (!is_int($this->expiration_date)) {
! // a non-timestamp value was set externally, so we convert it
! $ts = strtotime($this->expiration_date);
! if ($ts === -1) {
! throw new PropelException("Unable to parse value of expiration_date as date/time value: " . var_export($this->expiration_date, true));
! }
! } else {
! $ts = $this->expiration_date;
! }
! if ($format === null) {
! return $ts;
! } elseif (strpos($format, '%') !== false) {
! return strftime($format, $ts);
! } else {
! return date($format, $ts);
! }
}
***************
*** 444,456 ****
* * @param int $v new value
* @return void
! *
*/
public function setExpirationDate($v)
{
if ($this->expiration_date !== $v) {
! $this->expiration_date = $v;
$this->modifiedColumns[] = Gl2ItemPeer::EXPIRATION_DATE;
}
!
}
--- 492,512 ----
* * @param int $v new value
* @return void
! * @throws PropelException - If passed [not-null] date/time is in an invalid format.
*/
public function setExpirationDate($v)
{
if ($this->expiration_date !== $v) {
! if ($v !== null && !is_int($v)) {
! $ts = strtotime($v);
! if ($ts === -1) {
! throw new PropelException("Unable to parse date/time value for expiration_date from input: " . var_export($v, true));
! }
! } else {
! $ts = $v;
! }
! $this->expiration_date = $ts;
$this->modifiedColumns[] = Gl2ItemPeer::EXPIRATION_DATE;
}
!
}
***************
*** 529,533 ****
$this->user_id = $rs->getInt($startcol + 2);
$this->enabled = $rs->getInt($startcol + 3);
! $this->date_created = $rs->getInt($startcol + 4);
$this->num_views = $rs->getInt($startcol + 5);
$this->state_id = $rs->getInt($startcol + 6);
--- 585,589 ----
$this->user_id = $rs->getInt($startcol + 2);
$this->enabled = $rs->getInt($startcol + 3);
! $this->date_created = $rs->getTimestamp($startcol + 4, null);
$this->num_views = $rs->getInt($startcol + 5);
$this->state_id = $rs->getInt($startcol + 6);
***************
*** 535,539 ****
$this->num_ratings = $rs->getInt($startcol + 8);
$this->rating_sum = $rs->getInt($startcol + 9);
! $this->expiration_date = $rs->getInt($startcol + 10);
$this->left_index = $rs->getInt($startcol + 11);
$this->right_index = $rs->getInt($startcol + 12);
--- 591,595 ----
$this->num_ratings = $rs->getInt($startcol + 8);
$this->rating_sum = $rs->getInt($startcol + 9);
! $this->expiration_date = $rs->getTimestamp($startcol + 10, null);
$this->left_index = $rs->getInt($startcol + 11);
$this->right_index = $rs->getInt($startcol + 12);
Index: BaseGl2UserBlockPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2UserBlockPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2UserBlockPeer.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2UserBlockPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 21,25 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 21,25 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2Plugin.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2Plugin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2Plugin.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2Plugin.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 16,20 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 16,20 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2User.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2User.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2User.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2User.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 19,22 ****
--- 19,30 ----
// (on-demand) include_once 'Geeklog-2/Gl2ListOfValues.php';
// (on-demand) include_once 'Geeklog-2/Gl2ListOfValuesPeer.php';
+
+
+ // (on-demand) include_once 'Geeklog-2/Gl2Timezone.php';
+ // (on-demand) include_once 'Geeklog-2/Gl2TimezonePeer.php';
+
+
+ // (on-demand) include_once 'Geeklog-2/Gl2ListOfValues.php';
+ // (on-demand) include_once 'Geeklog-2/Gl2ListOfValuesPeer.php';
include_once 'Geeklog-2/Gl2UserPeer.php';
***************
*** 28,32 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 36,40 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
***************
*** 58,61 ****
--- 66,75 ----
/**
+ * The value for the theme field.
+ * @var string
+ */
+ protected $theme = 'default';
+
+ /**
* The value for the profile_views field.
* @var int
***************
*** 70,77 ****
/**
! * The value for the language_id field.
* @var int
*/
! protected $language_id = 0;
/**
--- 84,97 ----
/**
! * The value for the locale_id field.
* @var int
*/
! protected $locale_id = 0;
!
! /**
! * The value for the timezone_id field.
! * @var int
! */
! protected $timezone_id = 0;
/**
***************
*** 231,242 ****
}
!
/**
! * Get the RegistrationDate column value.
! * * @return int
*/
! public function getRegistrationDate()
{
! return $this->registration_date;
}
--- 251,282 ----
}
!
/**
! * Get the [optionally formatted] `registration_date` column value.
! * * @param string $format The date/time format string (either date()-style or strftime()-style).
! * If format is NULL, then the integer unix timestamp will be returned.
! * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL).
! * @throws PropelException - if unable to convert the date/time to timestamp.
*/
! public function getRegistrationDate($format = 'Y-m-d H:i:s')
{
! if ($this->registration_date === null || $this->registration_date === '') {
! return null;
! } elseif (!is_int($this->registration_date)) {
! // a non-timestamp value was set externally, so we convert it
! $ts = strtotime($this->registration_date);
! if ($ts === -1) {
! throw new PropelException("Unable to parse value of registration_date as date/time value: " . var_export($this->registration_date, true));
! }
! } else {
! $ts = $this->registration_date;
! }
! if ($format === null) {
! return $ts;
! } elseif (strpos($format, '%') !== false) {
! return strftime($format, $ts);
! } else {
! return date($format, $ts);
! }
}
***************
*** 246,257 ****
* * @param int $v new value
* @return void
! *
*/
public function setRegistrationDate($v)
{
if ($this->registration_date !== $v) {
! $this->registration_date = $v;
$this->modifiedColumns[] = Gl2UserPeer::REGISTRATION_DATE;
}
}
--- 286,331 ----
* * @param int $v new value
* @return void
! * @throws PropelException - If passed [not-null] date/time is in an invalid format.
*/
public function setRegistrationDate($v)
{
if ($this->registration_date !== $v) {
! if ($v !== null && !is_int($v)) {
! $ts = strtotime($v);
! if ($ts === -1) {
! throw new PropelException("Unable to parse date/time value for registration_date from input: " . var_export($v, true));
! }
! } else {
! $ts = $v;
! }
! $this->registration_date = $ts;
$this->modifiedColumns[] = Gl2UserPeer::REGISTRATION_DATE;
}
+
+ }
+
+
+ /**
+ * Get the Theme column value.
+ * * @return string
+ */
+ public function getTheme()
+ {
+ return $this->theme;
+ }
+
+
+ /**
+ * Set the value of `theme` column.
+ * * @param string $v new value
+ * @return void
+ *
+ */
+ public function setTheme($v)
+ {
+ if ($this->theme !== $v) {
+ $this->theme = $v;
+ $this->modifiedColumns[] = Gl2UserPeer::THEME;
+ }
}
***************
*** 311,336 ****
/**
! * Get the LanguageId column value.
* * @return int
*/
! public function getLanguageId()
{
! return $this->language_id;
}
/**
! * Set the value of `language_id` column.
* * @param int $v new value
* @return void
! *
*/
! public function setLanguageId($v)
{
! if ($this->language_id !== $v) {
! $this->language_id = $v;
! $this->modifiedColumns[] = Gl2UserPeer::LANGUAGE_ID;
}
!
}
--- 385,444 ----
/**
! * Get the LocaleId column value.
* * @return int
*/
! public function getLocaleId()
{
! return $this->locale_id;
}
/**
! * Set the value of `locale_id` column.
* * @param int $v new value
* @return void
! * @throws PropelException
*/
! public function setLocaleId($v)
{
! if ($this->locale_id !== $v) {
! $this->locale_id = $v;
! $this->modifiedColumns[] = Gl2UserPeer::LOCALE_ID;
}
!
! if ($this->aGl2ListOfValuesRelatedByLocaleId !== null && $this->aGl2ListOfValuesRelatedByLocaleId->getLovId() !== $v) {
! $this->aGl2ListOfValuesRelatedByLocaleId = null;
! }
!
! }
!
!
! /**
! * Get the TimezoneId column value.
! * * @return int
! */
! public function getTimezoneId()
! {
! return $this->timezone_id;
! }
!
!
! /**
! * Set the value of `timezone_id` column.
! * * @param int $v new value
! * @return void
! * @throws PropelException
! */
! public function setTimezoneId($v)
! {
! if ($this->timezone_id !== $v) {
! $this->timezone_id = $v;
! $this->modifiedColumns[] = Gl2UserPeer::TIMEZONE_ID;
! }
!
! if ($this->aGl2Timezone !== null && $this->aGl2Timezone->getTimezoneId() !== $v) {
! $this->aGl2Timezone = null;
! }
!
}
***************
*** 782,805 ****
try {
$this->user_id = $rs->getInt($startcol + 0);
! $this->registration_date = $rs->getInt($startcol + 1);
! $this->profile_views = $rs->getInt($startcol + 2);
! $this->items_per_page = $rs->getInt($startcol + 3);
! $this->language_id = $rs->getInt($startcol + 4);
! $this->user_name = $rs->getString($startcol + 5);
! $this->password = $rs->getString($startcol + 6);
! $this->enabled = $rs->getInt($startcol + 7);
! $this->email = $rs->getString($startcol + 8);
! $this->comment_mode_id = $rs->getInt($startcol + 9);
! $this->comment_order_id = $rs->getInt($startcol + 10);
! $this->comment_limit = $rs->getInt($startcol + 11);
! $this->cookie_timeout = $rs->getInt($startcol + 12);
! $this->locale = $rs->getString($startcol + 13);
! $this->date_format_id = $rs->getInt($startcol + 14);
! $this->blocks_enabled = $rs->getInt($startcol + 15);
! $this->signature = $rs->getString($startcol + 16);
! $this->biography = $rs->getString($startcol + 17);
! $this->first_name = $rs->getString($startcol + 18);
! $this->last_name = $rs->getString($startcol + 19);
! $this->homepage = $rs->getString($startcol + 20);
$this->resetModified();
--- 890,915 ----
try {
$this->user_id = $rs->getInt($startcol + 0);
! $this->registration_date = $rs->getTimestamp($startcol + 1, null);
! $this->theme = $rs->getString($startcol + 2);
! $this->profile_views = $rs->getInt($startcol + 3);
! $this->items_per_page = $rs->getInt($startcol + 4);
! $this->locale_id = $rs->getInt($startcol + 5);
! $this->timezone_id = $rs->getInt($startcol + 6);
! $this->user_name = $rs->getString($startcol + 7);
! $this->password = $rs->getString($startcol + 8);
! $this->enabled = $rs->getInt($startcol + 9);
! $this->email = $rs->getString($startcol + 10);
! $this->comment_mode_id = $rs->getInt($startcol + 11);
! $this->comment_order_id = $rs->getInt($startcol + 12);
! $this->comment_limit = $rs->getInt($startcol + 13);
! $this->cookie_timeout = $rs->getInt($startcol + 14);
! $this->locale = $rs->getString($startcol + 15);
! $this->date_format_id = $rs->getInt($startcol + 16);
! $this->blocks_enabled = $rs->getInt($startcol + 17);
! $this->signature = $rs->getString($startcol + 18);
! $this->biography = $rs->getString($startcol + 19);
! $this->first_name = $rs->getString($startcol + 20);
! $this->last_name = $rs->getString($startcol + 21);
! $this->homepage = $rs->getString($startcol + 22);
$this->resetModified();
***************
*** 837,843 ****
if ($this->isColumnModified(Gl2UserPeer::USER_ID)) $criteria->add(Gl2UserPeer::USER_ID, $this->user_id);
if ($this->isColumnModified(Gl2UserPeer::REGISTRATION_DATE)) $criteria->add(Gl2UserPeer::REGISTRATION_DATE, $this->registration_date);
if ($this->isColumnModified(Gl2UserPeer::PROFILE_VIEWS)) $criteria->add(Gl2UserPeer::PROFILE_VIEWS, $this->profile_views);
if ($this->isColumnModified(Gl2UserPeer::ITEMS_PER_PAGE)) $criteria->add(Gl2UserPeer::ITEMS_PER_PAGE, $this->items_per_page);
! if ($this->isColumnModified(Gl2UserPeer::LANGUAGE_ID)) $criteria->add(Gl2UserPeer::LANGUAGE_ID, $this->language_id);
if ($this->isColumnModified(Gl2UserPeer::USER_NAME)) $criteria->add(Gl2UserPeer::USER_NAME, $this->user_name);
if ($this->isColumnModified(Gl2UserPeer::PASSWORD)) $criteria->add(Gl2UserPeer::PASSWORD, $this->password);
--- 947,955 ----
if ($this->isColumnModified(Gl2UserPeer::USER_ID)) $criteria->add(Gl2UserPeer::USER_ID, $this->user_id);
if ($this->isColumnModified(Gl2UserPeer::REGISTRATION_DATE)) $criteria->add(Gl2UserPeer::REGISTRATION_DATE, $this->registration_date);
+ if ($this->isColumnModified(Gl2UserPeer::THEME)) $criteria->add(Gl2UserPeer::THEME, $this->theme);
if ($this->isColumnModified(Gl2UserPeer::PROFILE_VIEWS)) $criteria->add(Gl2UserPeer::PROFILE_VIEWS, $this->profile_views);
if ($this->isColumnModified(Gl2UserPeer::ITEMS_PER_PAGE)) $criteria->add(Gl2UserPeer::ITEMS_PER_PAGE, $this->items_per_page);
! if ($this->isColumnModified(Gl2UserPeer::LOCALE_ID)) $criteria->add(Gl2UserPeer::LOCALE_ID, $this->locale_id);
! if ($this->isColumnModified(Gl2UserPeer::TIMEZONE_ID)) $criteria->add(Gl2UserPeer::TIMEZONE_ID, $this->timezone_id);
if ($this->isColumnModified(Gl2UserPeer::USER_NAME)) $criteria->add(Gl2UserPeer::USER_NAME, $this->user_name);
if ($this->isColumnModified(Gl2UserPeer::PASSWORD)) $criteria->add(Gl2UserPeer::PASSWORD, $this->password);
***************
*** 1072,1075 ****
--- 1184,1327 ----
/**
+ * @var Gl2Timezone
+ */
+ protected $aGl2Timezone;
+
+ /**
+ * Declares an association between this object and a Gl2Timezone object
+ *
+ * @param Gl2Timezone $v
+ * @return void
+ * @throws PropelException
+ */
+ public function setGl2Timezone($v)
+ {
+
+ if ($v === null) {
+ $this->setTimezoneId('0');
+ } else {
+ $this->setTimezoneId($v->getTimezoneId());
+ }
+
+ $this->aGl2Timezone = $v;
+ }
+
+
+ /**
+ * Get the associated Gl2Timezone object
+ *
+ * @param Connection Optional Connection object.
+ * @return Gl2Timezone The associated Gl2Timezone object.
+ * @throws PropelException
+ */
+ public function getGl2Timezone($con = null)
+ {
+ // include the Peer class
+ include_once 'Geeklog-2/Gl2TimezonePeer.php';
+
+ if ($this->aGl2Timezone === null && ($this->timezone_id !== null)) {
+
+ $this->aGl2Timezone = Gl2TimezonePeer::retrieveByPK($this->timezone_id, $con);
+
+ /* The following can be used instead of the line above to
+ guarantee the related object contains a reference
+ to this object, but this level of coupling
+ may be undesirable in many circumstances.
+ As it can lead to a db query with many results that may
+ never be used.
+ $obj = Gl2TimezonePeer::retrieveByPK($this->timezone_id, $con);
+ $obj->addGl2Users($this);
+ */
+ }
+ return $this->aGl2Timezone;
+ }
+
+ /**
+ * Provides convenient way to set a relationship based on a
+ * key. e.g.
+ * <code>$bar->setFooKey($foo->getPrimaryKey())</code>
+ *
+
+ * @return void
+ * @throws PropelException
+ */
+ public function setGl2TimezoneKey($key)
+ {
+
+ $this->setTimezoneId( (int) $key);
+
+ }
+
+ /**
+ * @var Gl2ListOfValues
+ */
+ protected $aGl2ListOfValuesRelatedByLocaleId;
+
+ /**
+ * Declares an association between this object and a Gl2ListOfValues object
+ *
+ * @param Gl2ListOfValues $v
+ * @return void
+ * @throws PropelException
+ */
+ public function setGl2ListOfValuesRelatedByLocaleId($v)
+ {
+
+ if ($v === null) {
+ $this->setLocaleId('0');
+ } else {
+ $this->setLocaleId($v->getLovId());
+ }
+
+ $this->aGl2ListOfValuesRelatedByLocaleId = $v;
+ }
+
+
+ /**
+ * Get the associated Gl2ListOfValues object
+ *
+ * @param Connection Optional Connection object.
+ * @return Gl2ListOfValues The associated Gl2ListOfValues object.
+ * @throws PropelException
+ */
+ public function getGl2ListOfValuesRelatedByLocaleId($con = null)
+ {
+ // include the Peer class
+ include_once 'Geeklog-2/Gl2ListOfValuesPeer.php';
+
+ if ($this->aGl2ListOfValuesRelatedByLocaleId === null && ($this->locale_id !== null)) {
+
+ $this->aGl2ListOfValuesRelatedByLocaleId = Gl2ListOfValuesPeer::retrieveByPK($this->locale_id, $con);
+
+ /* The following can be used instead of the line above to
+ guarantee the related object contains a reference
+ to this object, but this level of coupling
+ may be undesirable in many circumstances.
+ As it can lead to a db query with many results that may
+ never be used.
+ $obj = Gl2ListOfValuesPeer::retrieveByPK($this->locale_id, $con);
+ $obj->addGl2UsersRelatedByLocaleId($this);
+ */
+ }
+ return $this->aGl2ListOfValuesRelatedByLocaleId;
+ }
+
+ /**
+ * Provides convenient way to set a relationship based on a
+ * key. e.g.
+ * <code>$bar->setFooKey($foo->getPrimaryKey())</code>
+ *
+
+ * @return void
+ * @throws PropelException
+ */
+ public function setGl2ListOfValuesRelatedByLocaleIdKey($key)
+ {
+
+ $this->setLocaleId( (int) $key);
+
+ }
+
+ /**
* Collection to store aggregation of collGl2GroupAssignments
* @var array
***************
*** 2177,2180 ****
--- 2429,2442 ----
$this->setGl2ListOfValuesRelatedByDateFormatId($this->aGl2ListOfValuesRelatedByDateFormatId);
}
+
+ if ($this->aGl2Timezone !== null) {
+ if ($this->aGl2Timezone->isModified()) $this->aGl2Timezone->save($con);
+ $this->setGl2Timezone($this->aGl2Timezone);
+ }
+
+ if ($this->aGl2ListOfValuesRelatedByLocaleId !== null) {
+ if ($this->aGl2ListOfValuesRelatedByLocaleId->isModified()) $this->aGl2ListOfValuesRelatedByLocaleId->save($con);
+ $this->setGl2ListOfValuesRelatedByLocaleId($this->aGl2ListOfValuesRelatedByLocaleId);
+ }
// If this object has been modified, then save it to the database.
***************
*** 2273,2276 ****
--- 2535,2548 ----
}
}
+ if ($this->aGl2Timezone !== null) {
+ if (($retval = $this->aGl2Timezone->validate()) !== true) {
+ $failureMap = array_merge($failureMap, $retval);
+ }
+ }
+ if ($this->aGl2ListOfValuesRelatedByLocaleId !== null) {
+ if (($retval = $this->aGl2ListOfValuesRelatedByLocaleId->validate()) !== true) {
+ $failureMap = array_merge($failureMap, $retval);
+ }
+ }
if (($retval = Gl2UserPeer::doValidate($this)) !== true) {
***************
*** 2363,2369 ****
$copyObj = new Gl2User();
$copyObj->setRegistrationDate($this->registration_date);
$copyObj->setProfileViews($this->profile_views);
$copyObj->setItemsPerPage($this->items_per_page);
! $copyObj->setLanguageId($this->language_id);
$copyObj->setUserName($this->user_name);
$copyObj->setPassword($this->password);
--- 2635,2643 ----
$copyObj = new Gl2User();
$copyObj->setRegistrationDate($this->registration_date);
+ $copyObj->setTheme($this->theme);
$copyObj->setProfileViews($this->profile_views);
$copyObj->setItemsPerPage($this->items_per_page);
! $copyObj->setLocaleId($this->locale_id);
! $copyObj->setTimezoneId($this->timezone_id);
$copyObj->setUserName($this->user_name);
$copyObj->setPassword($this->password);
Index: BaseGl2CategoryPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2CategoryPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2CategoryPeer.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2CategoryPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 18,22 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 18,22 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2GroupAssignmentPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2GroupAssignmentPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2GroupAssignmentPeer.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2GroupAssignmentPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 21,25 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 21,25 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2ItemAclPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2ItemAclPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2ItemAclPeer.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2ItemAclPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 21,25 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 21,25 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2ItemPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2ItemPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2ItemPeer.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2ItemPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 21,25 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 21,25 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2CommentPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2CommentPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2CommentPeer.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2CommentPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 15,19 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 15,19 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2Group.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2Group.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2Group.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2Group.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 16,20 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 16,20 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2ItemAcl.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2ItemAcl.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2ItemAcl.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2ItemAcl.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 28,32 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 28,32 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2GroupAssignment.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2GroupAssignment.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2GroupAssignment.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2GroupAssignment.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 28,32 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 28,32 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2Block.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2Block.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2Block.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2Block.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 28,32 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 28,32 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
***************
*** 375,386 ****
}
!
/**
! * Get the LastRdfUpdate column value.
! * * @return int
*/
! public function getLastRdfUpdate()
{
! return $this->last_rdf_update;
}
--- 375,406 ----
}
!
/**
! * Get the [optionally formatted] `last_rdf_update` column value.
! * * @param string $format The date/time format string (either date()-style or strftime()-style).
! * If format is NULL, then the integer unix timestamp will be returned.
! * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL).
! * @throws PropelException - if unable to convert the date/time to timestamp.
*/
! public function getLastRdfUpdate($format = 'Y-m-d H:i:s')
{
! if ($this->last_rdf_update === null || $this->last_rdf_update === '') {
! return null;
! } elseif (!is_int($this->last_rdf_update)) {
! // a non-timestamp value was set externally, so we convert it
! $ts = strtotime($this->last_rdf_update);
! if ($ts === -1) {
! throw new PropelException("Unable to parse value of last_rdf_update as date/time value: " . var_export($this->last_rdf_update, true));
! }
! } else {
! $ts = $this->last_rdf_update;
! }
! if ($format === null) {
! return $ts;
! } elseif (strpos($format, '%') !== false) {
! return strftime($format, $ts);
! } else {
! return date($format, $ts);
! }
}
***************
*** 390,402 ****
* * @param int $v new value
* @return void
! *
*/
public function setLastRdfUpdate($v)
{
if ($this->last_rdf_update !== $v) {
! $this->last_rdf_update = $v;
$this->modifiedColumns[] = Gl2BlockPeer::LAST_RDF_UPDATE;
}
!
}
--- 410,430 ----
* * @param int $v new value
* @return void
! * @throws PropelException - If passed [not-null] date/time is in an invalid format.
*/
public function setLastRdfUpdate($v)
{
if ($this->last_rdf_update !== $v) {
! if ($v !== null && !is_int($v)) {
! $ts = strtotime($v);
! if ($ts === -1) {
! throw new PropelException("Unable to parse date/time value for last_rdf_update from input: " . var_export($v, true));
! }
! } else {
! $ts = $v;
! }
! $this->last_rdf_update = $ts;
$this->modifiedColumns[] = Gl2BlockPeer::LAST_RDF_UPDATE;
}
!
}
***************
*** 506,510 ****
$this->location_id = $rs->getInt($startcol + 7);
$this->rdf_url = $rs->getString($startcol + 8);
! $this->last_rdf_update = $rs->getInt($startcol + 9);
$this->function_name = $rs->getString($startcol + 10);
$this->content = $rs->getString($startcol + 11);
--- 534,538 ----
$this->location_id = $rs->getInt($startcol + 7);
$this->rdf_url = $rs->getString($startcol + 8);
! $this->last_rdf_update = $rs->getTimestamp($startcol + 9, null);
$this->function_name = $rs->getString($startcol + 10);
$this->content = $rs->getString($startcol + 11);
Index: BaseGl2PrivilegeAccess.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2PrivilegeAccess.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2PrivilegeAccess.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2PrivilegeAccess.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 24,28 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 24,28 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2ListOfValuesPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2ListOfValuesPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2ListOfValuesPeer.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2ListOfValuesPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 12,16 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 12,16 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2Comment.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2Comment.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2Comment.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2Comment.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 20,24 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 20,24 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2ItemCategoryPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2ItemCategoryPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2ItemCategoryPeer.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2ItemCategoryPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 18,22 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 18,22 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2ActionlistenerPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2ActionlistenerPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2ActionlistenerPeer.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2ActionlistenerPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 18,22 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 18,22 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2PrivilegeAccessPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2PrivilegeAccessPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2PrivilegeAccessPeer.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2PrivilegeAccessPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 18,22 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 18,22 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2Category.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2Category.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2Category.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2Category.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 24,28 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 24,28 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2ListOfValues.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2ListOfValues.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2ListOfValues.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2ListOfValues.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 16,20 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 16,20 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
***************
*** 148,151 ****
--- 148,158 ----
}
+ // update associated Gl2User
+ if ($this->collGl2UsersRelatedByLocaleId !== null) {
+ for ($i=0,$size=count($this->collGl2UsersRelatedByLocaleId); $i < $size; $i++) {
+ $this->collGl2UsersRelatedByLocaleId[$i]->setLocaleId($v);
+ }
+ }
+
// update associated Gl2UserBlock
if ($this->collGl2UserBlocks !== null) {
***************
*** 1370,1373 ****
--- 1377,1460 ----
/**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByCommentModeId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByCommentModeIdJoinGl2Timezone($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByCommentModeId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByCommentModeId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::COMMENT_MODE_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByCommentModeId = Gl2UserPeer::doSelectJoinGl2Timezone($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::COMMENT_MODE_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByCommentModeIdCriteria) || !$this->lastGl2UsersRelatedByCommentModeIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByCommentModeId = Gl2UserPeer::doSelectJoinGl2Timezone($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByCommentModeIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByCommentModeId;
+ }
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByCommentModeId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByCommentModeIdJoinGl2ListOfValuesRelatedByLocaleId($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByCommentModeId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByCommentModeId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::COMMENT_MODE_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByCommentModeId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByLocaleId($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::COMMENT_MODE_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByCommentModeIdCriteria) || !$this->lastGl2UsersRelatedByCommentModeIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByCommentModeId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByLocaleId($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByCommentModeIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByCommentModeId;
+ }
+
+ /**
* Collection to store aggregation of collGl2UsersRelatedByCommentOrderId
* @var array
***************
*** 1539,1542 ****
--- 1626,1709 ----
/**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByCommentOrderId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByCommentOrderIdJoinGl2Timezone($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByCommentOrderId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByCommentOrderId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::COMMENT_ORDER_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByCommentOrderId = Gl2UserPeer::doSelectJoinGl2Timezone($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::COMMENT_ORDER_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByCommentOrderIdCriteria) || !$this->lastGl2UsersRelatedByCommentOrderIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByCommentOrderId = Gl2UserPeer::doSelectJoinGl2Timezone($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByCommentOrderIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByCommentOrderId;
+ }
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByCommentOrderId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByCommentOrderIdJoinGl2ListOfValuesRelatedByLocaleId($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByCommentOrderId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByCommentOrderId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::COMMENT_ORDER_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByCommentOrderId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByLocaleId($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::COMMENT_ORDER_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByCommentOrderIdCriteria) || !$this->lastGl2UsersRelatedByCommentOrderIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByCommentOrderId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByLocaleId($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByCommentOrderIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByCommentOrderId;
+ }
+
+ /**
* Collection to store aggregation of collGl2UsersRelatedByDateFormatId
* @var array
***************
*** 1708,1711 ****
--- 1875,2207 ----
/**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByDateFormatId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByDateFormatIdJoinGl2Timezone($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByDateFormatId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByDateFormatId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::DATE_FORMAT_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByDateFormatId = Gl2UserPeer::doSelectJoinGl2Timezone($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::DATE_FORMAT_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByDateFormatIdCriteria) || !$this->lastGl2UsersRelatedByDateFormatIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByDateFormatId = Gl2UserPeer::doSelectJoinGl2Timezone($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByDateFormatIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByDateFormatId;
+ }
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByDateFormatId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByDateFormatIdJoinGl2ListOfValuesRelatedByLocaleId($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByDateFormatId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByDateFormatId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::DATE_FORMAT_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByDateFormatId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByLocaleId($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::DATE_FORMAT_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByDateFormatIdCriteria) || !$this->lastGl2UsersRelatedByDateFormatIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByDateFormatId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByLocaleId($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByDateFormatIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByDateFormatId;
+ }
+
+ /**
+ * Collection to store aggregation of collGl2UsersRelatedByLocaleId
+ * @var array
+ */
+ protected $collGl2UsersRelatedByLocaleId;
+
+ /**
+ * Temporary storage of collGl2UsersRelatedByLocaleId to save a possible db hit in
+ * the event objects are add to the collection, but the
+ * complete collection is never requested.
+ * @return void
+ */
+ public function initGl2UsersRelatedByLocaleId()
+ {
+ if ($this->collGl2UsersRelatedByLocaleId === null) {
+ $this->collGl2UsersRelatedByLocaleId = array();
+ }
+ }
+
+ /**
+ * Method called to associate a Gl2User object to this object
+ * through the Gl2User foreign key attribute
+ *
+ * @param Gl2User $l $className
+ * @return void
+ * @throws PropelException
+ */
+ public function addGl2UserRelatedByLocaleId(Gl2User $l)
+ {
+ $this->collGl2UsersRelatedByLocaleId[] = $l;
+ $l->setGl2ListOfValuesRelatedByLocaleId($this);
+ }
+
+ /**
+ * The criteria used to select the current contents of collGl2UsersRelatedByLocaleId.
+ * @var Criteria
+ */
+ private $lastGl2UsersRelatedByLocaleIdCriteria = null;
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByLocaleId from storage.
+ * If this Gl2ListOfValues is new, it will return
+ * an empty collection or the current collection, the criteria
+ * is ignored on a new object.
+ *
+ * @param Connection $con
+ * @param Criteria $criteria
+ * @throws PropelException
+ */
+ public function getGl2UsersRelatedByLocaleId($criteria = null, $con = null)
+ {
+ // include the Peer class
+ include_once 'Geeklog-2/Gl2UserPeer.php';
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByLocaleId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByLocaleId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId() );
+
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelect($criteria, $con);
+ }
+ } else {
+ // criteria has no effect for a new object
+ if (!$this->isNew()) {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId());
+
+ if (!isset($this->lastGl2UsersRelatedByLocaleIdCriteria) || !$this->lastGl2UsersRelatedByLocaleIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelect($criteria, $con);
+ }
+ }
+ }
+ $this->lastGl2UsersRelatedByLocaleIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByLocaleId;
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByLocaleId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByLocaleIdJoinGl2ListOfValuesRelatedByCommentModeId($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByLocaleId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByLocaleId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByCommentModeId($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByLocaleIdCriteria) || !$this->lastGl2UsersRelatedByLocaleIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByCommentModeId($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByLocaleIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByLocaleId;
+ }
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByLocaleId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByLocaleIdJoinGl2ListOfValuesRelatedByCommentOrderId($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByLocaleId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByLocaleId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByCommentOrderId($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByLocaleIdCriteria) || !$this->lastGl2UsersRelatedByLocaleIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByCommentOrderId($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByLocaleIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByLocaleId;
+ }
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByLocaleId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByLocaleIdJoinGl2ListOfValuesRelatedByDateFormatId($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByLocaleId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByLocaleId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByDateFormatId($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByLocaleIdCriteria) || !$this->lastGl2UsersRelatedByLocaleIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelectJoinGl2ListOfValuesRelatedByDateFormatId($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByLocaleIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByLocaleId;
+ }
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Gl2ListOfValues is new, it will return
+ * an empty collection; or if this Gl2ListOfValues has previously
+ * been saved, it will retrieve related Gl2UsersRelatedByLocaleId from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Gl2ListOfValues.
+ */
+ public function getGl2UsersRelatedByLocaleIdJoinGl2Timezone($criteria = null, $con = null)
+ {
+ if ($criteria === null) {
+ $criteria = new Criteria();
+ }
+
+ if ($this->collGl2UsersRelatedByLocaleId === null) {
+ if ($this->isNew()) {
+ $this->collGl2UsersRelatedByLocaleId = array();
+ } else {
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId());
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelectJoinGl2Timezone($criteria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(Gl2UserPeer::LOCALE_ID, $this->getLovId());
+ if (!isset($this->lastGl2UsersRelatedByLocaleIdCriteria) || !$this->lastGl2UsersRelatedByLocaleIdCriteria->equals($criteria)) {
+ $this->collGl2UsersRelatedByLocaleId = Gl2UserPeer::doSelectJoinGl2Timezone($criteria, $con);
+ }
+ }
+ $this->lastGl2UsersRelatedByLocaleIdCriteria = $criteria;
+
+ return $this->collGl2UsersRelatedByLocaleId;
+ }
+
+ /**
* Collection to store aggregation of collGl2UserBlocks
* @var array
***************
*** 2048,2051 ****
--- 2544,2552 ----
}
}
+ if ($this->collGl2UsersRelatedByLocaleId !== null) {
+ for ($i=0,$size=count($this->collGl2UsersRelatedByLocaleId); $i < $size; $i++) {
+ $this->collGl2UsersRelatedByLocaleId[$i]->save($con);
+ }
+ }
if ($this->collGl2UserBlocks !== null) {
for ($i=0,$size=count($this->collGl2UserBlocks); $i < $size; $i++) {
***************
*** 2154,2157 ****
--- 2655,2665 ----
}
}
+ if ($this->collGl2UsersRelatedByLocaleId !== null) {
+ for ($i=0,$size=count($this->collGl2UsersRelatedByLocaleId); $i < $size; $i++) {
+ if (($retval = $this->collGl2UsersRelatedByLocaleId[$i]->validate()) !== true) {
+ $failureMap = array_merge($failureMap, $retval);
+ }
+ }
+ }
if ($this->collGl2UserBlocks !== null) {
for ($i=0,$size=count($this->collGl2UserBlocks); $i < $size; $i++) {
***************
*** 2253,2256 ****
--- 2761,2768 ----
}
+ foreach($this->getGl2UsersRelatedByLocaleId() as $relObj) {
+ $copyObj->addGl2UserRelatedByLocaleId($relObj->copy());
+ }
+
foreach($this->getGl2UserBlocks() as $relObj) {
$copyObj->addGl2UserBlock($relObj->copy());
Index: BaseGl2Action.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2Action.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2Action.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2Action.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 20,24 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 20,24 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2ItemCategory.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2ItemCategory.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2ItemCategory.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2ItemCategory.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 24,28 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 24,28 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2ActionPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2ActionPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2ActionPeer.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2ActionPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 15,19 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 15,19 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2GroupPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2GroupPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2GroupPeer.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2GroupPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 12,16 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 12,16 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2PrivilegePeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2PrivilegePeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2PrivilegePeer.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2PrivilegePeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 12,16 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 12,16 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2BlockPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2BlockPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2BlockPeer.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2BlockPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 21,25 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 21,25 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2UserBlock.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2UserBlock.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2UserBlock.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2UserBlock.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 28,32 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 28,32 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2UserPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2UserPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2UserPeer.php 17 Dec 2004 23:35:48 -0000 1.1.1.1
--- BaseGl2UserPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 14,17 ****
--- 14,23 ----
include_once 'Geeklog-2/Gl2ListOfValues.php';
include_once 'Geeklog-2/Gl2ListOfValuesPeer.php';
+
+ include_once 'Geeklog-2/Gl2Timezone.php';
+ include_once 'Geeklog-2/Gl2TimezonePeer.php';
+
+ include_once 'Geeklog-2/Gl2ListOfValues.php';
+ include_once 'Geeklog-2/Gl2ListOfValuesPeer.php';
/**
***************
*** 21,25 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 27,31 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
***************
*** 41,44 ****
--- 47,53 ----
const REGISTRATION_DATE = "gl2_user.REGISTRATION_DATE";
+ /** the column name for the THEME field */
+ const THEME = "gl2_user.THEME";
+
/** the column name for the PROFILE_VIEWS field */
const PROFILE_VIEWS = "gl2_user.PROFILE_VIEWS";
***************
*** 47,52 ****
const ITEMS_PER_PAGE = "gl2_user.ITEMS_PER_PAGE";
! /** the column name for the LANGUAGE_ID field */
! const LANGUAGE_ID = "gl2_user.LANGUAGE_ID";
/** the column name for the USER_NAME field */
--- 56,64 ----
const ITEMS_PER_PAGE = "gl2_user.ITEMS_PER_PAGE";
! /** the column name for the LOCALE_ID field */
! const LOCALE_ID = "gl2_user.LOCALE_ID";
!
! /** the column name for the TIMEZONE_ID field */
! const TIMEZONE_ID = "gl2_user.TIMEZONE_ID";
/** the column name for the USER_NAME field */
***************
*** 101,105 ****
/** number of columns for this peer */
! public static $numColumns = 21;
/** A class that can be returned by this peer. */
--- 113,117 ----
/** number of columns for this peer */
! public static $numColumns = 23;
/** A class that can be returned by this peer. */
***************
*** 174,180 ****
$criteria->addSelectColumn(self::USER_ID);
$criteria->addSelectColumn(self::REGISTRATION_DATE);
$criteria->addSelectColumn(self::PROFILE_VIEWS);
$criteria->addSelectColumn(self::ITEMS_PER_PAGE);
! $criteria->addSelectColumn(self::LANGUAGE_ID);
$criteria->addSelectColumn(self::USER_NAME);
$criteria->addSelectColumn(self::PASSWORD);
--- 186,194 ----
$criteria->addSelectColumn(self::USER_ID);
$criteria->addSelectColumn(self::REGISTRATION_DATE);
+ $criteria->addSelectColumn(self::THEME);
$criteria->addSelectColumn(self::PROFILE_VIEWS);
$criteria->addSelectColumn(self::ITEMS_PER_PAGE);
! $criteria->addSelectColumn(self::LOCALE_ID);
! $criteria->addSelectColumn(self::TIMEZONE_ID);
$criteria->addSelectColumn(self::USER_NAME);
$criteria->addSelectColumn(self::PASSWORD);
***************
*** 697,700 ****
--- 711,820 ----
return $results;
}
+ /**
+ * Selects a collection of Gl2User objects pre-filled with their
+ * Gl2Timezone objects.
+ *
+ * @return array Array of Gl2User objects.
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function doSelectJoinGl2Timezone(Criteria $c, $con = null)
+ {
+
+ // Set the correct dbName if it has not been overridden
+ if ($c->getDbName() == Propel::getDefaultDB()) {
+ $c->setDbName(self::DATABASE_NAME);
+ }
+
+ Gl2UserPeer::addSelectColumns($c);
+ $startcol = self::$numColumns + 1;
+ Gl2TimezonePeer::addSelectColumns($c);
+
+ $c->addJoin(Gl2UserPeer::TIMEZONE_ID, Gl2TimezonePeer::TIMEZONE_ID);
+
+ $rs = BasePeer::doSelect($c, $con);
+ $results = array();
+
+ while($rs->next()) {
+ $omClass = Gl2UserPeer::getOMClass();
+ $cls = Propel::import($omClass);
+ $obj1 = new $cls();
+ $obj1->hydrate($rs);
+
+ $omClass = Gl2TimezonePeer::getOMClass();
+ $cls = Propel::import($omClass);
+ $obj2 = new $cls();
+ $obj2->hydrate($rs, $startcol);
+
+ $newObject = true;
+ foreach($results as $temp_obj1) {
+ $temp_obj2 = $temp_obj1->getGl2Timezone();
+ if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) {
+ $newObject = false;
+ $temp_obj2->addGl2User($obj1);
+ break;
+ }
+ }
+ if ($newObject) {
+ $obj2->initGl2Users();
+ $obj2->addGl2User($obj1);
+ }
+ $results[] = $obj1;
+ }
+ return $results;
+ }
+ /**
+ * Selects a collection of Gl2User objects pre-filled with their
+ * Gl2ListOfValues objects.
+ *
+ * @return array Array of Gl2User objects.
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function doSelectJoinGl2ListOfValuesRelatedByLocaleId(Criteria $c, $con = null)
+ {
+
+ // Set the correct dbName if it has not been overridden
+ if ($c->getDbName() == Propel::getDefaultDB()) {
+ $c->setDbName(self::DATABASE_NAME);
+ }
+
+ Gl2UserPeer::addSelectColumns($c);
+ $startcol = self::$numColumns + 1;
+ Gl2ListOfValuesPeer::addSelectColumns($c);
+
+ $c->addJoin(Gl2UserPeer::LOCALE_ID, Gl2ListOfValuesPeer::LOV_ID);
+
+ $rs = BasePeer::doSelect($c, $con);
+ $results = array();
+
+ while($rs->next()) {
+ $omClass = Gl2UserPeer::getOMClass();
+ $cls = Propel::import($omClass);
+ $obj1 = new $cls();
+ $obj1->hydrate($rs);
+
+ $omClass = Gl2ListOfValuesPeer::getOMClass();
+ $cls = Propel::import($omClass);
+ $obj2 = new $cls();
+ $obj2->hydrate($rs, $startcol);
+
+ $newObject = true;
+ foreach($results as $temp_obj1) {
+ $temp_obj2 = $temp_obj1->getGl2ListOfValuesRelatedByLocaleId();
+ if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) {
+ $newObject = false;
+ $temp_obj2->addGl2UserRelatedByLocaleId($obj1);
+ break;
+ }
+ }
+ if ($newObject) {
+ $obj2->initGl2UsersRelatedByLocaleId();
+ $obj2->addGl2UserRelatedByLocaleId($obj1);
+ }
+ $results[] = $obj1;
+ }
+ return $results;
+ }
/**
***************
*** 717,721 ****
Gl2UserPeer::addSelectColumns($c);
$startcol2 = self::$numColumns + 1;
!
$rs = BasePeer::doSelect($c, $con);
--- 837,843 ----
Gl2UserPeer::addSelectColumns($c);
$startcol2 = self::$numColumns + 1;
! Gl2TimezonePeer::addSelectColumns($c);
! $startcol3 = $startcol2 + Gl2TimezonePeer::numColumns;
!
$rs = BasePeer::doSelect($c, $con);
***************
*** 738,745 ****
for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
$temp_obj1 = $results[$j];
! $temp_obj2 = $temp_obj1->getGl2ListOfValuesRelatedByDateFormatId();
if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) {
$newObject = false;
! $temp_obj2->addGl2UserRelatedByDateFormatId($obj1);
break;
}
--- 860,867 ----
for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
$temp_obj1 = $results[$j];
! $temp_obj2 = $temp_obj1->getGl2ListOfValuesRelatedByLocaleId();
if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) {
$newObject = false;
! $temp_obj2->addGl2UserRelatedByLocaleId($obj1);
break;
}
***************
*** 747,752 ****
if ($newObject) {
! $obj2->initGl2UsersRelatedByDateFormatId();
! $obj2->addGl2UserRelatedByDateFormatId($obj1);
}
$omClass = Gl2ListOfValuesPeer::getOMClass();
--- 869,874 ----
if ($newObject) {
! $obj2->initGl2UsersRelatedByLocaleId();
! $obj2->addGl2UserRelatedByLocaleId($obj1);
}
$omClass = Gl2ListOfValuesPeer::getOMClass();
***************
*** 759,766 ****
for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
$temp_obj1 = $results[$j];
! $temp_obj3 = $temp_obj1->getGl2ListOfValuesRelatedByDateFormatId();
if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) {
$newObject = false;
! $temp_obj3->addGl2UserRelatedByDateFormatId($obj1);
break;
}
--- 881,888 ----
for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
$temp_obj1 = $results[$j];
! $temp_obj3 = $temp_obj1->getGl2ListOfValuesRelatedByLocaleId();
if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) {
$newObject = false;
! $temp_obj3->addGl2UserRelatedByLocaleId($obj1);
break;
}
***************
*** 768,773 ****
if ($newObject) {
! $obj3->initGl2UsersRelatedByDateFormatId();
! $obj3->addGl2UserRelatedByDateFormatId($obj1);
}
$omClass = Gl2ListOfValuesPeer::getOMClass();
--- 890,895 ----
if ($newObject) {
! $obj3->initGl2UsersRelatedByLocaleId();
! $obj3->addGl2UserRelatedByLocaleId($obj1);
}
$omClass = Gl2ListOfValuesPeer::getOMClass();
***************
*** 780,787 ****
for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
$temp_obj1 = $results[$j];
! $temp_obj4 = $temp_obj1->getGl2ListOfValuesRelatedByDateFormatId();
if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) {
$newObject = false;
! $temp_obj4->addGl2UserRelatedByDateFormatId($obj1);
break;
}
--- 902,909 ----
for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
$temp_obj1 = $results[$j];
! $temp_obj4 = $temp_obj1->getGl2ListOfValuesRelatedByLocaleId();
if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) {
$newObject = false;
! $temp_obj4->addGl2UserRelatedByLocaleId($obj1);
break;
}
***************
*** 789,794 ****
if ($newObject) {
! $obj4->initGl2UsersRelatedByDateFormatId();
! $obj4->addGl2UserRelatedByDateFormatId($obj1);
}
$results[] = $obj1;
--- 911,958 ----
if ($newObject) {
! $obj4->initGl2UsersRelatedByLocaleId();
! $obj4->addGl2UserRelatedByLocaleId($obj1);
! }
! $omClass = Gl2TimezonePeer::getOMClass();
!
! $cls = Propel::import($omClass);
! $obj5 = new $cls();
! $obj5->hydrate($rs, $startcol5);
!
! $newObject = true;
! for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
! $temp_obj1 = $results[$j];
! $temp_obj5 = $temp_obj1->getGl2Timezone();
! if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) {
! $newObject = false;
! $temp_obj5->addGl2User($obj1);
! break;
! }
! }
!
! if ($newObject) {
! $obj5->initGl2Users();
! $obj5->addGl2User($obj1);
! }
! $omClass = Gl2ListOfValuesPeer::getOMClass();
!
! $cls = Propel::import($omClass);
! $obj6 = new $cls();
! $obj6->hydrate($rs, $startcol6);
!
! $newObject = true;
! for ($j=0, $resCount=count($results); $j < $resCount; $j++) {
! $temp_obj1 = $results[$j];
! $temp_obj6 = $temp_obj1->getGl2ListOfValuesRelatedBy();
! if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) {
! $newObject = false;
! $temp_obj6->addGl2UserRelatedBy($obj1);
! break;
! }
! }
!
! if ($newObject) {
! $obj6->initGl2UsersRelatedBy();
! $obj6->addGl2UserRelatedBy($obj1);
}
$results[] = $obj1;
Index: BaseGl2Actionlistener.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2Actionlistener.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2Actionlistener.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2Actionlistener.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 24,28 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 24,28 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
Index: BaseGl2PluginPeer.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2PluginPeer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2PluginPeer.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2PluginPeer.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 12,16 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* @package Geeklog-2
--- 12,16 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* @package Geeklog-2
Index: BaseGl2Privilege.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/om/BaseGl2Privilege.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseGl2Privilege.php 17 Dec 2004 23:35:47 -0000 1.1.1.1
--- BaseGl2Privilege.php 18 Dec 2004 07:09:52 -0000 1.2
***************
*** 16,20 ****
* This class was autogenerated by Propel on:
*
! * [Fri Dec 17 15:40:41 2004]
*
* You should not use this class directly. It should not even be
--- 16,20 ----
* This class was autogenerated by Propel on:
*
! * [Sat Dec 18 00:51:39 2004]
*
* You should not use this class directly. It should not even be
- Previous message (by thread): [geeklog-cvs] Geeklog-2/system/Propel/Geeklog-2/map Gl2ActionMapBuilder.php,1.1.1.1,1.2 Gl2ActionlistenerMapBuilder.php,1.1.1.1,1.2 Gl2BlockMapBuilder.php,1.1.1.1,1.2 Gl2CategoryMapBuilder.php,1.1.1.1,1.2 Gl2CommentMapBuilder.php,1.1.1.1,1.2 Gl2GroupAssignmentMapBuilder.php,1.1.1.1,1.2 Gl2GroupMapBuilder.php,1.1.1.1,1.2 Gl2ItemAclMapBuilder.php,1.1.1.1,1.2 Gl2ItemCategoryMapBuilder.php,1.1.1.1,1.2 Gl2ItemMapBuilder.php,1.1.1.1,1.2 Gl2ListOfValuesMapBuilder.php,1.1.1.1,1.2 Gl2PluginMapBuilder.php,1.1.1.1,1.2 Gl2PrivilegeAccessMapBuilder.php,1.1.1.1,1.2 Gl2PrivilegeMapBuilder.php,1.1.1.1,1.2 Gl2UserBlockMapBuilder.php,1.1.1.1,1.2 Gl2UserMapBuilder.php,1.1.1.1,1.2
- Next message (by thread): [geeklog-cvs] Geeklog-2/system/Propel/classes/propel/adapter DBAdapter.php,1.1.1.1,1.2 DBMSSQL.php,1.1.1.1,1.2 DBMySQL.php,1.1.1.1,1.2 DBNone.php,1.1.1.1,1.2 DBOracle.php,1.1.1.1,1.2 DBPostgres.php,1.1.1.1,1.2 DBSQLite.php,1.1.1.1,1.2 DBSybase.php,1.1.1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list