in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Mon, Aug 11, 8:36 AM

in-portal
View Options

	Index: trunk/kernel/units/selectors/selectors_event_handler.php
	===================================================================
	--- trunk/kernel/units/selectors/selectors_event_handler.php (revision 2798)
	+++ trunk/kernel/units/selectors/selectors_event_handler.php (revision 2799)
	@@ -1,354 +1,352 @@
	<?php

	safeDefine('STYLE_BASE', 1);
	safeDefine('STYLE_BLOCK', 2);

	class SelectorsEventHandler extends InpDBEventHandler
	{

	/**
	- * Occures after an item has been cloned
	+ * Occures before an item has been cloned
	* Id of newly created item is passed as event' 'id' param
	*
	* @param kEvent $event
	*/
	- function OnAfterClone(&$event)
	+ function OnBeforeClone(&$event)
	{
	- $object =& $event->getObject( Array('skip_autoload' => true) );
	- $object->Load( $event->getEventParam('id') );
	-
	- $linked_info = $object->getLinkedInfo();
	- $selector_name = $object->GetDBField('SelectorName');
	-
	- // temp table sql
	- $sql = 'SELECT RIGHT(SelectorName, LENGTH(SelectorName) - %s) AS SelectorIndex
	- FROM %s
	- WHERE (%s = %s) AND SelectorName LIKE %s AND (%s != %s)
	- ORDER BY SelectorIndex DESC';
	- $sql = sprintf( $sql,
	- strlen($selector_name),
	- $object->TableName,
	- $linked_info['ForeignKey'],
	- $linked_info['ParentId'],
	- $this->Conn->qstr($selector_name.'%' ),
	- $object->IDField,
	- $object->GetID() );
	+ $event->Init($event->Prefix, '-item');
	+ $object =& $event->getObject();

	- $selector_index = $this->Conn->GetOne($sql);
	- if($selector_index !== false)
	- {
	- $selector_index = (int)ltrim($selector_index, '-');
	- $object->SetDBField('SelectorName', $selector_name.'-'.(++$selector_index) );
	- $object->Update();
	- }
	-
	- // live table sql if previous was in temp table
	- $live_table = $this->Application->getUnitOption($object->Prefix, 'TableName');
	- if($live_table != $object->TableName)
	- {
	+ $title_field = 'SelectorName';
	+ $new_name = $object->GetDBField($title_field);
	+ $original_checked = false;
	+ do {
	+ if ( preg_match('/(.*)-([\d]+)/', $new_name, $regs) ) {
	+ $new_name = $regs[1].'-'.($regs[2]+1);
	+ }
	+ elseif ($original_checked) {
	+ $new_name = $new_name.'-1';
	+ }

	- }
	+ // if we are cloning in temp table this will look for names in temp table,
	+ // since object' TableName contains correct TableName (for temp also!)
	+ // if we are cloning live - look in live
	+ $query = ' SELECT '.$title_field.'
	+ FROM '.$object->TableName.'
	+ WHERE '.$title_field.' = '.$this->Conn->qstr($new_name).' AND StylesheetId = '.$object->GetDBField('StylesheetId');
	+ $res = $this->Conn->GetOne($query);
	+
	+ /*// if not found in live table, check in temp table if applicable
	+ if ($res === false && $object->Special == 'temp') {
	+ $query = 'SELECT '.$name_field.' FROM '.$this->GetTempName($master['TableName']).'
	+ WHERE '.$name_field.' = '.$this->Conn->qstr($new_name);
	+ $res = $this->Conn->GetOne($query);
	+ }*/
	+
	+ $original_checked = true;
	+ } while ($res !== false);
	+ $object->SetDBField($title_field, $new_name);
	}

	/**
	* Show base styles or block styles
	*
	* @param kEvent $event
	*/
	function SetCustomQuery(&$event)
	{
	$object =& $event->getObject();
	switch ($event->Special)
	{
	case 'base':
	$object->addFilter('type_filter', '%1$s.Type = 1');
	break;

	case 'block':
	$object->addFilter('type_filter', '%1$s.Type = 2');
	break;
	}
	}

	/**
	* Enter description here...
	*
	* @param kEvent $event
	*/
	function OnBeforeItemUpdate(&$event)
	{
	$this->SerializeSelectorData($event);
	}

	/**
	* Enter description here...
	*
	* @param kEvent $event
	*/
	function OnBeforeItemCreate(&$event)
	{
	$this->SerializeSelectorData($event);
	}

	/**
	* Enter description here...
	*
	* @param kEvent $event
	*/
	function OnAfterItemUpdate(&$event)
	{
	$this->UnserializeSelectorData($event);
	}

	/**
	* Enter description here...
	*
	* @param kEvent $event
	*/
	function OnAfterItemCreate(&$event)
	{
	$this->UnserializeSelectorData($event);
	}

	/**
	* Get's special of main item for linking with subitem
	*
	* @param kEvent $event
	* @return string
	*/
	function getMainSpecial(&$event)
	{
	return '';
	}

	/**
	* Save css-style name & description before opening css editor
	*
	* @param kEvent $event
	*/
	function OnOpenStyleEditor(&$event)
	{
	$this->SaveChanges($event);
	$event->redirect = false;
	}

	/**
	* Saves Changes to Item
	*
	* @param kEvent $event
	*/
	function SaveChanges(&$event)
	{
	$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
	$object =& $event->getObject();

	$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
	if($items_info)
	{
	list($id,$field_values) = each($items_info);
	if($id == 0)
	{
	$parent_id = getArrayValue($field_values,'ParentId');
	if($parent_id) $object->Load($parent_id);

	$object->SetFieldsFromHash($field_values);
	$object->Create();
	if( $object->IsTempTable() ) $object->setTempID();
	$this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetID() );
	}
	else
	{
	$object->Load($id);
	$object->SetFieldsFromHash($field_values);
	$object->Update();
	}
	}
	}

	/**
	* Save style changes from style editor
	*
	* @param kEvent $event
	*/
	function OnSaveStyle(&$event)
	{
	$this->SaveChanges($event);

	$object =& $event->getObject();
	$this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetId() );

	$return_tpl = $object->GetDBField('Type') == 1 ? 'base_style_edit' : 'block_style_edit';

	$this->finalizePopup($event, 'selectors.base','stylesheets/'.$return_tpl);
	}

	/**
	* Extract styles
	*
	* @param kEvent $event
	*/
	function OnAfterItemLoad(&$event)
	{
	$object =& $event->getObject();
	$selector_data = $object->GetDBField('SelectorData');
	if($selector_data)
	{
	$selector_data = unserialize($selector_data);
	$object->SetDBField('SelectorData', $selector_data);
	}
	else
	{
	$selector_data = Array();
	}
	$this->AddParentProperties($event, $selector_data);
	}

	/**
	* Serialize item before saving to db
	*
	* @param kEvent $event
	*/
	function SerializeSelectorData(&$event)
	{
	$object =& $event->getObject();
	$selector_data = $object->GetDBField('SelectorData');
	if(!$selector_data) $selector_data = Array();

	$selector_data = $this->RemoveParentProperties($event, $selector_data);

	if( !IsSerialized($selector_data) ) $selector_data = serialize($selector_data);

	$object->SetDBField('SelectorData', $selector_data);
	}

	/**
	* Unserialize data back when update was made
	*
	* @param kEvent $event
	*/
	function UnserializeSelectorData(&$event)
	{
	$object =& $event->getObject();
	$selector_data = $object->GetDBField('SelectorData');
	if(!$selector_data) $selector_data = Array();
	if( IsSerialized($selector_data) ) $selector_data = unserialize($selector_data);

	$selector_data = $this->AddParentProperties($event, $selector_data);

	$object->SetDBField('SelectorData', $selector_data);
	}

	/**
	* Populate options based on temporary table :)
	*
	* @param kEvent $event
	*/
	function OnPrepareBaseStyles(&$event)
	{
	$object =& $event->getObject();

	$parent_info = $object->getLinkedInfo();
	$title_field = $this->Application->getUnitOption($event->Prefix,'TitleField');
	$sql = 'SELECT '.$title_field.', '.$object->IDField.' FROM '.$object->TableName.' WHERE Type = 1 AND StylesheetId = '.$parent_info['ParentId'].' ORDER BY '.$title_field;
	$object->Fields['ParentId']['options'] = array_merge_recursive2($object->Fields['ParentId']['options'],
	$this->Conn->GetCol($sql,$object->IDField) );
	}

	/**
	* Remove properties of parent style that match by value from style
	*
	* @param kEvent $event
	*/
	function RemoveParentProperties(&$event, $selector_data)
	{
	$object =& $event->getObject();
	$parent_id = $object->GetDBField('ParentId');
	if($parent_id)
	{
	$sql = 'SELECT SelectorData FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$parent_id;
	$base_selector_data = $this->Conn->GetOne($sql);

	if( IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data);

	foreach($selector_data as $prop_name => $prop_value)
	{
	if( !$prop_value \|\| getArrayValue($base_selector_data,$prop_name) == $prop_value )
	{
	unset($selector_data[$prop_name]);
	}
	}
	$object->SetDBField('SelectorData', $selector_data);
	return $selector_data;
	}
	else
	{
	foreach($selector_data as $prop_name => $prop_value)
	{
	if(!$prop_value) unset($selector_data[$prop_name]);
	}
	$object->SetDBField('SelectorData', $selector_data);
	return $selector_data;
	}
	}

	/**
	* Add back properties from parent style, that match this style property values
	*
	* @param kEvent $event
	*/
	function AddParentProperties(&$event, $selector_data)
	{
	$object =& $event->getObject();
	$parent_id = $object->GetDBField('ParentId');
	if($parent_id)
	{
	$sql = 'SELECT SelectorData FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$parent_id;
	$base_selector_data = $this->Conn->GetOne($sql);

	if( IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data);

	$selector_data = array_merge_recursive2($base_selector_data,$selector_data);

	$object->SetDBField('SelectorData', $selector_data);
	return $selector_data;
	}
	return $selector_data;
	}

	/**
	* Reset Style definition to base style -> no customizations
	*
	* @param kEvent $event
	*/
	function OnResetToBase(&$event)
	{
	$object =& $event->getObject();
	$object->SetFieldsFromHash( $this->getSubmittedFields($event) );
	$object->ResetStyle();

	$event->redirect_params['pass'] = 'all,'.$event->getPrefixSpecial();
	}

	/**
	* Resets selected styles properties to values of their base classes
	*
	* @param kEvent $event
	*/
	function OnMassResetToBase(&$event)
	{
	$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
	$object =& $event->getObject();

	$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
	if($items_info)
	{
	foreach($items_info as $id => $field_values)
	{
	$object->Load($id);
	$object->ResetStyle();
	}
	}
	}
	}

	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/units/selectors/selectors_event_handler.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.5
	\ No newline at end of property
	+1.6
	\ No newline at end of property
	Index: trunk/kernel/units/selectors/selectors_config.php
	===================================================================
	--- trunk/kernel/units/selectors/selectors_config.php (revision 2798)
	+++ trunk/kernel/units/selectors/selectors_config.php (revision 2799)
	@@ -1,134 +1,134 @@
	<?php

	$config = Array(
	'Prefix' => 'selectors',
	'ItemClass' => Array('class'=>'SelectorsItem','file'=>'selectors_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'SelectorsEventHandler','file'=>'selectors_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'SelectorsTagProcessor','file'=>'selectors_tag_processor.php','build_event'=>'OnBuild'),
	'AutoLoad' => true,

	'Clones' => Array(
	'selectorsbase' => Array(
	'Hooks' => Array(),
	'Constrain' => 'Type = 1',
	'SubItems' => Array('selectorsblock'),
	),

	'selectorsblock' => Array(
	'Hooks' => Array(),
	'Constrain' => 'Type = 2',
	'ForeignKey' => Array('css' => 'StylesheetId', 'selectorsbase' => 'ParentId'),
	'ParentTableKey' => Array('css' => 'StylesheetId', 'selectorsbase' => 'SelectorId'),
	'ParentPrefix' => 'selectorsbase',
	),
	),

	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'selectors',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnItemBuild'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnPrepareBaseStyles',
	),

	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'selectors',
	'HookToSpecial' => 'block',
	'HookToEvent' => Array('OnListBuild'),
	'DoPrefix' => '',
	'DoSpecial' => 'block',
	'DoEvent' => 'OnPrepareBaseStyles',
	),
	),

	'MyHooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => Array('Prefix1.*', 'Prefix2.Special1'),
	'HookToEvents' => Array('OnBeforeItemUpdate', 'OnBeforeItemCreate'),
	'DoPrefix' => Array('Prefix1.*', 'Prefix2.Special1'),
	'DoEvent' => 'OnMyEvent',
	),
	),

	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	),
	'IDField' => 'SelectorId',

	'TitleField' => 'Name',

	'TableName' => TABLE_PREFIX.'StylesheetSelectors',

	'ForeignKey' => 'StylesheetId',
	'ParentTableKey' => 'StylesheetId',
	'ParentPrefix' => 'css',
	'AutoDelete' => true,
	'AutoClone' => true,

	'ListSQLs' => Array( ''=>' SELECT %1$s.*
	FROM %s',
	), // key - special, value - list select sql
	'ItemSQLs' => Array( ''=>'SELECT * FROM %s',
	),
	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('Name' => 'asc'),
	)
	),
	'Fields' => Array(
	'SelectorId' => Array(),
	- 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'not_null' => '1','default' => '0'),
	+ 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => '1','default' => '0'),
	'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	- 'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'not_null' => '1','default' => '','required'=>1),
	+ 'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'current_table_only' => 1, 'not_null' => '1','default' => '','required'=>1),
	'SelectorData' => Array('not_null' => '1','default' => ''),
	'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'),
	'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
	'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0=>''), 'not_null' => '1','default' => '0'),
	),

	'VirtualFields' => Array(
	'FontStyle' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','normal'=>'normal','italic'=>'italic','oblique'=>'oblique'), 'default'=>'' ),
	'FontWeight' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','100'=>'100','200'=>'200','300'=>'300','normal'=>'normal','500'=>'500','600'=>'600','bold'=>'bold','800'=>'800','900'=>'900','lighter'=>'lighter','bolder'=>'bolder') ),
	'StyleCursor' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','default'=>'default','auto'=>'auto','n-resize'=>'n-resize','ne-resize'=>'ne-resize','e-resize'=>'e-resize','se-resize'=>'se-resize','s-resize'=>'s-resize','sw-resize'=>'sw-resize','w-resize'=>'w-resize','nw-resize'=>'nw-resize','crosshair'=>'crosshair','pointer'=>'pointer','move'=>'move','text'=>'text','wait'=>'wait','help'=>'help','hand'=>'hand','all-scroll'=>'all-scroll','col-resize'=>'col-resize','row-resize'=>'row-resize','no-drop'=>'no-drop','not-allowed'=>'not-allowed','progress'=>'progress','vertical-text'=>'vertical-text','alias'=>'alias','cell'=>'cell','copy'=>'copy','count-down'=>'count-down','count-up'=>'count-up','count-up-down'=>'count-up-down','grab'=>'grab','grabbing'=>'grabbing','spinning'=>'spinning') ),
	'StyleDisplay' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','none'=>'none','inline'=>'inline','block'=>'block','inline-block'=>'inline-block','list-item'=>'list-item','marker'=>'marker','compact'=>'compact','run-in'=>'run-in','table-header-group'=>'table-header-group','table-footer-group'=>'table-footer-group','table'=>'table','inline-table'=>'inline-table','table-caption'=>'table-caption','table-row'=>'table-row','table-row-group'=>'table-row-group','table-column'=>'table-column','table-column-group'=>'table-column-group') ),
	'TextAlign' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','left'=>'left','right'=>'right','center'=>'center','justify'=>'justify') ),
	'TextDecoration' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','none'=>'none','underline'=>'underline','overline'=>'overline','line-through'=>'line-through','blink'=>'blink') ),
	'StyleVisibility' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','visible'=>'visible','hidden'=>'hidden','collapse'=>'collapse') ),
	'StylePosition' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','static'=>'static','relative'=>'relative','absolute'=>'absolute','fixed'=>'fixed') ),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_selector.gif'),
	'Fields' => Array(
	'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td'),
	'SelectorName' => Array( 'title'=>'la_col_SelectorName'),
	'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td' ),
	),
	),

	'BlockStyles' => Array(
	'Icons' => Array('default'=>'icon16_selector.gif'),
	'Fields' => Array(
	'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td'),
	'SelectorName' => Array( 'title'=>'la_col_SelectorName'),
	'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td' ),
	'ParentId' => Array('title'=>'la_col_Basedon'),
	),
	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/units/selectors/selectors_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.5
	\ No newline at end of property
	+1.6
	\ No newline at end of property
	Index: trunk/core/kernel/utility/temp_handler.php
	===================================================================
	--- trunk/core/kernel/utility/temp_handler.php (revision 2798)
	+++ trunk/core/kernel/utility/temp_handler.php (revision 2799)
	@@ -1,598 +1,599 @@
	<?php

	class kTempTablesHandler extends kBase {
	var $Tables = Array();

	/**
	* Master table name for temp handler
	*
	* @var string
	* @access private
	*/
	var $MasterTable = '';

	/**
	* IDs from master table
	*
	* @var Array
	* @access private
	*/
	var $MasterIDs = Array();

	var $AlreadyProcessed = Array();

	var $DroppedTables = Array();

	var $FinalRefs = Array();

	var $CopiedTables = Array();

	/**
	* Description
	*
	* @var kDBConnection
	* @access public
	*/
	var $Conn;

	function kTempTablesHandler()
	{
	parent::kBase();
	$this->Conn =& $this->Application->GetADODBConnection();
	}

	function SetTables($tables)
	{
	// set tablename as key for tables array
	$ret = Array();
	$this->Tables = $tables;
	$this->MasterTable = $tables['TableName'];
	}

	/**
	* Get temp table name
	*
	* @param string $table
	* @return string
	*/
	function GetTempName($table)
	{
	// function is sometimes called as static, so we CAN'T use $this->GetTempTablePrefix() here
	return TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_edit_'.$table;
	}

	function GetTempTablePrefix()
	{
	return TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_edit_';
	}

	/**
	* Return live table name based on temp table name
	*
	* @param string $temp_table
	* @return string
	*/
	function GetLiveName($temp_table)
	{
	if( preg_match('/'.TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_edit_(.*)/',$temp_table,$rets) )
	{
	return $rets[1];
	}
	else
	{
	return $temp_table;
	}
	}

	function IsTempTable($table)
	{
	return strpos($table, TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_edit_') !== false;
	}

	/**
	* Return temporary table name for master table
	*
	* @return string
	* @access public
	*/
	function GetMasterTempName()
	{
	return $this->GetTempName($this->MasterTable);
	}

	function CreateTempTable($table)
	{
	$query = sprintf("CREATE TABLE %s SELECT * FROM %s WHERE 0",
	$this->GetTempName($table),
	$table);

	$this->Conn->Query($query);
	}

	function BuildTables($prefix, $ids)
	{
	$this->TableIdCounter = 0;
	$tables = Array(
	'TableName' => $this->Application->getUnitOption($prefix,'TableName'),
	'IdField' => $this->Application->getUnitOption($prefix,'IDField'),
	'IDs' => $ids,
	'Prefix' => $prefix,
	'TableId' => $this->TableIdCounter++,
	);

	$SubItems = $this->Application->getUnitOption($prefix,'SubItems');
	if (is_array($SubItems)) {
	foreach ($SubItems as $prefix) {
	$this->AddTables($prefix, $tables);
	}
	}
	$this->SetTables($tables);
	}

	function AddTables($prefix, &$tables)
	{
	$tmp = Array(
	'TableName' => $this->Application->getUnitOption($prefix,'TableName'),
	'IdField' => $this->Application->getUnitOption($prefix,'IDField'),
	'ForeignKey' => $this->Application->getUnitOption($prefix,'ForeignKey'),
	+ 'ParentPrefix' => $this->Application->getUnitOption($prefix, 'ParentPrefix'),
	'ParentTableKey' => $this->Application->getUnitOption($prefix,'ParentTableKey'),
	'Prefix' => $prefix,
	'AutoClone' => $this->Application->getUnitOption($prefix,'AutoClone'),
	'AutoDelete' => $this->Application->getUnitOption($prefix,'AutoDelete'),
	'TableId' => $this->TableIdCounter++,
	);
	$this->FinalRefs[$tmp['TableName']] = $tmp['TableId'];

	$constrain = $this->Application->getUnitOption($prefix,'Constrain');
	if ($constrain) $tmp['Constrain'] = $constrain;

	$SubItems = $this->Application->getUnitOption($prefix,'SubItems');
	$same_sub_counter = 1;
	if( is_array($SubItems) )
	{
	foreach($SubItems as $prefix)
	{
	$this->AddTables($prefix, $tmp);
	}
	}

	if ( !is_array(getArrayValue($tables, 'SubTables')) ) {
	$tables['SubTables'] = array();
	}

	$tables['SubTables'][] = $tmp;
	}

	- function CloneItems($prefix, $special, $ids, $master=null, $foreign_key=null, $parent_prefix=null)
	+ function CloneItems($prefix, $special, $ids, $master=null, $foreign_key=null)
	{
	if (!isset($master)) $master = $this->Tables;
	if( strpos($prefix,'.') !== false ) list($prefix,$special) = explode('.', $prefix, 2);

	$prefix_special = rtrim($prefix.'.'.$special, '.');

	//recalling by different name, because we may get kDBList, if we recall just by prefix
	$recall_prefix = $prefix_special.($special ? '' : '.').'-item';
	$this->Application->setUnitOption($prefix, 'AutoLoad', false);

	$object =& $this->Application->recallObject($recall_prefix, $prefix);

	foreach ($ids as $id)
	{
	$mode = 'create';
	if ( $cloned_ids = getArrayValue($this->AlreadyProcessed, $master['TableName']) ) {
	// if we have already cloned the id, replace it with cloned id and set mode to update
	// update mode is needed to update second ForeignKey for items cloned by first ForeignKey
	if ( getArrayValue($cloned_ids, $id) ) {
	$id = $cloned_ids[$id];
	$mode = 'update';
	}
	}

	$object->Load($id);
	$original_values = $object->FieldValues;

	$object->NameCopy($master, $foreign_key);

	if (isset($foreign_key)) {
	- $master_foreign_key_field = is_array($master['ForeignKey']) ? $master['ForeignKey'][$parent_prefix] : $master['ForeignKey'];
	+ $master_foreign_key_field = is_array($master['ForeignKey']) ? $master['ForeignKey'][ $master['ParentPrefix'] ] : $master['ForeignKey'];
	$object->SetDBField($master_foreign_key_field, $foreign_key);
	}

	if ($mode == 'create') {
	$this->RaiseEvent('OnBeforeClone', $master['Prefix'], Array($object->GetId()) );
	}

	$res = $mode == 'update' ? $object->Update() : $object->Create();

	if( $res )
	{
	if ( $mode == 'create' && is_array( getArrayValue($master, 'ForeignKey')) ) {
	// remember original => clone mapping for dual ForeignKey updating
	$this->AlreadyProcessed[$master['TableName']][$id] = $object->GetId();
	}
	if($object->mode == 't') $object->setTempID();
	if ($mode == 'create') {
	$this->RaiseEvent('OnAfterClone', $master['Prefix'], Array($object->GetId()) );
	}

	if ( is_array(getArrayValue($master, 'SubTables')) ) {
	foreach($master['SubTables'] as $sub_table) {
	if (!getArrayValue($sub_table, 'AutoClone')) continue;
	$sub_TableName = ($object->mode == 't') ? $this->GetTempName($sub_table['TableName']) : $sub_table['TableName'];

	$foreign_key_field = is_array($sub_table['ForeignKey']) ? $sub_table['ForeignKey'][$master['Prefix']] : $sub_table['ForeignKey'];
	$parent_key_field = is_array($sub_table['ParentTableKey']) ? $sub_table['ParentTableKey'][$master['Prefix']] : $sub_table['ParentTableKey'];

	$query = 'SELECT '.$sub_table['IdField'].' FROM '.$sub_TableName.'
	WHERE '.$foreign_key_field.' = '.$original_values[$parent_key_field];

	$sub_ids = $this->Conn->GetCol($query);

	if ( is_array(getArrayValue($sub_table, 'ForeignKey')) ) {
	// $sub_ids could containt newly cloned items, we need to remove it here
	// to escape double cloning

	$cloned_ids = getArrayValue($this->AlreadyProcessed, $sub_table['TableName']);
	if ( !$cloned_ids ) $cloned_ids = Array();
	$new_ids = array_values($cloned_ids);
	$sub_ids = array_diff($sub_ids, $new_ids);
	}

	$parent_key = $object->GetDBField($parent_key_field);

	- $this->CloneItems($sub_table['Prefix'], '', $sub_ids, $sub_table, $parent_key, $master['Prefix']);
	+ $this->CloneItems($sub_table['Prefix'], '', $sub_ids, $sub_table, $parent_key);
	}
	}
	}
	}
	}

	function DeleteItems($prefix, $special, $ids, $master=null, $foreign_key=null)
	{
	if (!isset($master)) $master = $this->Tables;
	if( strpos($prefix,'.') !== false ) list($prefix,$special) = explode('.', $prefix, 2);

	$prefix_special = rtrim($prefix.'.'.$special, '.');

	//recalling by different name, because we may get kDBList, if we recall just by prefix
	$recall_prefix = $prefix_special.($special ? '' : '.').'-item';
	$this->Application->setUnitOption($prefix,'AutoLoad',false);
	$object =& $this->Application->recallObject($recall_prefix, $prefix);

	foreach ($ids as $id)
	{
	$object->Load($id);
	$original_values = $object->FieldValues;
	if( !$object->Delete($id) ) continue;

	if ( is_array(getArrayValue($master, 'SubTables')) ) {
	foreach($master['SubTables'] as $sub_table) {
	if (!getArrayValue($sub_table, 'AutoDelete')) continue;
	$sub_TableName = ($object->mode == 't') ? $this->GetTempName($sub_table['TableName']) : $sub_table['TableName'];

	$foreign_key_field = is_array($sub_table['ForeignKey']) ? $sub_table['ForeignKey'][$master['Prefix']] : $sub_table['ForeignKey'];
	$parent_key_field = is_array($sub_table['ParentTableKey']) ? $sub_table['ParentTableKey'][$master['Prefix']] : $sub_table['ParentTableKey'];

	$query = 'SELECT '.$sub_table['IdField'].' FROM '.$sub_TableName.'
	WHERE '.$foreign_key_field.' = '.$original_values[$parent_key_field];

	$sub_ids = $this->Conn->GetCol($query);

	$parent_key = $object->GetDBField($sub_table['ParentTableKey']);

	$this->DeleteItems($sub_table['Prefix'], '', $sub_ids, $sub_table, $parent_key);
	}
	}

	}
	}

	function DoCopyLiveToTemp($master, $ids, $parent_prefix=null)
	{
	// when two tables refers the same table as sub-sub-table, and ForeignKey and ParentTableKey are arrays
	// the table will be first copied by first sub-table, then dropped and copied over by last ForeignKey in the array
	// this should not do any problems :)
	if ( !preg_match("/.*\.[0-9]+/", $master['Prefix']) ) {
	if( $this->DropTempTable($master['TableName']) )
	{
	$this->CreateTempTable($master['TableName']);
	}
	}

	if (is_array($ids)) {
	$ids = join(',', $ids);
	}

	$table_sig = $master['TableName'].(isset($master['Constrain']) ? $master['Constrain'] : '');

	if ($ids != '' && !in_array($table_sig, $this->CopiedTables)) {
	if ( getArrayValue($master, 'ForeignKey') ) {
	if ( is_array($master['ForeignKey']) ) {
	$key_field = $master['ForeignKey'][$parent_prefix];
	}
	else {
	$key_field = $master['ForeignKey'];
	}
	}
	else {
	$key_field = $master['IdField'];
	}

	$query = 'INSERT INTO '.$this->GetTempName($master['TableName']).'
	SELECT * FROM '.$master['TableName'].'
	WHERE '.$key_field.' IN ('.$ids.')';
	if (isset($master['Constrain'])) $query .= ' AND '.$master['Constrain'];
	$this->Conn->Query($query);

	$this->CopiedTables[] = $table_sig;

	$query = 'SELECT '.$master['IdField'].' FROM '.$master['TableName'].'
	WHERE '.$key_field.' IN ('.$ids.')';
	if (isset($master['Constrain'])) $query .= ' AND '.$master['Constrain'];
	$this->RaiseEvent( 'OnAfterCopyToTemp', $master['Prefix'], $this->Conn->GetCol($query) );
	}

	if ( getArrayValue($master, 'SubTables') ) {
	foreach ($master['SubTables'] as $sub_table) {

	$parent_key = is_array($sub_table['ParentTableKey']) ? $sub_table['ParentTableKey'][$master['Prefix']] : $sub_table['ParentTableKey'];

	if ( $ids != '' && $parent_key != $key_field ) {
	$query = 'SELECT '.$parent_key.' FROM '.$master['TableName'].'
	WHERE '.$key_field.' IN ('.$ids.')';
	$sub_foreign_keys = join(',', $this->Conn->GetCol($query));
	}
	else {
	$sub_foreign_keys = $ids;
	}
	$this->DoCopyLiveToTemp($sub_table, $sub_foreign_keys, $master['Prefix']);
	}
	}
	}

	function GetForeignKeys($master, $sub_table, $live_id, $temp_id=null)
	{
	$mode = 1; //multi
	if (!is_array($live_id)) {
	$live_id = Array($live_id);
	$mode = 2; //single
	}
	if (isset($temp_id) && !is_array($temp_id)) $temp_id = Array($temp_id);

	if ( isset($sub_table['ParentTableKey']) ) {
	if ( is_array($sub_table['ParentTableKey']) ) {
	$parent_key_field = $sub_table['ParentTableKey'][$master['Prefix']];
	}
	else {
	$parent_key_field = $sub_table['ParentTableKey'];
	}
	}
	else {
	$parent_key_field = $master['IdField'];
	}

	if ( $cached = getArrayValue($this->FKeysCache, $master['TableName'].'.'.$parent_key_field) ) {
	if ( array_key_exists(serialize($live_id), $cached) ) {
	list($live_foreign_key, $temp_foreign_key) = $cached[serialize($live_id)];
	if ($mode == 1) {
	return $live_foreign_key;
	}
	else {
	return Array($live_foreign_key[0], $temp_foreign_key[0]);
	}
	}
	}

	if ($parent_key_field != $master['IdField']) {
	$query = 'SELECT '.$parent_key_field.' FROM '.$master['TableName'].'
	WHERE '.$master['IdField'].' IN ('.join(',', $live_id).')';
	$live_foreign_key = $this->Conn->GetCol($query);

	if (isset($temp_id)) {
	$query = 'SELECT '.$parent_key_field.' FROM '.$this->GetTempName($master['TableName']).'
	WHERE '.$master['IdField'].' IN ('.join(',', $temp_id).')';
	$temp_foreign_key = $this->Conn->GetCol($query);
	}
	else {
	$temp_foreign_key = Array();
	}
	}
	else {
	$live_foreign_key = $live_id;
	$temp_foreign_key = $temp_id;
	}

	$this->FKeysCache[$master['TableName'].'.'.$parent_key_field][serialize($live_id)] = Array($live_foreign_key, $temp_foreign_key);

	if ($mode == 1) {
	return $live_foreign_key;
	}
	else {
	return Array($live_foreign_key[0], $temp_foreign_key[0]);
	}
	}

	function DoCopyTempToOriginal($master, $parent_prefix=null)
	{
	$query = 'SELECT '.$master['IdField'].' FROM '.$this->GetTempName($master['TableName']);
	if (isset($master['Constrain'])) $query .= ' WHERE '.$master['Constrain'];
	$current_ids = $this->Conn->GetCol($query);

	if ($current_ids) {
	// delete all ids from live table - for MasterTable ONLY!
	// because items from Sub Tables get deteleted in CopySubTablesToLive !BY ForeignKey!
	if ($master['TableName'] == $this->MasterTable) {
	$this->RaiseEvent( 'OnBeforeDeleteFromLive', $master['Prefix'], $current_ids );

	$query = 'DELETE FROM '.$master['TableName'].' WHERE '.$master['IdField'].' IN ('.join(',', $current_ids).')';
	$this->Conn->Query($query);
	}

	if ( getArrayValue($master, 'SubTables') ) {
	foreach ($current_ids AS $id) {
	$this->RaiseEvent( 'OnBeforeCopyToLive', $master['Prefix'], Array($id) );

	//reset negative ids to 0, so autoincrement in live table works fine
	if ($id < 0) {
	$query = 'UPDATE '.$this->GetTempName($master['TableName']).'
	SET '.$master['IdField'].' = 0
	WHERE '.$master['IdField'].' = '.$id;
	$this->Conn->Query($query);
	$id_to_copy = 0;
	}
	else {
	$id_to_copy = $id;
	}

	//copy current id_to_copy (0 for new or real id) to live table
	$query = 'INSERT INTO '.$master['TableName'].'
	SELECT * FROM '.$this->GetTempName($master['TableName']).'
	WHERE '.$master['IdField'].' = '.$id_to_copy;
	$this->Conn->Query($query);
	$insert_id = $id_to_copy == 0 ? $this->Conn->getInsertID() : $id_to_copy;

	$this->RaiseEvent( 'OnAfterCopyToLive', $master['Prefix'], Array($insert_id) );

	$this->UpdateForeignKeys($master, $insert_id, $id);

	//delete already copied record from master temp table
	$query = 'DELETE FROM '.$this->GetTempName($master['TableName']).'
	WHERE '.$master['IdField'].' = '.$id_to_copy;
	if (isset($master['Constrain'])) $query .= ' AND '.$master['Constrain'];
	$this->Conn->Query($query);
	}
	// when all of ids in current master has been processed, copy all sub-tables data
	$this->CopySubTablesToLive($master, $current_ids);
	}
	else { //If current master doesn't have sub-tables - we could use mass operations
	// We don't need to delete items from live here, as it get deleted in the beggining of the method for MasterTable
	// or in parent table processing for sub-tables

	$this->RaiseEvent('OnBeforeCopyToLive', $master['Prefix'], $current_ids);

	// reset ALL negative IDs to 0 so it get inserted into live table with autoincrement
	$query = 'UPDATE '.$this->GetTempName($master['TableName']).'
	SET '.$master['IdField'].' = 0
	WHERE '.$master['IdField'].' < 0';
	if (isset($master['Constrain'])) $query .= ' AND '.$master['Constrain'];
	$this->Conn->Query($query);

	// copy ALL records to live table
	$query = 'INSERT INTO '.$master['TableName'].'
	SELECT * FROM '.$this->GetTempName($master['TableName']);
	if (isset($master['Constrain'])) $query .= ' WHERE '.$master['Constrain'];
	$this->Conn->Query($query);

	/*

	!!! WE NEED TO FIND A WAY TO DETERMINE IF OnAfterCopyToLive is not an empty method, and do on-by-one insert
	and pass Ids to OnAfterCopyToLive, otherwise it's not smart to do on-by-one insert for any object
	OR WE COULD FIND A WAY TO GET ALL INSERTED IDS as an array and iterate them !!!

	$this->RaiseEvent('OnAfterCopyToLive', IDS ??? );

	*/

	// no need to clear temp table - it will be dropped by next statement
	}
	}

	if ($this->FinalRefs[$master['TableName']] != $master['TableId']) return;

	/*if ( is_array(getArrayValue($master, 'ForeignKey')) ) { //if multiple ForeignKeys
	if ( $master['ForeignKey'][$parent_prefix] != end($master['ForeignKey']) ) {
	return; // Do not delete temp table if not all ForeignKeys have been processed (current is not the last)
	}
	}*/
	$this->DropTempTable($master['TableName']);
	}

	function UpdateForeignKeys($master, $live_id, $temp_id) {
	foreach ($master['SubTables'] as $sub_table) {
	list ($live_foreign_key, $temp_foreign_key) = $this->GetForeignKeys($master, $sub_table, $live_id, $temp_id);

	$foreign_key_field = is_array($sub_table['ForeignKey']) ? $sub_table['ForeignKey'][$master['Prefix']] : $sub_table['ForeignKey'];

	//Update ForeignKey in sub TEMP table
	if ($live_foreign_key != $temp_foreign_key) {
	$query = 'UPDATE '.$this->GetTempName($sub_table['TableName']).'
	SET '.$foreign_key_field.' = '.$live_foreign_key.'
	WHERE '.$foreign_key_field.' = '.$temp_foreign_key;
	if (isset($sub_table['Constrain'])) $query .= ' AND '.$sub_table['Constrain'];
	$this->Conn->Query($query);
	}
	}
	}

	function CopySubTablesToLive($master, $current_ids) {
	foreach ($master['SubTables'] as $sub_table) {

	// delete records from live table by foreign key, so that records deleted from temp table
	// get deleted from live
	if (count($current_ids) > 0) {
	$foreign_keys = $this->GetForeignKeys($master, $sub_table, $current_ids);
	$foreign_key_field = is_array($sub_table['ForeignKey']) ? $sub_table['ForeignKey'][$master['Prefix']] : $sub_table['ForeignKey'];
	if (count($foreign_keys) > 0) {
	$query = 'SELECT '.$sub_table['IdField'].' FROM '.$sub_table['TableName'].'
	WHERE '.$foreign_key_field.' IN ('.join(',', $foreign_keys).')';
	if (isset($sub_table['Constrain'])) $query .= ' AND '.$sub_table['Constrain'];

	$this->RaiseEvent( 'OnBeforeDeleteFromLive', $sub_table['Prefix'], $this->Conn->GetCol($query) );

	$query = 'DELETE FROM '.$sub_table['TableName'].'
	WHERE '.$foreign_key_field.' IN ('.join(',', $foreign_keys).')';
	if (isset($sub_table['Constrain'])) $query .= ' AND '.$sub_table['Constrain'];
	$this->Conn->Query($query);
	}
	}

	//sub_table passed here becomes master in the method, and recursively updated and copy its sub tables
	$this->DoCopyTempToOriginal($sub_table, $master['Prefix']);
	}
	}

	function RaiseEvent($name, $prefix, $ids)
	{
	if ( !is_array($ids) ) return;
	foreach ($ids as $id) {
	$event = new kEvent( Array('name'=>$name, 'prefix'=>$prefix, 'special'=>'') );
	$event->setEventParam('id', $id);
	$this->Application->HandleEvent($event);
	}
	}

	function DropTempTable($table)
	{
	if( in_array($table, $this->DroppedTables) ) return false;
	$query = sprintf("DROP TABLE IF EXISTS %s",
	$this->GetTempName($table)
	);
	array_push($this->DroppedTables, $table);
	$this->DroppedTables = array_unique($this->DroppedTables);
	$this->Conn->Query($query);
	return true;
	}

	function PrepareEdit()
	{
	$this->DoCopyLiveToTemp($this->Tables, $this->Tables['IDs']);
	}

	function SaveEdit($skip_master=0)
	{
	$this->DoCopyTempToOriginal($this->Tables);
	}

	function CancelEdit($master=null)
	{
	if (!isset($master)) $master = $this->Tables;
	$this->DropTempTable($master['TableName']);
	if ( getArrayValue($master, 'SubTables') ) {
	foreach ($master['SubTables'] as $sub_table) {
	$this->CancelEdit($sub_table);
	}
	}
	}
	}

	?>
	\ No newline at end of file

	Property changes on: trunk/core/kernel/utility/temp_handler.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.12
	\ No newline at end of property
	+1.13
	\ No newline at end of property
	Index: trunk/core/kernel/db/dbitem.php
	===================================================================
	--- trunk/core/kernel/db/dbitem.php (revision 2798)
	+++ trunk/core/kernel/db/dbitem.php (revision 2799)
	@@ -1,827 +1,833 @@
	<?php

	/**
	* DBItem
	*
	* Desciption
	* @package kernel4
	*/
	class kDBItem extends kDBBase {

	/**
	* Description
	*
	* @var array Associative array of current item' field values
	* @access public
	*/
	var $FieldValues;

	/**
	* Unformatted field values, before parse
	*
	* @var Array
	* @access private
	*/
	var $DirtyFieldValues = Array();

	var $FieldErrors;

	var $ErrorMsgs = Array();

	/**
	* If set to true, Update will skip Validation before running
	*
	* @var array Associative array of current item' field values
	* @access public
	*/
	var $IgnoreValidation = false;

	var $Loaded = false;

	/**
	* Holds item' primary key value
	*
	* @var int Value of primary key field for current item
	* @access public
	*/
	var $ID;

	function kDBItem()
	{
	parent::kDBBase();
	$this->ErrorMsgs['required'] = 'Field is required';
	$this->ErrorMsgs['unique'] = 'Field value must be unique';
	$this->ErrorMsgs['value_out_of_range'] = 'Field is out of range, possible values from %s to %s';
	$this->ErrorMsgs['length_out_of_range'] = 'Field is out of range';
	$this->ErrorMsgs['bad_type'] = 'Incorrect data format, please use %s';
	$this->ErrorMsgs['bad_date_format'] = 'Incorrect date format, please use (%s) ex. (%s)';
	}

	function SetDirtyField($field_name, $field_value)
	{
	$this->DirtyFieldValues[$field_name] = $field_value;
	}

	function GetDirtyField($field_name)
	{
	return $this->DirtyFieldValues[$field_name];
	}

	/**
	* Set's default values for all fields
	*
	* @access public
	*/
	function SetDefaultValues()
	{
	parent::SetDefaultValues();
	foreach ($this->Fields as $field => $params) {
	if ( isset($params['default']) ) {
	$this->SetDBField($field, $params['default']);
	}
	else {
	$this->SetDBField($field, NULL);
	}
	}
	}

	/**
	* Sets current item field value
	* (applies formatting)
	*
	* @access public
	* @param string $name Name of the field
	* @param mixed $value Value to set the field to
	* @return void
	*/
	function SetField($name,$value)
	{
	$options = $this->GetFieldOptions($name);
	$parsed = $value;
	if ($value == '') $parsed = NULL;
	if (isset($options['formatter'])) {
	$formatter =& $this->Application->recallObject($options['formatter']);
	// $parsed = $formatter->Parse($value, $options, $err);
	$parsed = $formatter->Parse($value, $name, $this);
	}
	$this->SetDBField($name,$parsed);
	}

	/**
	* Sets current item field value
	* (doesn't apply formatting)
	*
	* @access public
	* @param string $name Name of the field
	* @param mixed $value Value to set the field to
	* @return void
	*/
	function SetDBField($name,$value)
	{
	$this->FieldValues[$name] = $value;
	/*if (isset($this->Fields[$name]['formatter'])) {
	$formatter =& $this->Application->recallObject($this->Fields[$name]['formatter']);
	$formatter->UpdateSubFields($name, $value, $this->Fields[$name], $this);
	}*/
	}

	/**
	* Set's field error, if pseudo passed not found then create it with message text supplied.
	* Don't owerrite existing pseudo translation.
	*
	* @param string $field
	* @param string $pseudo
	* @param string $error_label
	*/
	function SetError($field, $pseudo, $error_label = '')
	{
	$error_msg = $this->Application->Phrase($error_label);
	if( !($error_msg && getArrayValue($this->ErrorMsgs,$pseudo)) )
	{
	$this->ErrorMsgs[$pseudo] = $error_msg;
	}
	$this->FieldErrors[$field]['pseudo'] = $pseudo;
	}

	/**
	* Return current item' field value by field name
	* (doesn't apply formatter)
	*
	* @access public
	* @param string $name field name to return
	* @return mixed
	*/
	function GetDBField($name)
	{
	return $this->FieldValues[$name];
	}

	function HasField($name)
	{
	return isset($this->FieldValues[$name]);
	}

	function GetFieldValues()
	{
	return $this->FieldValues;
	}

	/**
	* Sets item' fields corresponding to elements in passed $hash values.
	*
	* The function sets current item fields to values passed in $hash, by matching $hash keys with field names
	* of current item. If current item' fields are unknown {@link kDBItem::PrepareFields()} is called before acutally setting the fields
	*
	* @access public
	* @param Array $hash
	* @param Array $set_fields Optional param, field names in target object to set, other fields will be skipped
	* @return void
	*/
	function SetFieldsFromHash($hash, $set_fields=null)
	{
	// used in formatter which work with multiple fields together
	foreach($hash as $field_name => $field_value)
	{
	if( eregi("^[0-9]+$", $field_name) \|\| !array_key_exists($field_name,$this->Fields) ) continue;
	if ( is_array($set_fields) && !in_array($field_name, $set_fields) ) continue;
	$this->SetDirtyField($field_name, $field_value);
	}

	// formats all fields using associated formatters
	foreach ($hash as $field_name => $field_value)
	{
	if( eregi("^[0-9]+$", $field_name) \|\| !array_key_exists($field_name,$this->Fields) ) continue;
	if ( is_array($set_fields) && !in_array($field_name, $set_fields) ) continue;
	$this->SetField($field_name,$field_value);
	}
	}

	function SetDBFieldsFromHash($hash, $set_fields=null)
	{
	foreach ($hash as $field_name => $field_value)
	{
	if( eregi("^[0-9]+$", $field_name) \|\| !array_key_exists($field_name,$this->Fields) ) continue;
	if ( is_array($set_fields) && !in_array($field_name, $set_fields) ) continue;

	$this->SetDBField($field_name, $field_value);
	}
	}

	/**
	* Returns part of SQL WHERE clause identifing the record, ex. id = 25
	*
	* @access public
	* @param string $method Child class may want to know who called GetKeyClause, Load(), Update(), Delete() send its names as method
	* @return void
	* @see kDBItem::Load()
	* @see kDBItem::Update()
	* @see kDBItem::Delete()
	*/
	function GetKeyClause($method=null)
	{
	return '`'.$this->TableName.'`.'.$this->IDField.' = '.$this->Conn->qstr($this->ID);
	}

	/**
	* Loads item from the database by given id
	*
	* @access public
	* @param int $id Primery Key Id to load
	* @param string $id_field_name Optional parameter to load item by given Id field
	* @return bool True if item has been loaded, false otherwise
	*/
	function Load($id, $id_field_name=null)
	{
	if (is_array($id)) {
	$keys = $id;
	foreach ($keys as $field => $value) {
	$sqls[] = '`'.$this->TableName.'`.'.$field.' = '.$this->Conn->qstr($value);
	}
	$keys_sql = '('.implode(') AND (', $sqls).')';
	}

	if (isset($id_field_name)) $this->SetIDField($id_field_name);
	if (!isset($id) && !isset($keys_sql)) return false;

	if( !$this->raiseEvent('OnBeforeItemLoad',$id) ) return false;

	$this->ID = $id;

	$q = $this->GetSelectSQL().' WHERE '.(isset($keys_sql) ? $keys_sql : $this->GetKeyClause('load'));

	$field_values = $this->Conn->GetRow($q);
	if($field_values)
	{
	$this->FieldValues = array_merge_recursive2($this->FieldValues, $field_values);
	}
	else
	{
	$this->Loaded = false;
	return false;
	}

	if( isset($keys_sql) )
	{
	$this->setID( $this->FieldValues[$this->IDField] );
	}
	else
	{
	$this->setID($id);
	}

	$this->UpdateFormattersSubFields(); // used for updating separate virtual date/time fields from DB timestamp (for example)

	$this->raiseEvent('OnAfterItemLoad');
	$this->Loaded = true;
	return true;
	}

	/**
	* Builds select sql, SELECT ... FROM parts only
	*
	* @access public
	* @return string
	*/
	function GetSelectSQL()
	{
	$sql = $this->addCalculatedFields($this->SelectClause);
	return parent::GetSelectSQL($sql);
	}

	function UpdateFormattersMasterFields()
	{
	foreach ($this->Fields as $field => $options) {
	if (isset($options['formatter'])) {
	$formatter =& $this->Application->recallObject($options['formatter']);
	$formatter->UpdateMasterFields($field, $this->GetDBField($field), $options, $this);
	}
	}
	}

	function SkipField($field_name, $force_id=false)
	{
	$skip = false;
	$skip = $skip \|\| ( isset($this->VirtualFields[$field_name]) ); //skipping 'virtual' field
	$skip = $skip \|\| ( !getArrayValue($this->FieldValues, $field_name) && getArrayValue($this->Fields[$field_name], 'skip_empty') ); //skipping 'virtual' field
	// $skip = $skip \|\| ($field_name == $this->IDField && !$force_id); //skipping Primary Key

	// $table_name = preg_replace("/^(.*)\./", "$1", $field_name);
	// $skip = $skip \|\| ($table_name && ($table_name != $this->TableName)); //skipping field from other tables

	$skip = $skip \|\| ( !isset($this->Fields[$field_name]) ); //skipping field not in Fields (nor virtual, nor real)

	return $skip;
	}

	/**
	* Updates previously loaded record with current item' values
	*
	* @access public
	* @param int Primery Key Id to update
	* @return bool
	*/
	function Update($id=null, $system_update=false)
	{
	if( isset($id) ) $this->setID($id);

	if( !$this->raiseEvent('OnBeforeItemUpdate') ) return false;

	if( !isset($this->ID) ) return false;

	// Validate before updating
	if( !$this->IgnoreValidation && !$this->Validate() ) return false;
	if( !$this->raiseEvent('OnAfterItemValidate') ) return false;

	//Nothing to update
	if(!$this->FieldValues) return true;

	$sql = sprintf('UPDATE %s SET ',$this->TableName);
	foreach ($this->FieldValues as $field_name => $field_value)
	{
	if ($this->SkipField($field_name)) continue;

	$real_field_name = eregi_replace("^.*\.", '',$field_name); //removing table names from field names

	//Adding part of SET clause for current field, escaping data with ADODB' qstr
	if (is_null( $this->FieldValues[$field_name] )) {
	if (isset($this->Fields[$field_name]['not_null']) && $this->Fields[$field_name]['not_null']) {
	$sql .= '`'.$real_field_name.'` = '.$this->Conn->qstr($this->Fields[$field_name]['default']).', ';
	}
	else {
	$sql .= '`'.$real_field_name.'` = NULL, ';
	}
	}
	else {
	$sql.= sprintf('`%s`=%s, ', $real_field_name, $this->Conn->qstr($this->FieldValues[$field_name], 0));
	}
	}
	$sql = ereg_replace(", $", '', $sql); //Removing last comma and space

	$sql.= sprintf(' WHERE %s', $this->GetKeyClause('update')); //Adding WHERE clause with Primary Key

	if( $this->Conn->ChangeQuery($sql) === false ) return false;

	$affected = $this->Conn->getAffectedRows();
	if (!$system_update && $affected == 1){
	$this->setModifiedFlag();
	}

	$this->raiseEvent('OnAfterItemUpdate');
	return true;
	}

	/**
	* Validate all item fields based on
	* constraints set in each field options
	* in config
	*
	* @return bool
	* @access private
	*/
	function Validate()
	{
	$this->UpdateFormattersMasterFields(); //order is critical - should be called BEFORE checking errors
	$global_res = true;
	foreach ($this->Fields as $field => $params) {
	$res = true;
	$res = $res && $this->ValidateType($field, $params);
	$res = $res && $this->ValidateRange($field, $params);
	$res = $res && $this->ValidateUnique($field, $params);
	$res = $res && $this->ValidateRequired($field, $params);
	$res = $res && $this->CustomValidation($field, $params);

	// If Formatter has set some error messages during values parsing
	$error_field = isset($params['error_field']) ? $params['error_field'] : $field;
	if (isset($this->FieldErrors[$error_field]['pseudo']) && $this->FieldErrors[$error_field] != '') {
	$global_res = false;
	}

	$global_res = $global_res && $res;
	}

	if (!$global_res && $this->Application->isDebugMode() )
	{
	global $debugger;
	$error_msg = "Validation failed in prefix <b>".$this->Prefix."</b>, FieldErrors follow (look at items with 'pseudo' key set)<br>
	You may ignore this notice if submitted data really has a validation error ";
	trigger_error( $error_msg, E_USER_NOTICE);
	$debugger->dumpVars($this->FieldErrors);
	}

	return $global_res;
	}

	/**
	* Check field value by user-defined alghoritm
	*
	* @param string $field field name
	* @param Array $params field options from config
	* @return bool
	*/
	function CustomValidation($field, $params)
	{
	return true;
	}

	function HasErrors()
	{
	$global_res = false;
	foreach ($this->Fields as $field => $params) {
	// If Formatter has set some error messages during values parsing
	if (isset($this->FieldErrors[$field]['pseudo']) && $this->FieldErrors[$field] != '') {
	$global_res = true;
	}
	}
	return $global_res;
	}

	/**
	* Check if value in field matches field type specified in config
	*
	* @param string $field field name
	* @param Array $params field options from config
	* @return bool
	*/
	function ValidateType($field, $params)
	{
	$res = true;
	$val = $this->FieldValues[$field];
	$error_field = isset($params['error_field']) ? $params['error_field'] : $field;
	if ( $val != '' &&
	isset($params['type']) &&
	preg_match("#int\|integer\|double\|float\|real\|numeric\|string#", $params['type'])
	) {
	$res = is_numeric($val);
	if($params['type']=='string' \|\| $res)
	{
	$f = 'is_'.$params['type'];
	settype($val, $params['type']);
	$res = $f($val) && ($val==$this->FieldValues[$field]);
	}
	if (!$res)
	{
	$this->FieldErrors[$error_field]['pseudo'] = 'bad_type';
	$this->FieldErrors[$error_field]['params'] = $params['type'];
	}
	}
	return $res;
	}

	/**
	* Check if value is set for required field
	*
	* @param string $field field name
	* @param Array $params field options from config
	* @return bool
	* @access private
	*/
	function ValidateRequired($field, $params)
	{
	$res = true;
	$error_field = isset($params['error_field']) ? $params['error_field'] : $field;
	if ( getArrayValue($params,'required') )
	{
	$res = ( (string) $this->FieldValues[$field] != '');
	}
	$options = $this->GetFieldOptions($field);
	if (!$res && getArrayValue($options, 'formatter') != 'kUploadFormatter') $this->FieldErrors[$error_field]['pseudo'] = 'required';
	return $res;
	}

	/**
	* Validates that current record has unique field combination among other table records
	*
	* @param string $field field name
	* @param Array $params field options from config
	* @return bool
	* @access private
	*/
	function ValidateUnique($field, $params)
	{
	$res = true;
	$error_field = isset($params['error_field']) ? $params['error_field'] : $field;
	$unique_fields = getArrayValue($params,'unique');
	if($unique_fields !== false)
	{
	$where = Array();
	array_push($unique_fields,$field);
	foreach($unique_fields as $unique_field)
	{
	$where[] = '`'.$unique_field.'` = '.$this->Conn->qstr( $this->GetDBField($unique_field) );
	}

	$sql = 'SELECT COUNT(*) FROM %s WHERE ('.implode(') AND (',$where).') AND ('.$this->IDField.' <> '.(int)$this->ID.')';

	$res_temp = $this->Conn->GetOne( str_replace('%s', $this->TableName, $sql) );
	- $res_live = $this->Conn->GetOne( str_replace('%s', kTempTablesHandler::GetLiveName($this->TableName), $sql) );
	+
	+ $current_table_only = getArrayValue($params, 'current_table_only'); // check unique record only in current table
	+ $res_live = $current_table_only ? 0 : $this->Conn->GetOne( str_replace('%s', kTempTablesHandler::GetLiveName($this->TableName), $sql) );
	+
	$res = ($res_temp == 0) && ($res_live == 0);

	if(!$res) $this->FieldErrors[$error_field]['pseudo'] = 'unique';
	}
	return $res;
	}

	/**
	* Check if field value is in range specified in config
	*
	* @param string $field field name
	* @param Array $params field options from config
	* @return bool
	* @access private
	*/
	function ValidateRange($field, $params)
	{
	$res = true;
	$val = $this->FieldValues[$field];
	$error_field = isset($params['error_field']) ? $params['error_field'] : $field;

	if ( isset($params['type']) && preg_match("#int\|integer\|double\|float\|real#", $params['type']) && strlen($val) > 0 ) {
	if ( isset($params['max_value_inc'])) {
	$res = $res && $val <= $params['max_value_inc'];
	$max_val = $params['max_value_inc'].' (inclusive)';
	}
	if ( isset($params['min_value_inc'])) {
	$res = $res && $val >= $params['min_value_inc'];
	$min_val = $params['min_value_inc'].' (inclusive)';
	}
	if ( isset($params['max_value_exc'])) {
	$res = $res && $val < $params['max_value_exc'];
	$max_val = $params['max_value_exc'].' (exclusive)';
	}
	if ( isset($params['min_value_exc'])) {
	$res = $res && $val > $params['min_value_exc'];
	$min_val = $params['min_value_exc'].' (exclusive)';
	}
	}
	if (!$res) {
	$this->FieldErrors[$error_field]['pseudo'] = 'value_out_of_range';

	if ( !isset($min_val) ) $min_val = '-∞';
	if ( !isset($max_val) ) $max_val = '∞';

	$this->FieldErrors[$error_field]['params'] = Array( $min_val, $max_val );
	return $res;
	}
	if ( isset($params['max_len'])) {
	$res = $res && strlen($val) <= $params['max_len'];
	}
	if ( isset($params['min_len'])) {
	$res = $res && strlen($val) >= $params['min_len'];
	}
	if (!$res) {
	$this->FieldErrors[$error_field]['pseudo'] = 'length_out_of_range';
	$this->FieldErrors[$error_field]['params'] = Array( getArrayValue($params,'min_len'), getArrayValue($params,'max_len') );
	return $res;
	}
	return $res;
	}

	/**
	* Return error message for field
	*
	* @param string $field
	* @return string
	* @access public
	*/
	function GetErrorMsg($field, $force_escape = null)
	{
	if( !isset($this->FieldErrors[$field]) ) return '';

	$err = getArrayValue($this->FieldErrors[$field], 'pseudo');
	if( isset($this->Fields[$field]['error_msgs'][$err]) )
	{
	$msg = $this->Fields[$field]['error_msgs'][$err];
	$msg = $this->Application->ReplaceLanguageTags($msg, $force_escape);
	}
	else
	{
	if( !isset($this->ErrorMsgs[$err]) ) return $err;
	$msg = $this->ErrorMsgs[$err];
	}

	if ( isset($this->FieldErrors[$field]['params']) )
	{
	return vsprintf($msg, $this->FieldErrors[$field]['params']);
	}
	return $msg;
	}

	/**
	* Creates a record in the database table with current item' values
	*
	* @param mixed $force_id Set to TRUE to force creating of item's own ID or to value to force creating of passed id. Do not pass 1 for true, pass exactly TRUE!
	* @access public
	* @return bool
	*/
	function Create($force_id=false, $system_create=false)
	{
	if( !$this->raiseEvent('OnBeforeItemCreate') ) return false;

	// Validating fields before attempting to create record
	if( !$this->IgnoreValidation && !$this->Validate() ) return false;
	if( !$this->raiseEvent('OnAfterItemValidate') ) return false;

	if (is_int($force_id)) {
	$this->FieldValues[$this->IDField] = $force_id;
	}
	elseif (!$force_id \|\| !is_bool($force_id)) {
	$this->FieldValues[$this->IDField] = $this->generateID();
	}


	$fields_sql = '';
	$values_sql = '';
	foreach ($this->FieldValues as $field_name => $field_value)
	{
	if ($this->SkipField($field_name, $force_id)) continue;

	$fields_sql .= sprintf('`%s`, ',$field_name); //Adding field name to fields block of Insert statement
	//Adding field' value to Values block of Insert statement, escaping it with ADODB' qstr
	if (is_null( $this->FieldValues[$field_name] )) {
	if (isset($this->Fields[$field_name]['not_null']) && $this->Fields[$field_name]['not_null']) {
	$values_sql .= $this->Conn->qstr($this->Fields[$field_name]['default']).', ';
	}
	else {
	$values_sql .= 'NULL, ';
	}
	}
	else
	{
	$values_sql .= sprintf('%s, ',$this->Conn->qstr($this->FieldValues[$field_name], 0));
	}

	}
	//Cutting last commas and spaces
	$fields_sql = ereg_replace(", $", '', $fields_sql);
	$values_sql = ereg_replace(", $", '', $values_sql);
	$sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->TableName, $fields_sql, $values_sql); //Formatting query

	//Executing the query and checking the result
	if($this->Conn->ChangeQuery($sql) === false) return false;

	$insert_id = $this->Conn->getInsertID();
	if($insert_id == 0) $insert_id = $this->FieldValues[$this->IDField];
	$this->setID($insert_id);

	if (!$system_create){
	$this->setModifiedFlag();
	}

	$this->raiseEvent('OnAfterItemCreate');
	return true;
	}

	/**
	* Deletes the record from databse
	*
	* @access public
	* @return bool
	*/
	function Delete($id = null)
	{
	if( isset($id) ) $this->setID($id);

	if( !$this->raiseEvent('OnBeforeItemDelete') ) return false;

	$q = 'DELETE FROM '.$this->TableName.' WHERE '.$this->GetKeyClause('Delete');

	$ret = $this->Conn->ChangeQuery($q);

	$this->setModifiedFlag();

	$this->raiseEvent('OnAfterItemDelete');

	return $ret;
	}

	/**
	* Sets new name for item in case if it is beeing copied
	* in same table
	*
	* @param array $master Table data from TempHandler
	* @param int $foreign_key ForeignKey value to filter name check query by
	* @access private
	*/
	function NameCopy($master=null, $foreign_key=null)
	{
	$title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField');
	if (!$title_field \|\| isset($this->CalculatedFields[$title_field]) ) return;

	$new_name = $this->GetDBField($title_field);
	$original_checked = false;
	do {
	if ( preg_match('/Copy ([0-9]) of (.*)/', $new_name, $regs) ) {
	$new_name = 'Copy '.($regs[1]+1).' of '.$regs[2];
	}
	elseif ($original_checked) {
	$new_name = 'Copy of '.$new_name;
	}

	// if we are cloning in temp table this will look for names in temp table,
	// since object' TableName contains correct TableName (for temp also!)
	// if we are cloning live - look in live
	$query = 'SELECT '.$title_field.' FROM '.$this->TableName.'
	WHERE '.$title_field.' = '.$this->Conn->qstr($new_name);

	- if (getArrayValue($master, 'ForeignKey') && isset($foreign_key)) {
	- $query .= ' AND '.$master['ForeignKey'].' = '.$foreign_key;
	+ $foreign_key_field = getArrayValue($master, 'ForeignKey');
	+ $foreign_key_field = is_array($foreign_key_field) ? $foreign_key_field[ $master['ParentPrefix'] ] : $foreign_key_field;
	+
	+ if ($foreign_key_field && isset($foreign_key)) {
	+ $query .= ' AND '.$foreign_key_field.' = '.$foreign_key;
	}

	$res = $this->Conn->GetOne($query);

	/*// if not found in live table, check in temp table if applicable
	if ($res === false && $object->Special == 'temp') {
	$query = 'SELECT '.$name_field.' FROM '.$this->GetTempName($master['TableName']).'
	WHERE '.$name_field.' = '.$this->Conn->qstr($new_name);
	$res = $this->Conn->GetOne($query);
	}*/

	$original_checked = true;
	} while ($res !== false);
	$this->SetDBField($title_field, $new_name);
	}

	function raiseEvent($name, $id=null)
	{
	if( !isset($id) ) $id = $this->GetID();
	$event = new kEvent( Array('name'=>$name,'prefix'=>$this->Prefix,'special'=>$this->Special) );
	$event->setEventParam('id', $id);
	$this->Application->HandleEvent($event);
	return $event->status == erSUCCESS ? true : false;
	}

	/**
	* Set's new ID for item
	*
	* @param int $new_id
	* @access public
	*/
	function setID($new_id)
	{
	$this->ID=$new_id;
	$this->SetDBField($this->IDField,$new_id);
	}

	/**
	* Generate and set new temporary id
	*
	* @access private
	*/
	function setTempID()
	{
	$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$this->IDField.') FROM '.$this->TableName);
	if($new_id > 0) $new_id = 0;
	--$new_id;

	$this->Conn->Query('UPDATE '.$this->TableName.' SET `'.$this->IDField.'` = '.$new_id.' WHERE `'.$this->IDField.'` = '.$this->GetID());
	$this->SetID($new_id);
	}

	/**
	* Set's modification flag for main prefix of current prefix to true
	*
	* @access private
	* @author Alexey
	*/
	function setModifiedFlag()
	{
	$main_prefix = $this->Application->GetTopmostPrefix($this->Prefix);
	$this->Application->StoreVar($main_prefix.'_modified', '1');
	}

	/**
	* Returns ID of currently processed record
	*
	* @return int
	* @access public
	*/
	function GetID()
	{
	return $this->ID;
	}

	/**
	* Generates ID for new items before inserting into database
	*
	* @return int
	* @access private
	*/
	function generateID()
	{
	return 0;
	}

	/**
	* Returns true if item was loaded successfully by Load method
	*
	* @return bool
	*/
	function isLoaded()
	{
	return $this->Loaded;
	}
	}



	?>
	\ No newline at end of file

	Property changes on: trunk/core/kernel/db/dbitem.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.12
	\ No newline at end of property
	+1.13
	\ No newline at end of property
	Index: trunk/core/units/selectors/selectors_event_handler.php
	===================================================================
	--- trunk/core/units/selectors/selectors_event_handler.php (revision 2798)
	+++ trunk/core/units/selectors/selectors_event_handler.php (revision 2799)
	@@ -1,354 +1,352 @@
	<?php

	safeDefine('STYLE_BASE', 1);
	safeDefine('STYLE_BLOCK', 2);

	class SelectorsEventHandler extends InpDBEventHandler
	{

	/**
	- * Occures after an item has been cloned
	+ * Occures before an item has been cloned
	* Id of newly created item is passed as event' 'id' param
	*
	* @param kEvent $event
	*/
	- function OnAfterClone(&$event)
	+ function OnBeforeClone(&$event)
	{
	- $object =& $event->getObject( Array('skip_autoload' => true) );
	- $object->Load( $event->getEventParam('id') );
	-
	- $linked_info = $object->getLinkedInfo();
	- $selector_name = $object->GetDBField('SelectorName');
	-
	- // temp table sql
	- $sql = 'SELECT RIGHT(SelectorName, LENGTH(SelectorName) - %s) AS SelectorIndex
	- FROM %s
	- WHERE (%s = %s) AND SelectorName LIKE %s AND (%s != %s)
	- ORDER BY SelectorIndex DESC';
	- $sql = sprintf( $sql,
	- strlen($selector_name),
	- $object->TableName,
	- $linked_info['ForeignKey'],
	- $linked_info['ParentId'],
	- $this->Conn->qstr($selector_name.'%' ),
	- $object->IDField,
	- $object->GetID() );
	+ $event->Init($event->Prefix, '-item');
	+ $object =& $event->getObject();

	- $selector_index = $this->Conn->GetOne($sql);
	- if($selector_index !== false)
	- {
	- $selector_index = (int)ltrim($selector_index, '-');
	- $object->SetDBField('SelectorName', $selector_name.'-'.(++$selector_index) );
	- $object->Update();
	- }
	-
	- // live table sql if previous was in temp table
	- $live_table = $this->Application->getUnitOption($object->Prefix, 'TableName');
	- if($live_table != $object->TableName)
	- {
	+ $title_field = 'SelectorName';
	+ $new_name = $object->GetDBField($title_field);
	+ $original_checked = false;
	+ do {
	+ if ( preg_match('/(.*)-([\d]+)/', $new_name, $regs) ) {
	+ $new_name = $regs[1].'-'.($regs[2]+1);
	+ }
	+ elseif ($original_checked) {
	+ $new_name = $new_name.'-1';
	+ }

	- }
	+ // if we are cloning in temp table this will look for names in temp table,
	+ // since object' TableName contains correct TableName (for temp also!)
	+ // if we are cloning live - look in live
	+ $query = ' SELECT '.$title_field.'
	+ FROM '.$object->TableName.'
	+ WHERE '.$title_field.' = '.$this->Conn->qstr($new_name).' AND StylesheetId = '.$object->GetDBField('StylesheetId');
	+ $res = $this->Conn->GetOne($query);
	+
	+ /*// if not found in live table, check in temp table if applicable
	+ if ($res === false && $object->Special == 'temp') {
	+ $query = 'SELECT '.$name_field.' FROM '.$this->GetTempName($master['TableName']).'
	+ WHERE '.$name_field.' = '.$this->Conn->qstr($new_name);
	+ $res = $this->Conn->GetOne($query);
	+ }*/
	+
	+ $original_checked = true;
	+ } while ($res !== false);
	+ $object->SetDBField($title_field, $new_name);
	}

	/**
	* Show base styles or block styles
	*
	* @param kEvent $event
	*/
	function SetCustomQuery(&$event)
	{
	$object =& $event->getObject();
	switch ($event->Special)
	{
	case 'base':
	$object->addFilter('type_filter', '%1$s.Type = 1');
	break;

	case 'block':
	$object->addFilter('type_filter', '%1$s.Type = 2');
	break;
	}
	}

	/**
	* Enter description here...
	*
	* @param kEvent $event
	*/
	function OnBeforeItemUpdate(&$event)
	{
	$this->SerializeSelectorData($event);
	}

	/**
	* Enter description here...
	*
	* @param kEvent $event
	*/
	function OnBeforeItemCreate(&$event)
	{
	$this->SerializeSelectorData($event);
	}

	/**
	* Enter description here...
	*
	* @param kEvent $event
	*/
	function OnAfterItemUpdate(&$event)
	{
	$this->UnserializeSelectorData($event);
	}

	/**
	* Enter description here...
	*
	* @param kEvent $event
	*/
	function OnAfterItemCreate(&$event)
	{
	$this->UnserializeSelectorData($event);
	}

	/**
	* Get's special of main item for linking with subitem
	*
	* @param kEvent $event
	* @return string
	*/
	function getMainSpecial(&$event)
	{
	return '';
	}

	/**
	* Save css-style name & description before opening css editor
	*
	* @param kEvent $event
	*/
	function OnOpenStyleEditor(&$event)
	{
	$this->SaveChanges($event);
	$event->redirect = false;
	}

	/**
	* Saves Changes to Item
	*
	* @param kEvent $event
	*/
	function SaveChanges(&$event)
	{
	$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
	$object =& $event->getObject();

	$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
	if($items_info)
	{
	list($id,$field_values) = each($items_info);
	if($id == 0)
	{
	$parent_id = getArrayValue($field_values,'ParentId');
	if($parent_id) $object->Load($parent_id);

	$object->SetFieldsFromHash($field_values);
	$object->Create();
	if( $object->IsTempTable() ) $object->setTempID();
	$this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetID() );
	}
	else
	{
	$object->Load($id);
	$object->SetFieldsFromHash($field_values);
	$object->Update();
	}
	}
	}

	/**
	* Save style changes from style editor
	*
	* @param kEvent $event
	*/
	function OnSaveStyle(&$event)
	{
	$this->SaveChanges($event);

	$object =& $event->getObject();
	$this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetId() );

	$return_tpl = $object->GetDBField('Type') == 1 ? 'base_style_edit' : 'block_style_edit';

	$this->finalizePopup($event, 'selectors.base','stylesheets/'.$return_tpl);
	}

	/**
	* Extract styles
	*
	* @param kEvent $event
	*/
	function OnAfterItemLoad(&$event)
	{
	$object =& $event->getObject();
	$selector_data = $object->GetDBField('SelectorData');
	if($selector_data)
	{
	$selector_data = unserialize($selector_data);
	$object->SetDBField('SelectorData', $selector_data);
	}
	else
	{
	$selector_data = Array();
	}
	$this->AddParentProperties($event, $selector_data);
	}

	/**
	* Serialize item before saving to db
	*
	* @param kEvent $event
	*/
	function SerializeSelectorData(&$event)
	{
	$object =& $event->getObject();
	$selector_data = $object->GetDBField('SelectorData');
	if(!$selector_data) $selector_data = Array();

	$selector_data = $this->RemoveParentProperties($event, $selector_data);

	if( !IsSerialized($selector_data) ) $selector_data = serialize($selector_data);

	$object->SetDBField('SelectorData', $selector_data);
	}

	/**
	* Unserialize data back when update was made
	*
	* @param kEvent $event
	*/
	function UnserializeSelectorData(&$event)
	{
	$object =& $event->getObject();
	$selector_data = $object->GetDBField('SelectorData');
	if(!$selector_data) $selector_data = Array();
	if( IsSerialized($selector_data) ) $selector_data = unserialize($selector_data);

	$selector_data = $this->AddParentProperties($event, $selector_data);

	$object->SetDBField('SelectorData', $selector_data);
	}

	/**
	* Populate options based on temporary table :)
	*
	* @param kEvent $event
	*/
	function OnPrepareBaseStyles(&$event)
	{
	$object =& $event->getObject();

	$parent_info = $object->getLinkedInfo();
	$title_field = $this->Application->getUnitOption($event->Prefix,'TitleField');
	$sql = 'SELECT '.$title_field.', '.$object->IDField.' FROM '.$object->TableName.' WHERE Type = 1 AND StylesheetId = '.$parent_info['ParentId'].' ORDER BY '.$title_field;
	$object->Fields['ParentId']['options'] = array_merge_recursive2($object->Fields['ParentId']['options'],
	$this->Conn->GetCol($sql,$object->IDField) );
	}

	/**
	* Remove properties of parent style that match by value from style
	*
	* @param kEvent $event
	*/
	function RemoveParentProperties(&$event, $selector_data)
	{
	$object =& $event->getObject();
	$parent_id = $object->GetDBField('ParentId');
	if($parent_id)
	{
	$sql = 'SELECT SelectorData FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$parent_id;
	$base_selector_data = $this->Conn->GetOne($sql);

	if( IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data);

	foreach($selector_data as $prop_name => $prop_value)
	{
	if( !$prop_value \|\| getArrayValue($base_selector_data,$prop_name) == $prop_value )
	{
	unset($selector_data[$prop_name]);
	}
	}
	$object->SetDBField('SelectorData', $selector_data);
	return $selector_data;
	}
	else
	{
	foreach($selector_data as $prop_name => $prop_value)
	{
	if(!$prop_value) unset($selector_data[$prop_name]);
	}
	$object->SetDBField('SelectorData', $selector_data);
	return $selector_data;
	}
	}

	/**
	* Add back properties from parent style, that match this style property values
	*
	* @param kEvent $event
	*/
	function AddParentProperties(&$event, $selector_data)
	{
	$object =& $event->getObject();
	$parent_id = $object->GetDBField('ParentId');
	if($parent_id)
	{
	$sql = 'SELECT SelectorData FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$parent_id;
	$base_selector_data = $this->Conn->GetOne($sql);

	if( IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data);

	$selector_data = array_merge_recursive2($base_selector_data,$selector_data);

	$object->SetDBField('SelectorData', $selector_data);
	return $selector_data;
	}
	return $selector_data;
	}

	/**
	* Reset Style definition to base style -> no customizations
	*
	* @param kEvent $event
	*/
	function OnResetToBase(&$event)
	{
	$object =& $event->getObject();
	$object->SetFieldsFromHash( $this->getSubmittedFields($event) );
	$object->ResetStyle();

	$event->redirect_params['pass'] = 'all,'.$event->getPrefixSpecial();
	}

	/**
	* Resets selected styles properties to values of their base classes
	*
	* @param kEvent $event
	*/
	function OnMassResetToBase(&$event)
	{
	$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
	$object =& $event->getObject();

	$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
	if($items_info)
	{
	foreach($items_info as $id => $field_values)
	{
	$object->Load($id);
	$object->ResetStyle();
	}
	}
	}
	}

	?>
	\ No newline at end of file

	Property changes on: trunk/core/units/selectors/selectors_event_handler.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.5
	\ No newline at end of property
	+1.6
	\ No newline at end of property
	Index: trunk/core/units/selectors/selectors_config.php
	===================================================================
	--- trunk/core/units/selectors/selectors_config.php (revision 2798)
	+++ trunk/core/units/selectors/selectors_config.php (revision 2799)
	@@ -1,134 +1,134 @@
	<?php

	$config = Array(
	'Prefix' => 'selectors',
	'ItemClass' => Array('class'=>'SelectorsItem','file'=>'selectors_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'SelectorsEventHandler','file'=>'selectors_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'SelectorsTagProcessor','file'=>'selectors_tag_processor.php','build_event'=>'OnBuild'),
	'AutoLoad' => true,

	'Clones' => Array(
	'selectorsbase' => Array(
	'Hooks' => Array(),
	'Constrain' => 'Type = 1',
	'SubItems' => Array('selectorsblock'),
	),

	'selectorsblock' => Array(
	'Hooks' => Array(),
	'Constrain' => 'Type = 2',
	'ForeignKey' => Array('css' => 'StylesheetId', 'selectorsbase' => 'ParentId'),
	'ParentTableKey' => Array('css' => 'StylesheetId', 'selectorsbase' => 'SelectorId'),
	'ParentPrefix' => 'selectorsbase',
	),
	),

	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'selectors',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnItemBuild'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnPrepareBaseStyles',
	),

	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'selectors',
	'HookToSpecial' => 'block',
	'HookToEvent' => Array('OnListBuild'),
	'DoPrefix' => '',
	'DoSpecial' => 'block',
	'DoEvent' => 'OnPrepareBaseStyles',
	),
	),

	'MyHooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => Array('Prefix1.*', 'Prefix2.Special1'),
	'HookToEvents' => Array('OnBeforeItemUpdate', 'OnBeforeItemCreate'),
	'DoPrefix' => Array('Prefix1.*', 'Prefix2.Special1'),
	'DoEvent' => 'OnMyEvent',
	),
	),

	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	),
	'IDField' => 'SelectorId',

	'TitleField' => 'Name',

	'TableName' => TABLE_PREFIX.'StylesheetSelectors',

	'ForeignKey' => 'StylesheetId',
	'ParentTableKey' => 'StylesheetId',
	'ParentPrefix' => 'css',
	'AutoDelete' => true,
	'AutoClone' => true,

	'ListSQLs' => Array( ''=>' SELECT %1$s.*
	FROM %s',
	), // key - special, value - list select sql
	'ItemSQLs' => Array( ''=>'SELECT * FROM %s',
	),
	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('Name' => 'asc'),
	)
	),
	'Fields' => Array(
	'SelectorId' => Array(),
	- 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'not_null' => '1','default' => '0'),
	+ 'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => '1','default' => '0'),
	'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	- 'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'not_null' => '1','default' => '','required'=>1),
	+ 'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'current_table_only' => 1, 'not_null' => '1','default' => '','required'=>1),
	'SelectorData' => Array('not_null' => '1','default' => ''),
	'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'),
	'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
	'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0=>''), 'not_null' => '1','default' => '0'),
	),

	'VirtualFields' => Array(
	'FontStyle' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','normal'=>'normal','italic'=>'italic','oblique'=>'oblique'), 'default'=>'' ),
	'FontWeight' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','100'=>'100','200'=>'200','300'=>'300','normal'=>'normal','500'=>'500','600'=>'600','bold'=>'bold','800'=>'800','900'=>'900','lighter'=>'lighter','bolder'=>'bolder') ),
	'StyleCursor' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','default'=>'default','auto'=>'auto','n-resize'=>'n-resize','ne-resize'=>'ne-resize','e-resize'=>'e-resize','se-resize'=>'se-resize','s-resize'=>'s-resize','sw-resize'=>'sw-resize','w-resize'=>'w-resize','nw-resize'=>'nw-resize','crosshair'=>'crosshair','pointer'=>'pointer','move'=>'move','text'=>'text','wait'=>'wait','help'=>'help','hand'=>'hand','all-scroll'=>'all-scroll','col-resize'=>'col-resize','row-resize'=>'row-resize','no-drop'=>'no-drop','not-allowed'=>'not-allowed','progress'=>'progress','vertical-text'=>'vertical-text','alias'=>'alias','cell'=>'cell','copy'=>'copy','count-down'=>'count-down','count-up'=>'count-up','count-up-down'=>'count-up-down','grab'=>'grab','grabbing'=>'grabbing','spinning'=>'spinning') ),
	'StyleDisplay' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','none'=>'none','inline'=>'inline','block'=>'block','inline-block'=>'inline-block','list-item'=>'list-item','marker'=>'marker','compact'=>'compact','run-in'=>'run-in','table-header-group'=>'table-header-group','table-footer-group'=>'table-footer-group','table'=>'table','inline-table'=>'inline-table','table-caption'=>'table-caption','table-row'=>'table-row','table-row-group'=>'table-row-group','table-column'=>'table-column','table-column-group'=>'table-column-group') ),
	'TextAlign' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','left'=>'left','right'=>'right','center'=>'center','justify'=>'justify') ),
	'TextDecoration' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','none'=>'none','underline'=>'underline','overline'=>'overline','line-through'=>'line-through','blink'=>'blink') ),
	'StyleVisibility' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','visible'=>'visible','hidden'=>'hidden','collapse'=>'collapse') ),
	'StylePosition' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','static'=>'static','relative'=>'relative','absolute'=>'absolute','fixed'=>'fixed') ),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_selector.gif'),
	'Fields' => Array(
	'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td'),
	'SelectorName' => Array( 'title'=>'la_col_SelectorName'),
	'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td' ),
	),
	),

	'BlockStyles' => Array(
	'Icons' => Array('default'=>'icon16_selector.gif'),
	'Fields' => Array(
	'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td'),
	'SelectorName' => Array( 'title'=>'la_col_SelectorName'),
	'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td' ),
	'ParentId' => Array('title'=>'la_col_Basedon'),
	),
	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: trunk/core/units/selectors/selectors_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.5
	\ No newline at end of property
	+1.6
	\ No newline at end of property

in-portalNo OneTemporaryActions

File Metadata

in-portalView Options

Event Timeline

in-portal
No OneTemporary
Actions

in-portal
View Options