in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Sun, Aug 17, 10:37 AM

in-portal
View Options

	Index: branches/unlabeled/unlabeled-1.9.4/core/units/custom_data/custom_data_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.9.4/core/units/custom_data/custom_data_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.9.4/core/units/custom_data/custom_data_config.php (revision 7829)
	@@ -1,83 +1,83 @@
	<?php

	$config = Array(
	'Prefix' => 'cdata',

	'Clones' => Array(
	'u-cdata' => Array(
	'TableName' => TABLE_PREFIX.'PortalUserCustomData',
	'ParentPrefix' => 'u',
	),

	'c-cdata' => Array(
	'TableName' => TABLE_PREFIX.'CategoryCustomData',
	'ParentPrefix' => 'c',
	),

	'l-cdata' => Array(
	'TableName' => TABLE_PREFIX.'LinkCustomData',
	'ParentPrefix' => 'l',
	),

	'n-cdata' => Array(
	'TableName' => TABLE_PREFIX.'NewsCustomData',
	'ParentPrefix' => 'n',
	),

	'bb-cdata' => Array(
	'TableName' => TABLE_PREFIX.'TopicCustomData',
	'ParentPrefix' => 'bb',
	),

	'p-cdata' => Array(
	'TableName' => TABLE_PREFIX.'ProductsCustomData',
	'ParentPrefix' => 'p',
	),
	),

	'QueryString' => Array(
	1 => 'id',
	2 => 'event',
	),

	'ItemClass' => Array('class' => 'kDBItem', 'file' => '','build_event' => 'OnItemBuild'),
	'ListClass' => Array('class' => 'kDBList', 'file' => '','build_event' => 'OnListBuild'),
	'EventHandlerClass' => Array('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
	'TagProcessorClass' => Array('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
	'AutoLoad' => true,

	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => '#PARENT#', //self
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnAfterConfigRead'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnCreateCustomFields',
	),
	),

	'IDField' => 'CustomDataId',

	'ParentTableKey' => 'ResourceId',
	'ForeignKey' => 'ResourceId',
	'AutoDelete' => true,
	'AutoClone' => false,

	'CalculatedFields' => Array(
	'' => Array(),
	),

	'ListSQLs' => Array('' => 'SELECT %1$s.* %2$s FROM %1$s'),
	'ItemSQLs' => Array('' => 'SELECT %1$s.* %2$s FROM %1$s'),

	'Fields' => Array(
	- 'CustomDataId' => Array(),
	+ 'CustomDataId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'ResourceId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	),
	);


	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.9.4/core/units/custom_data/custom_data_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.9
	\ No newline at end of property
	+1.9.4.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.30.2/core/kernel/db/dbitem.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.30.2/core/kernel/db/dbitem.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.30.2/core/kernel/db/dbitem.php (revision 7829)
	@@ -1,955 +1,960 @@
	<?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'] = '!la_err_required!'; //'Field is required';
	$this->ErrorMsgs['unique'] = '!la_err_unique!'; //'Field value must be unique';
	$this->ErrorMsgs['value_out_of_range'] = '!la_err_value_out_of_range!'; //'Field is out of range, possible values from %s to %s';
	$this->ErrorMsgs['length_out_of_range'] = '!la_err_length_out_of_range!'; //'Field is out of range';
	$this->ErrorMsgs['bad_type'] = '!la_err_bad_type!'; //'Incorrect data format, please use %s';
	$this->ErrorMsgs['invalid_format'] = '!la_err_invalid_format!'; //'Incorrect data format, please use %s';
	$this->ErrorMsgs['bad_date_format'] = '!la_err_bad_date_format!'; //'Incorrect date format, please use (%s) ex. (%s)';
	$this->ErrorMsgs['primary_lang_required'] = '!la_err_primary_lang_required!';
	}

	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 will make sure numeric value is converted to normal representation
	// according to regional format, even when formatter is not set (try seting format to 1.234,56 to understand why)
	elseif (preg_match('#int\|integer\|double\|float\|real\|numeric#', $options['type'])) {
	$formatter =& $this->Application->recallObject('kFormatter');
	$parsed = $formatter->TypeCast($value, $options);
	}
	$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_field = isset($this->Fields[$field]['error_field']) ? $this->Fields[$field]['error_field'] : $field;
	$this->FieldErrors[$error_field]['pseudo'] = $pseudo;

	$error_msg = $error_label ? $this->Application->Phrase($error_label) : '';
	if ($error_label && !getArrayValue($this->ErrorMsgs, $pseudo))
	{
	$this->ErrorMsgs[$pseudo] = $error_msg;
	}
	}

	/**
	* 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
	* @param Array $keys_hash alternative, then item id, keys hash to load item by
	* @return void
	* @see kDBItem::Load()
	* @see kDBItem::Update()
	* @see kDBItem::Delete()
	*/
	function GetKeyClause($method=null, $keys_hash = null)
	{
	if( !isset($keys_hash) ) $keys_hash = Array($this->IDField => $this->ID);

	$ret = '';
	foreach($keys_hash as $field => $value)
	{
	if (!preg_match('/\./', $field)) {
	$ret .= '(`'.$this->TableName.'`.'.$field.' = '.$this->Conn->qstr($value).') AND ';
	}
	else {
	$ret .= '('.$field.' = '.$this->Conn->qstr($value).') AND ';
	}
	}

	return preg_replace('/(.*) AND $/', '\\1', $ret);
	}

	/**
	* Loads item from the database by given id
	*
	* @access public
	* @param mixed $id item id of keys->values hash to load item by
	* @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 ( isset($id_field_name) ) $this->SetIDField( $id_field_name );
	$keys_sql = '';
	if( is_array($id) )
	{
	$keys_sql = $this->GetKeyClause('load', $id);
	}
	else
	{
	$this->setID($id);
	$keys_sql = $this->GetKeyClause('load');
	}
	if ( isset($id_field_name) ) $this->setIDField( $this->Application->getUnitOption($this->Prefix, 'IDField') );


	if( ($id === false) \|\| !$keys_sql ) return $this->Clear();

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

	$q = $this->GetSelectSQL().' WHERE '.$keys_sql;

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

	if( is_array($id) \|\| isset($id_field_name) ) $this->setID( $this->FieldValues[$this->IDField] );

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

	$this->raiseEvent('OnAfterItemLoad', $this->GetID() );
	$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 \|\| ( !getArrayValue($this->FieldValues, $field_name) && getArrayValue($this->Fields[$field_name], 'skip_empty') ); //skipping marked field with 'skip_empty'
	// $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->saveCustomFields();
	$this->raiseEvent('OnAfterItemUpdate');
	$this->Loaded = true;
	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;
	}

	/**
	* Check if item has errors
	*
	* @param Array $skip_fields fields to skip during error checking
	* @return bool
	*/
	function HasErrors($skip_fields)
	{
	$global_res = false;

	foreach ($this->Fields as $field => $field_params) {
	// If Formatter has set some error messages during values parsing
	if ( !( in_array($field, $skip_fields) ) &&
	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)
	{
	// if field is not empty or if it is required - we add where condition
	if ($this->GetDBField($unique_field) != '' \|\| $this->Fields[$unique_field]['required']) {
	$where[] = '`'.$unique_field.'` = '.$this->Conn->qstr( $this->GetDBField($unique_field) );
	}
	}
	// This can ONLY happen if all unique fields are empty and not required.
	// In such case we return true, because if unique field is not required there may be numerous empty values
	if (!$where) return true;

	$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) );

	$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', $this->Application->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 (!$err) return '';
	// if special error msg defined in config
	if( isset($this->Fields[$field]['error_msgs'][$err]) )
	{
	$msg = $this->Fields[$field]['error_msgs'][$err];
	}
	else //fall back to defaults
	{
	if( !isset($this->ErrorMsgs[$err]) ) {
	trigger_error('No user message is defined for pseudo error <b>'.$err.'</b><br>', E_USER_WARNING);
	return $err; //return the pseudo itself
	}
	$msg = $this->ErrorMsgs[$err];
	}
	$msg = $this->Application->ReplaceLanguageTags($msg, $force_escape);

	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)
	- {
	+ 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']).', ';
	+
	+ //Adding field' value to Values block of Insert statement, escaping it with qstr
	+ if (is_null( $this->FieldValues[$field_name] )) {
	+ if (isset($this->Fields[$field_name]['not_null']) && $this->Fields[$field_name]['not_null']) {
	+ if ($field_name == $this->IDField) {
	+ $values_sql .= 'DEFAULT';
	+ }
	+ else {
	+ $values_sql .= $this->Conn->qstr($this->Fields[$field_name]['default'], 0);
	+ }
	}
	- else
	- {
	- $values_sql .= 'NULL, ';
	+ else {
	+ $values_sql .= 'NULL';
	}
	}
	- else
	- {
	- $values_sql .= sprintf('%s, ',$this->Conn->qstr($this->FieldValues[$field_name], 0));
	+ else {
	+ $values_sql .= $this->Conn->qstr($this->FieldValues[$field_name], 0);
	}
	+
	+ $fields_sql .= '`'.$field_name.'`, '; //Adding field name to fields block of Insert statement
	+ $values_sql .= ', ';
	}
	//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;
	+ if ($this->Conn->ChangeQuery($sql) === false) return false;

	$insert_id = $this->Conn->getInsertID();
	- if($insert_id == 0) $insert_id = $this->FieldValues[$this->IDField];
	+ if ($insert_id == 0) {
	+ // insert into temp table (id is not auto-increment field)
	+ $insert_id = $this->FieldValues[$this->IDField];
	+ }
	$this->setID($insert_id);

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

	$this->saveCustomFields();
	$this->raiseEvent('OnAfterItemCreate');
	$this->Loaded = true;
	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);

	$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, $additional_params = Array())
	{
	if( !isset($id) ) $id = $this->GetID();
	$event = new kEvent( Array('name'=>$name,'prefix'=>$this->Prefix,'special'=>$this->Special) );
	$event->setEventParam('id', $id);

	if ($additional_params) {
	foreach ($additional_params as $ap_name => $ap_value) {
	$event->setEventParam($ap_name, $ap_value);
	}
	}

	$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;
	+ return is_null($this->ID) ? $this->Fields[$this->IDField]['default'] : $this->ID;
	}

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

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

	/**
	* Checks if field is required
	*
	* @param string $field
	* @return bool
	*/
	function isRequired($field)
	{
	return getArrayValue( $this->Fields[$field], 'required' );
	}

	/**
	* Sets new required flag to field
	*
	* @param string $field
	* @param bool $is_required
	*/
	function setRequired($field, $is_required = true)
	{
	$this->Fields[$field]['required'] = $is_required;
	}

	function Clear()
	{
	$this->setID(null);
	$this->Loaded = false;
	$this->FieldValues = Array();
	$this->SetDefaultValues();
	$this->FieldErrors = Array();
	return $this->Loaded;
	}

	function Query($force = false)
	{
	if( $this->Application->isDebugMode() )
	{
	$this->Application->Debugger->appendTrace();
	}
	trigger_error('<b>Query</b> method is called in class <b>'.get_class($this).'</b> for prefix <b>'.$this->getPrefixSpecial().'</b>', E_USER_ERROR);
	}

	function saveCustomFields()
	{
	if (!$this->customFields) {
	return true;
	}

	$cdata_key = rtrim($this->Prefix.'-cdata.'.$this->Special, '.');
	$cdata =& $this->Application->recallObject($cdata_key, null, Array('skip_autoload' => true));

	$resource_id = $this->GetDBField('ResourceId');
	$cdata->Load($resource_id, 'ResourceId');
	$cdata->SetDBField('ResourceId', $resource_id);

	$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
	foreach ($this->customFields as $custom_id => $custom_name) {
	$cdata->SetDBField($ml_formatter->LangFieldName('cust_'.$custom_id), $this->GetDBField('cust_'.$custom_name));
	}

	if ($cdata->isLoaded()) {
	$ret = $cdata->Update();
	}
	else {
	$ret = $cdata->Create();
	if ($cdata->mode == 't') $cdata->setTempID();
	}

	return $ret;
	}
	}



	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.30.2/core/kernel/db/dbitem.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.30.2.1
	\ No newline at end of property
	+1.30.2.2
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.34.2/core/units/users/users_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.34.2/core/units/users/users_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.34.2/core/units/users/users_config.php (revision 7829)
	@@ -1,211 +1,211 @@
	<?php

	$config = Array(
	'Prefix' => 'u',
	'ItemClass' => Array('class'=>'UsersItem','file'=>'users_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'UsersEventHandler','file'=>'users_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'UsersTagProcessor','file'=>'users_tag_processor.php','build_event'=>'OnBuild'),
	'RegisterClasses' => Array(
	Array('pseudo' => 'UsersSyncronizeManager', 'class' => 'UsersSyncronizeManager', 'file' => 'users_syncronize.php', 'build_event' => ''),
	),

	'AutoLoad' => true,
	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'u',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnAfterItemLoad', 'OnBeforeItemCreate', 'OnBeforeItemUpdate', 'OnUpdateAddress'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnPrepareStates',
	),

	Array(
	'Mode' => hBEFORE,
	'Conditional' => false,
	'HookToPrefix' => 'affil',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnCheckAffiliateAgreement'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnSubstituteSubscriber',
	),

	),

	'QueryString' => Array(
	1 => 'id',
	2 => 'Page',
	3 => 'event',
	4 => 'mode',
	),

	'RegularEvents' => Array(
	'membership_expiration' => Array('EventName' => 'OnCheckExpiredMembership', 'RunInterval' => 1800, 'Type' => reAFTER),
	),

	'IDField' => 'PortalUserId',

	'StatusField' => Array('Status'),

	'TitleField' => 'Login',

	'ItemType' => 6, // used for custom fields only (on user's case)

	'StatisticsInfo' => Array(
	'pending' => Array(
	'icon' => 'icon16_user_pending.gif',
	'label' => 'la_Text_Users',
	'js_url' => "set_persistant_var('User_View', 4, 'users/users_list', '#url#')",
	'url' => Array('t' => 'users/users_list', 'index_file' => 'users/user_list.php', 'pass' => 'm'),
	'status' => STATUS_PENDING,
	),
	),

	'TitlePresets' => Array(
	'default' => Array(
	'new_status_labels' => Array('u'=>'!la_title_Adding_User!'),
	'edit_status_labels' => Array('u'=>'!la_title_Editing_User!'),
	'new_titlefield' => Array('u'=>''),
	),

	'users_list' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)"),

	'users_edit' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"),
	'users_custom' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Custom!"),

	'users_select' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"),

	'user_groups_list' => Array('prefixes' => Array('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups! (#u-ug_recordcount#)"),

	'tree_users' => Array('format' => '!la_section_overview!'),
	),


	'PermSection' => Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'),

	'TableName' => TABLE_PREFIX.'PortalUser',

	'ListSQLs' => Array( '' => ' SELECT %1$s.* %2$s FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON %1$s.PortalUserId = ug.PortalUserId AND ug.PrimaryGroup = 1
	LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON ug.GroupId = g.GroupId
	LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUserCustomData cust ON %1$s.ResourceId = cust.ResourceId',
	),

	'ItemSQLs' => Array( '' => ' SELECT %1$s.* %2$s FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON %1$s.PortalUserId = ug.PortalUserId AND ug.PrimaryGroup = 1
	LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON ug.GroupId = g.GroupId
	LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUserCustomData cust ON %1$s.ResourceId = cust.ResourceId',
	),

	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('Login' => 'asc'),
	)
	),

	'SubItems' => Array('addr', 'u-cdata', 'u-ug', 'fav'),

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),
	),

	'Filters' => Array(
	0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),
	1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),
	2 => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ),
	)
	),

	'CalculatedFields' => Array(
	'' => Array(
	'PrimaryGroup' => 'g.Name',
	),
	),

	'Fields' => Array
	(
	- 'PortalUserId' => Array(),
	+ 'PortalUserId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Login' => Array('type' => 'string', 'unique'=>Array('Login'), 'default' => '','required'=>1, 'error_msgs' => Array('unique'=>'!lu_user_already_exist!')),
	'Password' => Array('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('') ),
	'FirstName' => Array('type' => 'string','default' => ''),
	'LastName' => Array('type' => 'string','default' => ''),
	'Company' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Email' => Array('type' => 'string', 'formatter'=>'kFormatter', 'regexp'=>'/^[_a-zA-Z0-9-\.]+@[a-zA-Z0-9-\.]+\.[a-z]{2,4}$/', 'sample_value' => 'email@domain.com', 'unique'=>Array('Email'), 'not_null' => '1', 'required'=>1, 'default' => '', 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!') ),
	'CreatedOn' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#', 'not_null' => '1' ),
	'Phone' => Array('type' => 'string','default' => ''),
	'Fax' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Street' => Array('type' => 'string','default' => ''),
	'Street2' => Array('type' => 'string', 'not_null' => '1', 'default' => ''),
	'City' => Array('type' => 'string','default' => ''),
	'State' => Array('formatter'=>'kOptionsFormatter',
	'options' => Array(),
	'option_key_field'=>'DestAbbr','option_title_field'=>'Translation',
	'not_null' => '1','default' => ''),
	'Zip' => Array('type' => 'string','default' => ''),
	'Country' => Array('formatter'=>'kOptionsFormatter',
	'options_sql'=>'SELECT %1$s
	FROM '.TABLE_PREFIX.'StdDestinations
	LEFT JOIN '.TABLE_PREFIX.'Phrase
	ON '.TABLE_PREFIX.'Phrase.Phrase = '.TABLE_PREFIX.'StdDestinations.DestName
	WHERE
	DestType=1
	AND
	LanguageId = %2$s
	ORDER BY Translation',
	'option_key_field'=>'DestAbbr','option_title_field'=>'Translation',
	'not_null' => '1','default' => ''),
	'ResourceId' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => '1','default' => 2),
	'Modified' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1', 'default' => '#NOW#' ),
	'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '', 'required'=>1),
	'tz' => Array('type' => 'int','default' => 0),
	'ip' => Array('type' => 'string','default' => ''),
	'IsBanned' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'PassResetTime' => Array('type' => 'int','default' => null),
	'PwResetConfirm' => Array('type' => 'string','default' => ''),
	'PwRequestTime' => Array('type' => 'int','default' => null),
	- 'MinPwResetDelay' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array('300' => '5', '600' => '10', '900' => '15', '1800' => '30', '3600' => '60'), 'use_phrases' => 0, 'not_null' => '1', 'default' => 30),
	+ 'MinPwResetDelay' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(300 => '5', 600 => '10', 900 => '15', 1800 => '30', 3600 => '60'), 'use_phrases' => 0, 'not_null' => '1', 'default' => 1800),
	),

	'VirtualFields' => Array(
	'ValidateLogin' => Array('type'=>'string','default'=>''),
	'SubscribeEmail' => Array('type'=>'string','default'=>''),
	'PrimaryGroup' => Array('type' => 'string', 'default' => ''),
	'Captcha' => Array('type' => 'string', 'default' => ''),
	'RootPassword' => Array('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyRootPassword', 'skip_empty' => 1, 'default' => md5('') ),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
	'Fields' => Array(
	'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td'),
	'LastName' => Array( 'title'=>'la_col_LastName'),
	'FirstName' => Array( 'title'=>'la_col_FirstName'),
	'Email' => Array( 'title'=>'la_col_Email'),
	'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup'),
	'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
	),
	),

	'UserSelector' => Array(
	'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
	'Fields' => Array(
	'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_radio_td'),
	'LastName' => Array( 'title'=>'la_col_LastName'),
	'FirstName' => Array( 'title'=>'la_col_FirstName'),
	'Email' => Array( 'title'=>'la_col_Email'),
	'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup'),
	'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
	),
	),
	),

	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.34.2/core/units/users/users_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.34.2.4
	\ No newline at end of property
	+1.34.2.5
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.17.2/core/units/groups/groups_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.17.2/core/units/groups/groups_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.17.2/core/units/groups/groups_config.php (revision 7829)
	@@ -1,128 +1,128 @@
	<?php

	$config = Array(
	'Prefix' => 'g',

	'ItemClass' => Array('class' => 'GroupsItem', 'file' => 'groups_item.php', 'build_event' => 'OnItemBuild'),
	'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
	'EventHandlerClass' => Array('class' => 'GroupsEventHandler', 'file' => 'groups_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class' => 'kDBTagProcessor', 'file' => '','build_event'=>'OnBuild'),

	'AutoLoad' => true,

	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),

	'IDField' => 'GroupId',

	'StatusField' => Array('Enabled'),

	'TitleField' => 'Name',

	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('g' => '!la_title_Adding_Group!'),
	'edit_status_labels' => Array('g' => '!la_title_Editing_Group!'),
	'new_titlefield' => Array('g' => ''),
	),

	'groups_list' => Array('prefixes' => Array('g.total_List'), 'format' => "!la_title_Groups! (#g.total_recordcount#)"),

	'groups_edit' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_General!"),

	'groups_edit_users' => Array('prefixes' => Array('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users! (#g-ug_recordcount#)" ),

	'groups_edit_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ),

	'groups_edit_additional_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ),

	'select_group' => Array('prefixes' => Array('g.user_List'), 'format' => "!la_title_Groups! (#g.user_recordcount#) - !la_title_SelectGroup!"),
	),

	'PermSection' => Array('main' => 'in-portal:user_groups'),

	'TableName' => TABLE_PREFIX.'PortalGroup',

	'ListSQLs' => Array(
	'' => 'SELECT %1$s.* %2$s FROM %1$s',
	'total' => 'SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId',
	),

	'ItemSQLs' => Array('' => ' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId'),

	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('Name' => 'asc'),
	)
	),

	'SubItems' => Array('g-perm', /'g-ug'/),
	'CalculatedFields' => Array(
	'total' => Array(
	'UserCount' => 'COUNT(ug.PortalUserId)',
	),
	),

	'Fields' => Array (
	- 'GroupId' => Array(),
	+ 'GroupId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Name' => Array('type' => 'string', 'not_null' => '1', 'required' => 1, 'default' => ''),
	'Description' => Array('type' => 'string','default' => ''),
	'CreatedOn' => Array('type' => 'double', 'formatter' => 'kDateFormatter', 'not_null' => '1','default' => '#NOW#'),
	'System' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'Personal' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 1),
	'ResourceId' => Array('type' => 'int','not_null' => '1','default' => '0'),
	),

	'VirtualFields' => Array(
	'UserCount' => Array('type' => 'int', 'default' => 0),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'),
	'Fields' => Array(
	'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'),
	'Name' => Array('title' => 'la_col_GroupName'),
	'UserCount' => Array('title' => 'la_col_UserCount'),
	),
	),

	'UserGroups' => Array (
	'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'),
	'Fields' => Array (
	'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'),
	'Name' => Array('title' => 'la_col_GroupName'),
	),
	),

	'Radio' => Array (
	'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'),
	'Fields' => Array(
	'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_radio_td'),
	'Name' => Array('title' => 'la_col_GroupName'),
	'Description' => Array('title' => 'la_col_Description'),
	),
	),

	'GroupSelector' => Array (
	'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'),
	'Fields' => Array(
	'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'),
	'Name' => Array('title' => 'la_col_GroupName'),
	'Description' => Array('title' => 'la_col_Description'),
	),
	),
	),


	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.17.2/core/units/groups/groups_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.17.2.1
	\ No newline at end of property
	+1.17.2.2
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.55.2/core/units/categories/categories_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.55.2/core/units/categories/categories_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.55.2/core/units/categories/categories_config.php (revision 7829)
	@@ -1,277 +1,277 @@
	<?php

	$config = Array(
	'Prefix' => 'c',
	'ItemClass' => Array('class'=>'CategoriesItem','file'=>'categories_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'CategoriesEventHandler','file'=>'categories_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'CategoriesTagProcessor','file'=>'categories_tag_processor.php','build_event'=>'OnBuild'),

	'RegisterClasses' => Array(
	Array('pseudo' => 'kPermCacheUpdater','class' => 'kPermCacheUpdater', 'file' => 'cache_updater.php','build_event'=>''),
	),

	'AutoLoad' => true,
	'CatalogItem' => true,
	'AdminTemplatePath' => 'categories',
	'AdminTemplatePrefix' => 'categories_',

	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),
	'AggregateTags' => Array(
	Array(
	'AggregateTo' => 'm',
	'AggregatedTagName' => 'CategoryLink',
	'LocalTagName' => 'CategoryLink',
	),
	),
	'IDField' => 'CategoryId',

	'StatusField' => Array('Status'),

	'TitleField' => 'Name', // field, used in bluebar when editing existing item
	'TitlePhrase' => 'la_Text_Category',
	'ItemType' => 1, // used for custom fields only

	'StatisticsInfo' => Array(
	'pending' => Array(
	'icon' => 'icon16_cat_pending.gif',
	'label' => 'la_tab_Categories',
	'js_url' => '#url#',
	'url' => Array('t' => 'in-portal/advanced_view', 'SetTab' => 'c', 'pass' => 'm,c.showall', 'c.showall_event' => 'OnSetFilterPattern', 'c.showall_filters' => 'show_active=0,show_pending=1,show_disabled=0,show_new=1,show_pick=1'),
	'status' => STATUS_PENDING,
	),
	),

	'TableName' => TABLE_PREFIX.'Category',

	'ViewMenuPhrase' => 'la_text_Categories',

	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('c' => '!la_title_Adding_Category!'),
	'edit_status_labels' => Array('c' => '!la_title_Editing_Category!'),
	'new_titlefield' => Array('c' => ''),
	),
	'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"),

	'catalog' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (<span id='c_item_count'>#c_recordcount#</span>)"),

	'advanced_view' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_AdvancedView!"),

	'categories_edit' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_General!"),
	'categories_properties' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Properties!"),
	'categories_relations' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Relations!"),
	'categories_images' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Images!"),
	'categories_permissions'=> Array('prefixes' => Array('c', 'g_List'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Permissions!"),
	'categories_custom' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Custom!"),

	'categories_update' => Array('prefixes' => Array(), 'format' => "!la_title_UpdatingCategories!"),

	'images_edit' => Array( 'prefixes' => Array('c', 'c-img'),
	'new_status_labels' => Array('c-img'=>'!la_title_Adding_Image!'),
	'edit_status_labels' => Array('c-img'=>'!la_title_Editing_Image!'),
	'new_titlefield' => Array('c-img'=>''),
	'format' => "#c_status# '#c_titlefield#' - #c-img_status# '#c-img_titlefield#'",
	),

	'relations_edit' => Array( 'prefixes' => Array('c', 'c-rel'),
	'new_status_labels' => Array('c-rel'=>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"),
	'edit_status_labels' => Array('c-rel'=>'!la_title_Editing_Relationship!'),
	'format' => "#c_status# '#c_titlefield#' - #c-rel_status#",
	),

	'tree_site' => Array('format' => '!la_selecting_categories!'),
	),

	'PermItemPrefix' => 'CATEGORY',

	'PermSection' => Array('main' => 'CATEGORY:in-portal:categories', /'search' => 'in-portal:configuration_search',/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'),


	/* 'Sections' => Array(
	// "Structure & Data" section
	'in-portal:site' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'struct',
	'label' => 'la_tab_Site_Structure',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 1,
	'type' => stTREE,
	),

	'in-portal:browse' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'catalog',
	'label' => 'la_tab_Browse',
	'url' => Array('t' => 'in-portal/catalog', 'pass' => 'm'),
	'late_load' => Array('t' => 'in-portal/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
	'onclick' => 'checkCatalog(0)',
	'permissions' => Array('view'),
	'priority' => 0.1,
	'type' => stTREE,
	),
	'in-portal:advanced_view' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'advanced_view',
	'label' => 'la_tab_AdvancedView',
	'url' => Array('t' => 'in-portal/advanced_view', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 0.2,
	'type' => stTREE,
	),

	'in-portal:reviews' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'reviews',
	'label' => 'la_tab_Reviews',
	'url' => Array('index_file' => 'reviews.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 3,
	'type' => stTREE,
	),

	'in-portal:configure_categories' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'cat_settings',
	'label' => 'la_tab_Settings',
	'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 4,
	'type' => stTREE,
	),

	'in-portal:configuration_search' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'settings_search',
	'label' => 'la_tab_ConfigSearch',
	'url' => Array('t' => 'in-portal/config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 5,
	'type' => stTREE,
	),

	'in-portal:configuration_email' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'settings_email',
	'label' => 'la_tab_ConfigE-mail',
	'url' => Array('t' => 'in-portal/config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 6,
	'type' => stTREE,
	),

	'in-portal:configuration_custom' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'settings_custom',
	'label' => 'la_tab_ConfigCustom',
	'url' => Array('t' => 'in-portal/custom_fields/custom_fields_list', 'cf_type' => 1, 'pass_section' => true, 'pass' => 'm,cf'),
	'permissions' => Array('view', 'add', 'edit', 'delete'),
	'priority' => 7,
	'type' => stTREE,
	),

	),*/

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array('show_active','show_pending','show_disabled'), 'type' => WHERE_FILTER),
	Array('mode' => 'AND', 'filters' => Array('show_new'), 'type' => HAVING_FILTER),
	Array('mode' => 'AND', 'filters' => Array('show_pick'), 'type' => WHERE_FILTER),
	),
	'Filters' => Array(
	'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Status != 1' ),
	'show_pending' => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => 'Status != 2' ),
	'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0' ),
	's1' => Array(),
	'show_new' => Array('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ),
	'show_pick' => Array('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '`EditorsPick` != 1' ),
	)
	),

	'ListSQLs' => Array( ''=> ' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'PermCache ON '.TABLE_PREFIX.'PermCache.CategoryId = %1$s.CategoryId
	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId'),

	'ItemSQLs' => Array( ''=> ' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'PermCache ON '.TABLE_PREFIX.'PermCache.CategoryId = %1$s.CategoryId
	LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId'),

	'SubItems' => Array('c-rel', 'c-img', 'c-cdata', 'c-perm'),

	'ListSortings' => Array(
	'' => Array(
	'ForcedSorting' => Array("CurrentSort" => 'asc', 'Priority' => 'desc', 'Name' => 'asc'),
	'Sorting' => Array('Name' => 'asc'),
	)
	),

	'CalculatedFields' => Array(
	'' => Array(
	'CurrentSort' => "REPLACE(ParentPath, CONCAT('\|', ".'%1$s'.".CategoryId, '\|'), '')",
	)
	),

	'Fields' => Array
	(
	- 'CategoryId' => Array('type' => 'int','not_null' => 1,'default' => ''),
	+ 'CategoryId' => Array('type' => 'int','not_null' => 1,'default' => 0),
	'Type' => Array('type' => 'int','not_null' => 1,'default' => 0),
	'ParentId' => Array('type' => 'int','not_null' => 1,'default' => 0),
	'Name' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''),
	'Filename' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
	'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1),
	'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'required' => 1, 'default' => ''),
	'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),
	'EditorsPick' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 2),
	'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'MetaKeywords' => Array('type' => 'string', 'default' => ''),
	'CachedDescendantCatsQty' => Array('type' => 'int', 'default' => 0),
	'CachedNavbar' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => ''),
	'CreatedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => '0'),
	'ResourceId' => Array('type' => 'int', 'default' => ''),
	'ParentPath' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
	'NamedParentPath' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
	'MetaDescription' => Array('type' => 'string', 'default' => ''),
	'HotItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
	'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),
	'ModifiedById' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => '0'),
	'CategoryTemplate' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
	'CachedCategoryTemplate' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
	),

	'VirtualFields' => Array(
	'CurrentSort' => Array('type' => 'string', 'default' => ''),
	'IsNew' => Array('type' => 'int', 'default' => 0),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_cat.gif'),
	'Fields' => Array(
	'Name' => Array('title' => 'la_col_Name', 'data_block' => 'category_td'),
	'Description' => Array('title' => 'la_col_Description'),
	'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
	),

	),
	),

	'ConfigMapping' => Array(
	'PerPage' => 'Perpage_Category',
	'DefaultSorting1Field' => 'Category_Sortfield',
	'DefaultSorting2Field' => 'Category_Sortfield2',
	'DefaultSorting1Dir' => 'Category_Sortorder',
	'DefaultSorting2Dir' => 'Category_Sortorder2',
	),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.55.2/core/units/categories/categories_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.55.2.2
	\ No newline at end of property
	+1.55.2.3
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.2.2/core/install/upgrades.sql
	===================================================================
	--- branches/unlabeled/unlabeled-1.2.2/core/install/upgrades.sql (revision 7828)
	+++ branches/unlabeled/unlabeled-1.2.2/core/install/upgrades.sql (revision 7829)
	@@ -1,40 +1,49 @@
	# ===== v 4.0.1 =====
	ALTER TABLE EmailLog ADD EventParams TEXT NOT NULL;

	INSERT INTO ConfigurationAdmin VALUES ('MailFunctionHeaderSeparator', 'la_Text_smtp_server', 'la_config_MailFunctionHeaderSeparator', 'radio', NULL, '1=la_Linux,2=la_Windows', 30.08, 0, 0);
	INSERT INTO ConfigurationValues VALUES (0, 'MailFunctionHeaderSeparator', 1, 'In-Portal', 'in-portal:configure_general');

	ALTER TABLE PersistantSessionData DROP PRIMARY KEY ;
	ALTER TABLE PersistantSessionData ADD INDEX ( `PortalUserId` ) ;

	# ===== v 4.0.2 =====
	ALTER TABLE EmailMessage ADD ReplacementTags TEXT AFTER Template;
	ALTER TABLE Phrase CHANGE Translation Translation TEXT NOT NULL;
	ALTER TABLE Category
	CHANGE Description Description TEXT,
	CHANGE l1_Description l1_Description TEXT,
	CHANGE l2_Description l2_Description TEXT,
	CHANGE l3_Description l3_Description TEXT,
	CHANGE l4_Description l4_Description TEXT,
	CHANGE l5_Description l5_Description TEXT,
	CHANGE CachedNavbar CachedNavbar text,
	CHANGE l1_CachedNavbar l1_CachedNavbar text,
	CHANGE l2_CachedNavbar l1_CachedNavbar text,
	CHANGE l3_CachedNavbar l1_CachedNavbar text,
	CHANGE l4_CachedNavbar l1_CachedNavbar text,
	CHANGE l5_CachedNavbar l1_CachedNavbar text;

	ALTER TABLE ConfigurationAdmin CHANGE ValueList ValueList TEXT;

	ALTER TABLE EmailQueue
	CHANGE `Subject` `Subject` TEXT,
	CHANGE toaddr toaddr TEXT,
	CHANGE fromaddr fromaddr TEXT;

	ALTER TABLE Category DROP Pop;

	ALTER TABLE PortalUser
	CHANGE CreatedOn CreatedOn INT NOT NULL DEFAULT '0',
	CHANGE dob dob INT(11) NULL DEFAULT NULL,
	CHANGE PassResetTime PassResetTime INT(11) UNSIGNED NULL DEFAULT NULL,
	- CHANGE PwRequestTime PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL;
	\ No newline at end of file
	+ CHANGE PwRequestTime PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL;
	+
	+ALTER TABLE Modules CHANGE BuildDate BuildDate INT UNSIGNED NULL DEFAULT NULL;
	+ALTER TABLE Language
	+ CHANGE Enabled Enabled INT(11) NOT NULL DEFAULT '1',
	+ CHANGE InputDateFormat InputDateFormat VARCHAR(50) NOT NULL DEFAULT 'm/d/Y',
	+ CHANGE InputTimeFormat InputTimeFormat VARCHAR(50) NOT NULL DEFAULT 'g:i:s A',
	+ CHANGE DecimalPoint DecimalPoint CHAR(2) NOT NULL DEFAULT '';
	+
	+ALTER TABLE Events CHANGE FromUserId FromUserId INT(11) NOT NULL DEFAULT '-1';
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.2.2/core/install/upgrades.sql
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.2.2.8
	\ No newline at end of property
	+1.2.2.9
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.10.2/core/units/phrases/phrases_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.10.2/core/units/phrases/phrases_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.10.2/core/units/phrases/phrases_config.php (revision 7829)
	@@ -1,141 +1,141 @@
	<?php

	$config = Array(
	'Prefix' => 'phrases',
	'Clones' => array(
	'phrases-single' => array(
	'ForeignKey' => false,
	'ParentTableKey' => false,
	'ParentPrefix' => false,
	)
	),
	'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'PhrasesEventHandler','file'=>'phrases_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
	'AutoLoad' => true,

	'Hooks' => Array(
	Array(
	'Mode' => hBEFORE,
	'Conditional' => false,
	'HookToPrefix' => 'phrases',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnCreate'),
	'DoPrefix' => 'phrases',
	'DoSpecial' => '',
	'DoEvent' => 'OnBeforePhraseCreate',
	),

	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'phrases',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnBeforeItemCreate','OnBeforeItemUpdate'),
	'DoPrefix' => 'phrases',
	'DoSpecial' => '',
	'DoEvent' => 'OnSetLastUpdated',
	),
	),

	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'label',
	5 => 'mode', // labels can be edited directly
	),
	'IDField' => 'PhraseId',

	'TitleField' => 'Phrase',

	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('phrases'=>'!la_title_Adding_Phrase!'),
	'edit_status_labels' => Array('phrases'=>'!la_title_Editing_Phrase!'),
	'new_titlefield' => Array('phrases'=>''),
	),

	'phrase_edit' => Array('prefixes' => Array('phrases'), 'format' => '#phrases_status# #phrases_titlefield#'),

	),

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array('show_front','show_admin','show_both'), 'type' => WHERE_FILTER),
	Array('mode' => 'AND', 'filters' => Array('translated', 'not_translated'), 'type' => WHERE_FILTER),
	),
	'Filters' => Array(
	'show_front' => Array('label' =>'la_PhraseType_Front', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 0'),
	'show_admin' => Array('label' => 'la_PhraseType_Admin', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 1'),
	'show_both' => Array('label' => 'la_PhraseType_Both', 'on_sql' => '', 'off_sql' => '%1$s.PhraseType != 2'),
	's1' => Array(),
	'translated' => Array('label' => 'la_PhraseTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation = pri.Translation'),
	'not_translated' => Array('label' => 'la_PhraseNotTranslated', 'on_sql' => '', 'off_sql' => '%1$s.Translation != pri.Translation'),
	)
	),

	'TableName' => TABLE_PREFIX.'Phrase',

	'CalculatedFields' => Array(
	'' => Array(
	'PrimaryTranslation' => 'pri.Translation',
	),

	),

	'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'Phrase pri ON (%1$s.Phrase = pri.Phrase) AND (pri.LanguageId = 1)'),

	'ItemSQLs' => Array( ''=>' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'Phrase pri ON (%1$s.Phrase = pri.Phrase) AND (pri.LanguageId = 1)',),

	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('Phrase' => 'asc'),
	)
	),

	'ForeignKey' => 'LanguageId',
	'ParentTableKey' => 'LanguageId',
	'ParentPrefix' => 'lang',
	'AutoDelete' => true,
	'AutoClone' => true,

	'Fields' => Array(
	'Phrase' => Array('type' => 'string','required'=>1,'unique'=>Array('LanguageId'),'not_null' => '1','default' => ''),
	'Translation' => Array('type' => 'string','required'=>1,'not_null' => '1','default' => ''),
	'PhraseType' => Array('type' => 'int','required'=>1,'formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_PhraseType_Front',1=>'la_PhraseType_Admin',2=>'la_PhraseType_Both'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'),
	- 'PhraseId' => Array('type' => 'int','not_null' => '1','default' => ''),
	+ 'PhraseId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'LanguageId' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'LastChanged' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1','default' => '0'),
	'LastChangeIP' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Module' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field'=>'Name', 'option_title_field'=>'Name', 'not_null' => '1','default' => 'In-Portal'),
	),

	'VirtualFields' => Array(
	'PrimaryTranslation' => Array(),
	'LangFile' => Array(),
	'ImportOverwrite' => Array(),
	'DoNotEncode' => Array(),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_language_var.gif'),
	'Fields' => Array(
	'Phrase' => Array( 'title'=>'la_col_Label', 'data_block' => 'grid_checkbox_td'),
	'Translation' => Array( 'title'=>'la_col_Translation' ),
	'PrimaryTranslation' => Array( 'title'=>'la_col_PrimaryValue' ),
	'PhraseType' => Array( 'title'=>'la_col_PhraseType' ),
	'LastChanged' => Array( 'title'=>'la_col_LastChanged' ),
	'Module' => Array( 'title'=>'la_col_Module', 'filter_block' => 'grid_options_filter' ),
	),

	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.10.2/core/units/phrases/phrases_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.10.2.1
	\ No newline at end of property
	+1.10.2.2
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php (revision 7829)
	@@ -1,696 +1,710 @@
	<?php

	class kUnitConfigReader extends kBase {

	/**
	* Configs readed
	*
	* @var Array
	* @access private
	*/
	var $configData=Array();
	var $configFiles=Array();

	var $CacheExpired = false;

	var $prefixFiles = array();

	var $ProcessAllConfigs = false;
	var $FinalStage = false;
	var $StoreCache = false;
	var $AfterConfigProcessed = array();

	/**
	* Scan kernel and user classes
	* for available configs
	*
	* @access protected
	*/
	function Init($prefix,$special)
	{
	parent::Init($prefix,$special);
	}

	function CacheParsedData()
	{
	$event_manager =& $this->Application->recallObject('EventManager');
	$aggregator =& $this->Application->recallObject('TagsAggregator', 'kArray');

	$config_vars = Array(
	'SessionTimeout',
	'SessionCookieName',
	'SessionReferrerCheck',
	'CookieSessions',
	'UseCronForRegularEvent',
	'User_GuestGroup',
	'User_LoggedInGroup',
	'SessionTimeout',
	'UseModRewrite',
	'UseOutputCompression',
	'OutputCompressionLevel',
	);

	foreach ($config_vars as $var) {
	$this->Application->ConfigValue($var);
	}

	$cache = Array(
	'Factory.Files' => $this->Application->Factory->Files,
	'Factory.realClasses' => $this->Application->Factory->realClasses,
	'Factory.Dependencies' => $this->Application->Factory->Dependencies,
	'ConfigReader.prefixFiles' => $this->prefixFiles,
	'EventManager.buildEvents' => $event_manager->buildEvents,
	'EventManager.beforeRegularEvents' => $event_manager->beforeRegularEvents,
	'EventManager.afterRegularEvents' => $event_manager->afterRegularEvents,
	'EventManager.beforeHooks' => $event_manager->beforeHooks,
	'EventManager.afterHooks' => $event_manager->afterHooks,
	'TagsAggregator.data' => $aggregator->_Array,

	// the following caches should be reset based on admin interaction (adjusting config, enabling modules etc)
	'Application.Caches.ConfigVariables' => $this->Application->Caches['ConfigVariables'],
	'Application.ConfigCacheIds' => $this->Application->ConfigCacheIds,
	'Application.ConfigHash' => $this->Application->ConfigHash,
	'Application.ReplacementTemplates' => $this->Application->ReplacementTemplates,
	'Application.ModuleInfo' => $this->Application->ModuleInfo,
	);

	$conn =& $this->Application->GetADODBConnection();
	$conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("configs_parsed", '.$conn->qstr(serialize($cache)).', '.adodb_mktime().')');
	$conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("config_files", '.$conn->qstr(serialize($this->configFiles)).', '.adodb_mktime().')');
	unset($this->configFiles);
	}

	function RestoreParsedData()
	{
	$conn =& $this->Application->GetADODBConnection();
	$data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "configs_parsed"');
	if ($data && $data['Cached'] > 0 ) {
	$cache = unserialize($data['Data']);
	$this->Application->Factory->Files = $cache['Factory.Files'];
	$this->Application->Factory->realClasses = $cache['Factory.realClasses'];
	$this->Application->Factory->Dependencies = $cache['Factory.Dependencies'];
	$this->prefixFiles = $cache['ConfigReader.prefixFiles'];

	$event_manager =& $this->Application->recallObject('EventManager');
	$event_manager->buildEvents = $cache['EventManager.buildEvents'];
	$event_manager->beforeRegularEvents = $cache['EventManager.beforeRegularEvents'];
	$event_manager->afterRegularEvents = $cache['EventManager.afterRegularEvents'];
	$event_manager->beforeHooks = $cache['EventManager.beforeHooks'];
	$event_manager->afterHooks = $cache['EventManager.afterHooks'];

	$aggregator =& $this->Application->recallObject('TagsAggregator', 'kArray');
	$aggregator->_Array = $cache['TagsAggregator.data'];

	$this->Application->ConfigHash = $cache['Application.ConfigHash'];

	$this->Application->Caches['ConfigVariables'] = $cache['Application.ConfigCacheIds'];
	$this->Application->ConfigCacheIds = $cache['Application.ConfigCacheIds'];

	$this->Application->ReplacementTemplates = $cache['Application.ReplacementTemplates'];

	$this->Application->ModuleInfo = $cache['Application.ModuleInfo'];

	return true;

	}
	else return false;
	}

	function ResetParsedData($include_sections = false)
	{
	$conn =& $this->Application->GetADODBConnection();
	$conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = "configs_parsed"');

	if ($include_sections) {
	$conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = "sections_parsed"');
	}
	}

	function scanModules($folderPath, $cache = true)
	{
	if (defined('IS_INSTALL') && IS_INSTALL && !defined('FORCE_CONFIG_CACHE')) {
	// disable config caching during installation
	$cache = false;
	}

	if ($cache) {
	$restored = $this->RestoreParsedData();
	if ($restored) return;
	}

	$this->ProcessAllConfigs = true;

	$this->includeConfigFiles($folderPath, $cache);
	$this->ParseConfigs();

	// tell AfterConfigRead to store cache if neede
	// can't store it here beacuse AfterConfigRead needs ability to change config data
	$this->StoreCache = $cache;
	}

	function findConfigFiles($folderPath)
	{
	// if FULL_PATH = "/" ensure, that all "/" in $folderPath are not deleted
	$reg_exp = '/^'.preg_quote(FULL_PATH, '/').'/';
	$folderPath = preg_replace($reg_exp, '', $folderPath, 1); // this make sense, since $folderPath may NOT contain FULL_PATH

	$fh = opendir(FULL_PATH.$folderPath);
	while (($sub_folder = readdir($fh))) {
	$full_path = FULL_PATH.$folderPath.'/'.$sub_folder;
	if ($this->isDir($full_path)) {
	//the following is to exclude OLD, not removed files when upgrading to 'core'
	if (preg_match('/^\/kernel\/kernel4\//', $folderPath) \|\| ($folderPath == '/kernel/units' && file_exists(FULL_PATH.$this->getConfigName('/core/units/'.$sub_folder)))) {
	continue;
	}
	if (file_exists(FULL_PATH.$this->getConfigName($folderPath.'/'.$sub_folder))) {
	$this->configFiles[] = $this->getConfigName($folderPath.'/'.$sub_folder);
	}
	$this->findConfigFiles($full_path);

	// if (filemtime($full_path) > $cached) { }

	}
	}
	}

	function includeConfigFiles($folderPath, $cache = true)
	{
	$this->Application->refreshModuleInfo();

	$conn =& $this->Application->GetADODBConnection();
	$data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files"');
	if ($cache && $data) {
	$this->configFiles = unserialize($data['Data']);
	shuffle($this->configFiles);
	$files_cached = $data['Cached'];
	}
	else {
	$this->findConfigFiles($folderPath); // search from base directory
	}

	foreach ($this->configFiles as $filename)
	{
	$prefix = $this->PreloadConfigFile($filename);
	if (!$prefix) {
	trigger_error('Prefix not defined in config file '.$filename, E_USER_ERROR);
	}
	}
	}

	/**
	* Process all read config files - called ONLY when there is no cache!
	*
	*/
	function ParseConfigs()
	{
	$prioritized_configs = array();
	foreach ($this->configData as $prefix => $config) {
	if (isset($config['ConfigPriority'])) {
	$prioritized_configs[$prefix] = $config['ConfigPriority'];
	continue;
	}
	$this->parseConfig($prefix);
	}

	foreach ($this->configData as $prefix => $config) {
	$this->ProcessDependencies($prefix);
	$this->postProcessConfig($prefix, 'AggregateConfigs', 'sub_prefix');
	$clones = $this->postProcessConfig($prefix, 'Clones', 'prefix');
	}

	asort($prioritized_configs);
	foreach ($prioritized_configs as $prefix => $priority) {
	$this->parseConfig($prefix);
	}
	}

	function AfterConfigRead()
	{
	// if (!$this->ProcessAllConfigs) return ;
	$this->FinalStage = true;
	foreach ($this->configData as $prefix => $config) {
	if (in_array($prefix, $this->AfterConfigProcessed)) continue;
	$this->Application->HandleEvent( new kEvent($prefix.':OnAfterConfigRead') );
	$this->AfterConfigProcessed[] = $prefix;
	}
	if ($this->StoreCache) $this->CacheParsedData();
	}

	/**
	* Register nessasary classes
	* This method should only process the data which is cached!
	*
	* @param string $prefix
	* @access private
	*/
	function parseConfig($prefix)
	{
	$config =& $this->configData[$prefix];
	$event_manager =& $this->Application->recallObject('EventManager');

	$register_classes = getArrayValue($config,'RegisterClasses');
	if (!$register_classes) $register_classes = Array();
	$class_params=Array('ItemClass','ListClass','EventHandlerClass','TagProcessorClass');
	foreach($class_params as $param_name)
	{
	if ( !(isset($config[$param_name]) ) ) continue;
	$config[$param_name]['pseudo'] = $this->getPrefixByParamName($param_name,$prefix);
	$register_classes[] = $config[$param_name];
	}

	foreach($register_classes as $class_info)
	{
	$require_classes = getArrayValue($class_info, 'require_classes');
	if ($require_classes) {
	if (!is_array($require_classes)) {
	$require_classes = array($require_classes);
	}
	if (!isset($config['_Dependencies'][$class_info['class']])) {
	$config['_Dependencies'][$class_info['class']] = array();
	}
	$config['_Dependencies'][$class_info['class']] = array_merge($config['_Dependencies'][$class_info['class']], $require_classes);
	}
	$this->Application->registerClass(
	$class_info['class'],
	$config['BasePath'].'/'.$class_info['file'],
	$class_info['pseudo']/*,
	getArrayValue($class_info, 'require_classes')*/
	);
	if (getArrayValue($class_info, 'build_event')) {
	$event_manager->registerBuildEvent($class_info['pseudo'],$class_info['build_event']);
	}
	}

	$regular_events = getArrayValue($config, 'RegularEvents');
	if($regular_events)
	{
	foreach($regular_events as $short_name => $regular_event_info)
	{
	$event_manager->registerRegularEvent( $short_name, $config['Prefix'].':'.$regular_event_info['EventName'], $regular_event_info['RunInterval'], $regular_event_info['Type'] );
	}
	}

	$hooks = getArrayValue($config, 'Hooks');
	if (is_array($hooks) && count($hooks) > 0) {
	foreach ($hooks as $hook) {
	if (isset($config['ParentPrefix']) && $hook['HookToPrefix'] == $config['ParentPrefix']) {
	trigger_error('Depricated Hook Usage [prefix: <b>'.$config['Prefix'].'</b>; do_prefix: <b>'.$hook['DoPrefix'].'</b>] use <b>#PARENT#</b> as <b>HookToPrefix</b> value, where HookToPrefix is same as ParentPrefix', E_USER_NOTICE);
	}

	if ($hook['HookToPrefix'] == '') {
	$hook['HookToPrefix'] = $config['Prefix']; // new: set hooktoprefix to current prefix if not set
	}

	if (isset($config['ParentPrefix'])) {
	// new: allow to set hook to parent prefix what ever it is
	if ($hook['HookToPrefix'] == '#PARENT#') {
	$hook['HookToPrefix'] = $config['ParentPrefix'];
	}

	if ($hook['DoPrefix'] == '#PARENT#') {
	$hook['DoPrefix'] = $config['ParentPrefix'];
	}
	}
	elseif ($hook['HookToPrefix'] == '#PARENT#' \|\| $hook['DoPrefix'] == '#PARENT#') {
	continue; // we need parent prefix but it's not set !
	}

	$do_prefix = $hook['DoPrefix'] == '' ? $config['Prefix'] : $hook['DoPrefix'];

	if ( !is_array($hook['HookToEvent']) ) {
	$hook_events = Array( $hook['HookToEvent'] );
	}
	else {
	$hook_events = $hook['HookToEvent'];
	}
	foreach ($hook_events as $hook_event) {
	$this->Application->registerHook($hook['HookToPrefix'], $hook['HookToSpecial'], $hook_event, $hook['Mode'], $do_prefix, $hook['DoSpecial'], $hook['DoEvent'], $hook['Conditional']);
	}
	}
	}

	if ( is_array(getArrayValue($config, 'AggregateTags')) ) {
	foreach ($config['AggregateTags'] as $aggregate_tag) {
	if (isset($config['ParentPrefix'])) {
	if ($aggregate_tag['AggregateTo'] == $config['ParentPrefix']) {
	trigger_error('Depricated Aggregate Tag Usage [prefix: <b>'.$config['Prefix'].'</b>; AggregateTo: <b>'.$aggregate_tag['AggregateTo'].'</b>] use <b>#PARENT#</b> as <b>AggregateTo</b> value, where AggregateTo is same as ParentPrefix', E_USER_NOTICE);
	}

	if ($aggregate_tag['AggregateTo'] == '#PARENT#') {
	$aggregate_tag['AggregateTo'] = $config['ParentPrefix'];
	}
	}
	$aggregate_tag['LocalPrefix'] = $config['Prefix'];
	$this->Application->registerAggregateTag($aggregate_tag);
	}
	}

	if (isset($config['ReplacementTemplates']) && $config['ReplacementTemplates']) {
	// replacement templates defined in this config
	$this->Application->ReplacementTemplates = array_merge_recursive2($this->Application->ReplacementTemplates, $config['ReplacementTemplates']);
	}

	- if ( $this->Application->isDebugMode() && constOn('DBG_VALIDATE_CONFIGS') && isset($config['TableName']) )
	- {
	- global $debugger;
	- $tablename = $config['TableName'];
	+ if ( $this->Application->isDebugMode(false) && constOn('DBG_VALIDATE_CONFIGS') && isset($config['TableName']) ) {
	+ $this->ValidateConfig($prefix);
	+ }
	+ }

	- $conn =& $this->Application->GetADODBConnection();
	-
	- $table_found = $conn->Query('SHOW TABLES LIKE "'.$tablename.'"');
	- if (!$table_found) {
	- // config present, but table missing, strange
	- $debugger->appendHTML("<b class='debug_error'>Config Warning: </b>Table <strong>$tablename</strong> missing, but prefix <b>".$config['Prefix']."</b> requires it!");
	- safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	- return ;
	- }
	-
	- $res = $conn->Query("DESCRIBE $tablename");
	-
	- foreach ($res as $field) {
	- $f_name = $field['Field'];
	- if (getArrayValue($config, 'Fields')) {
	- if (preg_match('/l[\d]+_[\w]/', $f_name)) {
	- // skip multilingual fields
	- continue;
	- }
	-
	- if (!array_key_exists ($f_name, $config['Fields'])) {
	- $debugger->appendHTML("<b class='debug_error'>Config Warning: </b>Field <strong>$f_name</strong> exists in the database, but is not defined in config file for prefix <b>".$config['Prefix']."</b> !");
	- safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	- }
	- else {
	- $options = $config['Fields'][$f_name];
	- if ($field['Null'] != 'YES') {
	- // MySQL5 for null returns "NO", but MySQL4 returns ""
	- if ( $f_name != $config['IDField'] && !isset($options['not_null']) && !isset($options['required']) ) {
	- $debugger->appendHTML("<b class='debug_error'>Config Error: </b>Field <strong>$f_name</strong> in config for prefix <b>".$config['Prefix']."</b> is NOT NULL in the database, but is not configured as not_null or required !");
	- safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	- }
	- if ( isset($options['not_null']) && !isset($options['default']) ) {
	- $debugger->appendHTML("<b class='debug_error'>Config Error: </b>Field <strong>$f_name</strong> in config for prefix <b>".$config['Prefix']."</b> is described as NOT NULL, but does not have DEFAULT value !");
	- safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	- }
	-
	- if (!isset($options['default'])) {
	- $debugger->appendHTML("<b class='debug_error'>Config Error: </b>Default value for field <strong>$f_name</strong> in config for prefix <b>".$config['Prefix']."</b> not set !");
	- safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	- }
	- else if ($options['default'] != '#NOW#' && $field['Default'] !== (string)$options['default']) {
	- $debugger->appendHTML("<b class='debug_error'>Config Error: </b>Default value for field <strong>$f_name</strong> (".var_export($options['default'], true).") in config for prefix <b>".$config['Prefix']."</b> differs from default value from field in database (".var_export($field['Default'], true).") !");
	- $debugger->dumpVars($field['Default'], $options['default'], 'STRICT');
	- safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	- }
	-
	- // check that all idfields have default values & are not_null!!!
	- }
	+ function ValidateConfig($prefix)
	+ {
	+ global $debugger;
	+
	+ $config =& $this->configData[$prefix];
	+
	+ $tablename = $config['TableName'];

	+ $conn =& $this->Application->GetADODBConnection();
	+
	+ $table_found = $conn->Query('SHOW TABLES LIKE "'.$tablename.'"');
	+ if (!$table_found) {
	+ // config present, but table missing, strange
	+ $debugger->appendHTML("<b class='debug_error'>Config Warning: </b>Table <strong>$tablename</strong> missing, but prefix <b>".$config['Prefix']."</b> requires it!");
	+ safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	+ return ;
	+ }
	+
	+ $res = $conn->Query("DESCRIBE $tablename");
	+
	+ $config_link = $debugger->getFileLink(FULL_PATH.$this->prefixFiles[$config['Prefix']], 1, $config['Prefix']);
	+
	+ foreach ($res as $field) {
	+ $f_name = $field['Field'];
	+ if (getArrayValue($config, 'Fields')) {
	+ if (preg_match('/l[\d]+_[\w]/', $f_name)) {
	+ // skip multilingual fields
	+ continue;
	+ }
	+
	+ if (!array_key_exists ($f_name, $config['Fields'])) {
	+ $debugger->appendHTML("<b class='debug_error'>Config Warning: </b>Field <strong>$f_name</strong> exists in the database, but is not defined in config file for prefix <b>".$config_link."</b> !");
	+ safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	+ }
	+ else {
	+ $options = $config['Fields'][$f_name];
	+ if ($field['Null'] != 'YES') {
	+ // MySQL5 for null returns "NO", but MySQL4 returns ""
	+ if ( $f_name != $config['IDField'] && !isset($options['not_null']) && !isset($options['required']) ) {
	+ $debugger->appendHTML("<b class='debug_error'>Config Error: </b>Field <strong>$f_name</strong> in config for prefix <b>".$config_link."</b> is NOT NULL in the database, but is not configured as not_null or required !");
	+ safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	+ }
	+ if ( isset($options['not_null']) && !isset($options['default']) ) {
	+ $debugger->appendHTML("<b class='debug_error'>Config Error: </b>Field <strong>$f_name</strong> in config for prefix <b>".$config_link."</b> is described as NOT NULL, but does not have DEFAULT value !");
	+ safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	+ }
	+
	+ if (!isset($options['default'])) {
	+ $debugger->appendHTML("<b class='debug_error'>Config Error: </b>Default value for field <strong>$f_name</strong> in config for prefix <b>".$config_link."</b> not set !");
	+ safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	+ }
	+ elseif ($f_name == $config['IDField'] && $options['default'] !== 0) {
	+ $debugger->appendHTML("<b class='debug_error'>Config Error: </b>Default value for field <span class='debug_error'>IDField</span> <strong>$f_name</strong> (".var_export($options['default'], true).") in config for prefix <b>".$config_link."</b> differs from default value from field in database (".var_export($field['Default'], true).") !");
	+ safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	+ }
	+ else if ($options['default'] != '#NOW#' && $field['Default'] !== (string)$options['default']) {
	+ $debugger->appendHTML("<b class='debug_error'>Config Error: </b>Default value for field <strong>$f_name</strong> (".var_export($options['default'], true).") in config for prefix <b>".$config_link."</b> differs from default value from field in database (".var_export($field['Default'], true).") !");
	+// $debugger->dumpVars($field['Default'], $options['default'], 'STRICT');
	+ safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	+ }
	+
	+ // check that all idfields have default values & are not_null!!!
	}
	+
	}
	}
	}
	+
	}
	-
	+
	function ProcessDependencies($prefix)
	{
	$config =& $this->configData[$prefix];
	$deps = getArrayValue($config, '_Dependencies');
	if (!$deps) return ;

	foreach ($deps as $real_class => $requires) {
	foreach ($requires as $class) {
	$this->Application->registerDependency($real_class, $class);
	}
	}
	unset($config['_Dependencies']);
	}

	function postProcessConfig($prefix, $config_key, $dst_prefix_var)
	{
	$main_config =& $this->configData[$prefix];
	$sub_configs = getArrayValue($main_config, $config_key);
	if (!$sub_configs) {
	return array();
	}
	unset($main_config[$config_key]);

	$processed = array();
	foreach ($sub_configs as $sub_prefix => $sub_config) {
	if ($config_key == 'AggregateConfigs' && !isset($this->configData[$sub_prefix])) {
	$this->loadConfig($sub_prefix);
	}
	$sub_config['Prefix'] = $sub_prefix;
	$this->configData[$sub_prefix] = array_merge_recursive2($this->configData[$$dst_prefix_var], $sub_config);

	// when merging empty array to non-empty results non-empty array, but empty is required
	foreach ($sub_config as $sub_key => $sub_value) {
	if (!$sub_value) {
	unset($this->configData[$sub_prefix][$sub_key]);
	}
	}
	if ($config_key == 'Clones') {
	$this->prefixFiles[$sub_prefix] = $this->prefixFiles[$prefix];
	}

	$this->postProcessConfig($sub_prefix, $config_key, $dst_prefix_var);
	if ($config_key == 'AggregateConfigs') {
	$processed = array_merge($this->postProcessConfig($sub_prefix, 'Clones', 'prefix'), $processed);
	}
	elseif ($this->ProcessAllConfigs) {
	$this->parseConfig($sub_prefix);
	}
	array_push($processed, $sub_prefix);
	}

	if (!$prefix) {
	// configs, that used only for cloning & not used ifself
	unset($this->configData[$prefix]);
	}
	return array_unique($processed);
	}

	function PreloadConfigFile($filename)
	{
	$config_found = file_exists(FULL_PATH.$filename) && $this->configAllowed($filename);

	if( defined('DEBUG_MODE') && DEBUG_MODE && constOn('DBG_PROFILE_INCLUDES') )
	{
	if ( in_array($filename, get_required_files()) ) return;
	global $debugger;
	if($config_found) {
	$file = FULL_PATH.$filename;
	$debugger->ProfileStart('inc_'.crc32($file), $file);
	include_once($file);
	$debugger->ProfileFinish('inc_'.crc32($file));
	$debugger->profilerAddTotal('includes', 'inc_'.crc32($file));
	}
	}
	else
	{
	if ($config_found) include_once(FULL_PATH.$filename);
	}

	if ($config_found) {
	if (isset($config) && $config) {
	// config file is included for 1st time -> save it's content for future processing
	$prefix = isset($config['Prefix']) ? $config['Prefix'] : '';

	preg_match('/\/(.*)\//U', $filename, $rets);
	$config['ModuleFolder'] = $rets[1];
	$config['BasePath'] = dirname(FULL_PATH.$filename);
	if (isset($config['AdminTemplatePath'])) {
	// append template base folder for admin templates path of this prefix
	$module_templates = $rets[1] == 'core' ? 'in-portal/' : $rets[1].'/';
	$config['AdminTemplatePath'] = $module_templates.$config['AdminTemplatePath'];
	}
	$this->configData[$prefix] = $config;
	$this->prefixFiles[$prefix] = $filename;
	return $prefix;
	}
	elseif ($prefix = array_search($filename, $this->prefixFiles)) {
	// attempt is made to include config file twice or more, but include_once prevents that,
	// but file exists on hdd, then it is already saved to all required arrays, just return it's prefix
	return $prefix;
	}
	}
	return 'dummy';
	}

	function loadConfig($prefix)
	{
	if (!isset($this->prefixFiles[$prefix])) {
	if ($this->Application->isDebugMode()) $this->Application->Debugger->appendTrace();
	trigger_error('Configuration file for prefix <b>'.$prefix.'</b> is unknown', E_USER_ERROR);
	return ;
	}
	$file = $this->prefixFiles[$prefix];
	$prefix = $this->PreloadConfigFile($file);

	$clones = $this->postProcessConfig($prefix, 'AggregateConfigs', 'sub_prefix');
	$clones = array_merge($this->postProcessConfig($prefix, 'Clones', 'prefix'), $clones);

	if ($this->FinalStage) {
	array_unshift($clones, $prefix);
	$clones = array_unique($clones);
	foreach ($clones as $a_prefix) {
	$this->Application->HandleEvent( new kEvent($a_prefix.':OnAfterConfigRead') );
	}
	}
	}

	/**
	* Reads unit (specified by $prefix)
	* option specified by $option
	*
	* @param string $prefix
	* @param string $name
	* @param mixed $default
	* @return string
	* @access public
	*/
	function getUnitOption($prefix, $name, $default = false)
	{
	if (preg_match('/(.)\.(.)/', $prefix, $rets)) {
	if (!isset($this->configData[$rets[1]])) {
	$this->loadConfig($rets[1]);
	}
	$ret = isset($this->configData[$rets[1]][$name][$rets[2]]) ? $this->configData[$rets[1]][$name][$rets[2]] : false;
	// $ret = getArrayValue($this->configData, $rets[1], $name, $rets[2]);
	}
	else {
	if (!isset($this->configData[$prefix])) {
	$this->loadConfig($prefix);
	}
	$ret = isset($this->configData[$prefix][$name]) ? $this->configData[$prefix][$name] : false;
	// $ret = getArrayValue($this->configData, $prefix, $name);
	}
	return $ret === false ? $default : $ret;
	}

	/**
	* Read all unit with $prefix options
	*
	* @param string $prefix
	* @return Array
	* @access public
	*/
	function getUnitOptions($prefix)
	{
	if (!isset($this->configData[$prefix])) {
	$this->loadConfig($prefix);
	}

	return $this->configData[$prefix];
	}

	/**
	* Set's new unit option value
	*
	* @param string $prefix
	* @param string $name
	* @param string $value
	* @access public
	*/
	function setUnitOption($prefix, $name, $value)
	{
	if (preg_match('/(.)\.(.)/', $prefix, $rets)) {
	if (!isset($this->configData[$rets[1]])) {
	$this->loadConfig($rets[1]);
	}
	$this->configData[$rets[1]][$name][$rets[2]] = $value;
	}
	else {
	if (!isset($this->configData[$prefix])) {
	$this->loadConfig($prefix);
	}
	$this->configData[$prefix][$name] = $value;
	}

	}

	function getPrefixByParamName($paramName,$prefix)
	{
	$pseudo_class_map=Array(
	'ItemClass'=>'%s',
	'ListClass'=>'%s_List',
	'EventHandlerClass'=>'%s_EventHandler',
	'TagProcessorClass'=>'%s_TagProcessor'
	);
	return sprintf($pseudo_class_map[$paramName],$prefix);
	}

	/**
	* Get's config file name based
	* on folder name supplied
	*
	* @param string $folderPath
	* @return string
	* @access private
	*/
	function getConfigName($folderPath)
	{
	return $folderPath.'/'.basename($folderPath).'_config.php';
	}

	/**
	* is_dir ajustment to work with
	* directory listings too
	*
	* @param string $folderPath
	* @return bool
	* @access private
	*/
	function isDir($folderPath)
	{
	$base_name = basename($folderPath);
	$ret = !( $base_name == '.' \|\| $base_name == '..' );
	return $ret && is_dir($folderPath);
	}

	/**
	* Checks if config file is allowed for includion (if module of config is installed)
	*
	* @param string $config_path relative path from in-portal directory
	*/
	function configAllowed($config_path)
	{
	if (defined('IS_INSTALL') && IS_INSTALL) {
	// at installation start no modules in db and kernel configs could not be read
	return true;
	}

	if (preg_match('#/plugins/\|/core\|/proj-\|/custom/#', $config_path)) {
	return true;
	}

	$module_found = false;
	if (!$this->Application->ModuleInfo) return false;

	foreach($this->Application->ModuleInfo as $module_name => $module_info)
	{
	$module_path = '/'.$module_info['Path'];
	if (preg_match('/^'.preg_quote($module_path, '/').'/', $config_path)) {
	// if (substr($config_path, 0, strlen($module_path)) == $module_path) {
	// config file path starts with module folder path
	$module_found = true;
	break;
	}
	}
	return $module_found;
	}

	/**
	* Returns true if config exists and is allowed for reading
	*
	* @param string $prefix
	* @return bool
	*/
	function prefixRegistred($prefix)
	{
	return isset($this->prefixFiles[$prefix]) ? true : false;
	}

	}


	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.65.2/core/kernel/utility/unit_config_reader.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.65.2.2
	\ No newline at end of property
	+1.65.2.3
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.3.2/core/units/email_messages/email_messages_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.3.2/core/units/email_messages/email_messages_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.3.2/core/units/email_messages/email_messages_config.php (revision 7829)
	@@ -1,89 +1,89 @@
	<?php

	$config = Array(
	'Prefix' => 'emailmessages',
	'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'EmailMessagesEventHandler','file'=>'email_messages_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
	'AutoLoad' => true,

	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),

	'IDField' => 'EmailMessageId',

	'TitleField' => 'Subject',

	'TableName' => TABLE_PREFIX.'EmailMessage',

	'ListSQLs' => Array(
	''=>'
	SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'Events
	ON '.TABLE_PREFIX.'Events.EventId = %1$s.EventId
	'
	),

	'ItemSQLs' => Array(
	''=>'
	SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'Events
	ON '.TABLE_PREFIX.'Events.EventId = %1$s.EventId
	'
	),

	'ForeignKey' => 'LanguageId',
	'ParentTableKey' => 'LanguageId',
	'ParentPrefix' => 'lang',
	'AutoDelete' => true,
	'AutoClone' => true,

	'CalculatedFields' => array(
	'' => array(
	'Description' => TABLE_PREFIX.'Events.Description',
	'Module' => TABLE_PREFIX.'Events.Module',
	'Type' => TABLE_PREFIX.'Events.Type',
	),
	),

	'Fields' => Array (
	- 'EmailMessageId' => Array(),
	+ 'EmailMessageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Template' => Array('type' => 'string','default' => ''),
	'ReplacementTags' => Array ('type' => 'string', 'not_null' => 1, 'default' => 'a:0:{}'),
	'MessageType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'not_null' => '1','default' => 'text'),
	'LanguageId' => Array('type' => 'int', 'not_null' => '1', 'default' => '0'),
	'EventId' => Array('type' => 'int', 'not_null' => '1', 'default' => '0'),
	'Subject' => Array('type' => 'string'),
	),

	'VirtualFields' => Array(
	'Headers' => Array('type'=>'string'),
	'Body' => Array('type'=>'string'),
	'Description' => Array('type'=>'string', 'sql_filter_type'=>'having'),
	'Module' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Type' => Array('formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif'),
	'Fields' => Array(
	'Subject' => Array( 'title'=>'la_col_Subject'),
	'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td'),
	'Type' => Array( 'title'=>'la_col_Type'),
	),

	),
	),


	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.3.2/core/units/email_messages/email_messages_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.3.2.2
	\ No newline at end of property
	+1.3.2.3
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.7.2/core/units/email_events/email_events_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.7.2/core/units/email_events/email_events_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.7.2/core/units/email_events/email_events_config.php (revision 7829)
	@@ -1,101 +1,101 @@
	<?php

	$config = Array(
	'Prefix' => 'emailevents',
	'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'EmailEventsEventsHandler','file'=>'email_events_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
	'AutoLoad' => true,

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

	'IDField' => 'EventId',

	'StatusField' => Array('Enabled'),

	'TitleField' => 'Event',

	'TitlePresets' => Array(
	'email_settings_list' => Array('prefixes' => Array('emailevents.module_List'), 'format' => '!la_title_EmailSettings! (#emailevents.module_recordcount#)'),
	),

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array('show_enabled','show_disabled','show_frontonly'), 'type' => WHERE_FILTER),
	),
	'Filters' => Array(
	'show_enabled' => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
	'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ),
	'show_frontonly' => Array('label' => 'la_Text_FrontOnly', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 2' ),
	)
	),

	'TableName' => TABLE_PREFIX.'Events',

	'CalculatedFields' => Array(
	'' => Array (
	'FromUser' => 'u.Login',
	)
	),

	'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s
	FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.FromUserId = u.PortalUserId',
	), // key - special, value - list select sql),

	'ItemSQLs' => Array( ''=>'SELECT * FROM %s'),

	'ListSortings' => Array(
	'' => Array('Sorting' => Array('Module' => 'asc', 'Description' => 'asc') ),

	'module' => Array('Sorting' => Array('Description' => 'asc') ),
	),

	'Fields' => Array(
	- 'EventId' => Array(),
	+ 'EventId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Event' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Enabled' => Array('type'=>'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled', 2 => 'la_Text_FrontOnly'), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1),
	'FromUserId' => Array('formatter' => 'kLEFTFormatter','options' => Array(-1=>'root'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required'=>1, 'not_null' => 1, 'default' => -1),
	'Module' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Type' => Array('formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1),
	),
	'VirtualFields' => Array(
	'FromUser' => Array(),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif'),
	'Fields' => Array(
	'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td'),
	'Event' => Array( 'title'=>'la_col_Event'),
	'Module' => Array( 'title'=>'la_col_Module'),
	'Type' => Array( 'title'=>'la_col_Type'),
	'Enabled' => Array( 'title'=>'la_col_Status'),
	),

	),

	'EmailSettings' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif'),
	'Fields' => Array(
	'Description' => Array('title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td' ),
	'Type' => Array('title'=>'la_col_Type'),
	'Enabled' => Array('title'=>'la_col_Status'),
	'FromUser' => Array('title'=>'la_col_FromToUser'),
	),
	),
	),
	);

	if (defined('DEBUG_MODE') && DEBUG_MODE) {
	$config['Grids']['EmailSettings']['Fields']['EventId'] = Array('title' => 'la_col_Id');
	}

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.7.2/core/units/email_events/email_events_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.7
	\ No newline at end of property
	+1.7.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.15.2/core/units/configuration/configuration_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.15.2/core/units/configuration/configuration_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.15.2/core/units/configuration/configuration_config.php (revision 7829)
	@@ -1,78 +1,80 @@
	<?php

	$config = Array(
	'Prefix' => 'conf',
	'ItemClass' => Array('class'=>'ConfigurationItem','file'=>'configuration.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'ConfigurationEventHandler','file'=>'configuration_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'ConfigurationTagProcessor','file'=>'configuration_tag_processor.php','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	'Hooks' => Array(),
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	+ 4 => 'mode',
	),

	- 'IDField' => 'VariableName',
	+ 'IDField' => 'VariableId',

	'TitlePresets' => Array(
	'default' => Array('tag_params' => Array('conf' => Array('per_page' => -1))),

	'config_list_general' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
	'config_list_output' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
	'config_list_contacts' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),

	'config_list_categories' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
	'config_list_users' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
	),

	'TableName' => TABLE_PREFIX.'ConfigurationValues',

	'ListSQLs' => Array('' => ' SELECT %1$s.* %2$s
	FROM '.TABLE_PREFIX.'ConfigurationAdmin ca
	LEFT JOIN %1$s USING(VariableName)'),

	'ItemSQLs' => Array('' => ' SELECT %1$s.* %2$s
	FROM '.TABLE_PREFIX.'ConfigurationAdmin ca
	LEFT JOIN %1$s USING(VariableName)'),

	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('DisplayOrder' => 'asc', 'GroupDisplayOrder' => 'asc'),
	)
	),

	'CalculatedFields' => Array (
	'' => Array (
	'heading' => 'ca.heading',
	'prompt' => 'ca.prompt',
	'element_type' => 'ca.element_type',
	'ValueList' => 'ca.ValueList',
	'DisplayOrder' => 'ca.DisplayOrder',
	'GroupDisplayOrder' => 'ca.GroupDisplayOrder',
	'Install' => 'ca.Install',
	),
	),

	'Fields' => Array(
	- 'VariableName' => Array('type' => 'string','not_null' => '1','default' => ''),
	- 'VariableValue' => array('type'=>'string', 'default'=>''),
	- 'ModuleOwner' => array('type'=>'string', 'default'=>'In-Portal'),
	- 'Section' => array('type'=>'string','not_null' => '1','default'=>''),
	+ 'VariableId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
	+ 'VariableName' => Array('type' => 'string','not_null' => '1','default' => ''),
	+ 'VariableValue' => Array('type'=>'string', 'default'=>''),
	+ 'ModuleOwner' => Array('type'=>'string', 'default'=>'In-Portal'),
	+ 'Section' => Array('type'=>'string','not_null' => '1','default'=>''),
	),

	'VirtualFields' => Array(
	'heading' => Array('type' => 'string', 'default' => ''),
	'prompt' => Array('type' => 'string', 'default' => ''),
	'element_type' => Array('type' => 'string', 'not_null' => '1', 'default' => ''),
	'ValueList' => Array('type' => 'string', 'default' => ''),
	'DisplayOrder' => Array('type' => 'double', 'not_null' => '1', 'default' => 0),
	'GroupDisplayOrder' => Array('type' => 'double', 'not_null' => '1', 'default' => 0),
	'Install' => Array('type' => 'int', 'not_null' => '1', 'default' => 1),
	),

	'Grids' => Array(),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.15.2/core/units/configuration/configuration_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.15
	\ No newline at end of property
	+1.15.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.4.2/core/units/permissions/permissions_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.4.2/core/units/permissions/permissions_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.4.2/core/units/permissions/permissions_config.php (revision 7829)
	@@ -1,88 +1,88 @@
	<?php

	$config = Array(
	'Prefix' => 'perm',
	'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'PermissionsEventHandler','file'=>'permissions_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'PermissionsTagProcessor','file'=>'permissions_tag_processor.php','build_event'=>'OnBuild'),
	'AutoLoad' => true,

	'Clones' => Array(
	'c-perm' => Array(
	'Constrain' => 'Type = 0', // non-system
	'ParentPrefix' => 'c',
	'ForeignKey' => 'CatId',
	'ParentTableKey' => 'CategoryId',

	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => true,
	'HookToPrefix' => '#PARENT#',
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnPreSave'),
	'DoPrefix' => '',
	'DoSpecial' => '*',
	'DoEvent' => 'OnCategorySavePermissions',
	),
	),
	),

	'g-perm' => Array(
	'Constrain' => 'Type = 1', // system
	'ParentPrefix' => 'g',
	'ForeignKey' => 'GroupId',
	'ParentTableKey' => 'GroupId',

	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => true,
	'HookToPrefix' => '#PARENT#',
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnPreSave'),
	'DoPrefix' => '',
	'DoSpecial' => '*',
	'DoEvent' => 'OnGroupSavePermissions',
	),
	),
	),
	),

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

	'IDField' => 'PermissionId',

	'StatusField' => Array('PermissionValue'),

	'TitleField' => 'Permission',

	'TableName' => TABLE_PREFIX.'Permissions',

	'AutoDelete' => false,
	'AutoClone' => false,

	'ListSQLs' => Array('' => 'SELECT %1$s.* %2$s FROM %1$s'),
	'ItemSQLs' => Array('' => 'SELECT %1$s.* %2$s FROM %1$s'),

	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('Permission' => 'asc'),
	)
	),
	'Fields' => Array(
	- 'PermissionId' => Array(),
	+ 'PermissionId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Permission' => Array('type' => 'string','not_null' => '1','default' => ''),
	'GroupId' => Array('type' => 'int','default' => '0'),
	'PermissionValue' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'Type' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'CatId' => Array('type' => 'int','not_null' => '1','default' => '0'),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.4.2/core/units/permissions/permissions_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.4
	\ No newline at end of property
	+1.4.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.4.2/core/units/user_groups/user_groups_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.4.2/core/units/user_groups/user_groups_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.4.2/core/units/user_groups/user_groups_config.php (revision 7829)
	@@ -1,77 +1,77 @@
	<?php

	$config = Array(
	'Prefix' => 'ug',
	'Clones' => Array(
	'g-ug' => Array(
	'ParentPrefix' => 'g',
	'ForeignKey' => 'GroupId',
	'ParentTableKey' => 'GroupId',
	),

	'u-ug' => Array(
	'ParentPrefix' => 'u',
	'ForeignKey' => 'PortalUserId',
	'ParentTableKey' => 'PortalUserId',
	),
	),

	'ItemClass' => Array('class'=>'UserGroups_DBItem','file'=>'user_groups_dbitem.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'UserGroupsEventHandler','file'=>'user_groups_eh.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
	'AutoLoad' => true,

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

	'IDField' => 'GroupId',

	'TableName' => TABLE_PREFIX.'UserGroup',

	'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId'),

	'ItemSQLs' => Array( ''=>' SELECT %1$s.* %2$s FROM %1$s
	LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId'),

	'AutoDelete' => true,
	'AutoClone' => true,

	'CalculatedFields' => Array (
	'' => Array(
	'GroupName' => 'g.Name',
	),
	),

	'Fields' => Array(
	- 'PortalUserId' => Array('type' => 'int'),
	- 'GroupId' => Array('type' => 'int', 'not_null' => 1, 'default' => 1),
	+ 'PortalUserId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	+ 'GroupId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'MembershipExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
	'PrimaryGroup' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
	'ExpirationReminderSent' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	),

	'VirtualFields' => Array (
	'GroupName' => Array('type' => 'string'),
	),


	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array ('default' => 'icon16_group.gif'),
	'Fields' => Array(
	'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'),
	'GroupName' => Array ('title'=>'la_col_GroupName'),
	'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup'),
	'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td'),
	),
	),
	),

	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.4.2/core/units/user_groups/user_groups_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.4
	\ No newline at end of property
	+1.4.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.4.2/core/install/install_schema.sql
	===================================================================
	--- branches/unlabeled/unlabeled-1.4.2/core/install/install_schema.sql (revision 7828)
	+++ branches/unlabeled/unlabeled-1.4.2/core/install/install_schema.sql (revision 7829)
	@@ -1,423 +1,423 @@
	CREATE TABLE PermissionConfig (
	PermissionConfigId int(11) NOT NULL auto_increment,
	PermissionName varchar(30) NOT NULL default '',
	Description varchar(255) NOT NULL default '',
	ErrorMessage varchar(255) NOT NULL default '',
	ModuleId varchar(20) NOT NULL default '0',
	PRIMARY KEY (PermissionConfigId),
	KEY PermissionName (PermissionName)
	);

	CREATE TABLE Permissions (
	PermissionId int(11) NOT NULL auto_increment,
	Permission varchar(255) NOT NULL default '',
	GroupId int(11) default '0',
	PermissionValue int(11) NOT NULL default '0',
	`Type` tinyint(4) NOT NULL default '0',
	CatId int(11) NOT NULL default '0',
	PRIMARY KEY (PermissionId),
	UNIQUE KEY PermIndex (Permission,GroupId,CatId,`Type`)
	);

	CREATE TABLE CustomField (
	CustomFieldId int(11) NOT NULL auto_increment,
	Type int(11) NOT NULL default '0',
	FieldName varchar(255) NOT NULL default '',
	FieldLabel varchar(40) default NULL,
	Heading varchar(60) default NULL,
	Prompt varchar(60) default NULL,
	ElementType varchar(50) NOT NULL default '',
	ValueList varchar(255) default NULL,
	DisplayOrder int(11) NOT NULL default '0',
	OnGeneralTab tinyint(4) NOT NULL default '0',
	IsSystem tinyint(3) unsigned NOT NULL default '0',
	PRIMARY KEY (CustomFieldId),
	KEY Type (Type)
	);

	CREATE TABLE ConfigurationAdmin (
	VariableName varchar(80) NOT NULL default '',
	heading varchar(255) default NULL,
	prompt varchar(255) default NULL,
	element_type varchar(20) NOT NULL default '',
	validation varchar(255) default NULL,
	ValueList text,
	DisplayOrder double NOT NULL default '0',
	GroupDisplayOrder double NOT NULL default '0',
	Install int(11) NOT NULL default '1',
	PRIMARY KEY (VariableName)
	);

	CREATE TABLE ConfigurationValues (
	VariableId int(11) NOT NULL auto_increment,
	VariableName varchar(255) NOT NULL default '',
	VariableValue varchar(255) default NULL,
	ModuleOwner varchar(20) default 'In-Portal',
	Section varchar(255) NOT NULL default '',
	PRIMARY KEY (VariableId),
	UNIQUE KEY VariableName (VariableName)
	);

	CREATE TABLE EmailMessage (
	EmailMessageId int(10) NOT NULL auto_increment,
	Template longtext,
	ReplacementTags text,
	MessageType enum('html','text') NOT NULL default 'text',
	LanguageId int(11) NOT NULL default '0',
	EventId int(11) NOT NULL default '0',
	`Subject` text,
	PRIMARY KEY (EmailMessageId)
	);

	CREATE TABLE EmailQueue (
	Subject text,
	toaddr text,
	fromaddr text,
	message blob,
	headers blob,
	queued timestamp NOT NULL
	);

	CREATE TABLE EmailSubscribers (
	EmailMessageId int(11) NOT NULL default '0',
	PortalUserId int(11) NOT NULL default '0'
	);

	CREATE TABLE Events (
	EventId int(11) NOT NULL auto_increment,
	Event varchar(40) NOT NULL default '',
	Enabled int(11) NOT NULL default '1',
	- FromUserId int(11) NOT NULL default '0',
	+ FromUserId int(11) NOT NULL default '-1',
	Module varchar(40) NOT NULL default '',
	Description varchar(255) NOT NULL default '',
	Type int(11) NOT NULL default '0',
	PRIMARY KEY (EventId)
	);

	CREATE TABLE IdGenerator (
	lastid int(11) default NULL
	);

	CREATE TABLE Language (
	LanguageId int(11) NOT NULL auto_increment,
	PackName varchar(40) NOT NULL default '',
	LocalName varchar(40) NOT NULL default '',
	- Enabled int(11) NOT NULL default '0',
	+ Enabled int(11) NOT NULL default '1',
	PrimaryLang int(11) NOT NULL default '0',
	IconURL varchar(255) default NULL,
	DateFormat varchar(50) NOT NULL default '',
	TimeFormat varchar(50) NOT NULL default '',
	- InputDateFormat varchar(50) NOT NULL default '',
	- InputTimeFormat varchar(50) NOT NULL default '',
	- DecimalPoint char(2) NOT NULL default '.',
	- ThousandSep tinytext NULL,
	- Charset varchar(20) NOT NULL default '',
	+ InputDateFormat varchar(50) NOT NULL default 'm/d/Y',
	+ InputTimeFormat varchar(50) NOT NULL default 'g:i:s A',
	+ DecimalPoint char(2) NOT NULL default '',
	+ ThousandSep tinytext,
	+ `Charset` varchar(20) NOT NULL default '',
	UnitSystem tinyint(4) NOT NULL default '1',
	PRIMARY KEY (LanguageId)
	);

	CREATE TABLE Modules (
	Name varchar(255) NOT NULL default '',
	Path varchar(255) NOT NULL default '',
	Var varchar(10) NOT NULL default '',
	Version varchar(10) NOT NULL default '',
	Loaded tinyint(4) NOT NULL default '1',
	LoadOrder tinyint(4) NOT NULL default '0',
	TemplatePath varchar(255) NOT NULL default '',
	RootCat int(11) NOT NULL default '0',
	- BuildDate double NOT NULL default '0',
	+ BuildDate int(10) unsigned default NULL,
	PRIMARY KEY (Name)
	);

	CREATE TABLE PersistantSessionData (
	PortalUserId int(11) NOT NULL default '0',
	VariableName varchar(255) NOT NULL default '',
	VariableValue text NOT NULL,
	KEY UserId (PortalUserId),
	KEY VariableName (VariableName)
	);

	CREATE TABLE Phrase (
	Phrase varchar(255) NOT NULL default '',
	Translation text NOT NULL,
	PhraseType int(11) NOT NULL default '0',
	PhraseId int(11) NOT NULL auto_increment,
	LanguageId int(11) NOT NULL default '0',
	LastChanged int(10) unsigned NOT NULL default '0',
	LastChangeIP varchar(15) NOT NULL default '',
	Module varchar(30) NOT NULL default '',
	PRIMARY KEY (PhraseId),
	KEY LanguageId (LanguageId),
	INDEX Phrase_Index (Phrase)
	);

	CREATE TABLE PhraseCache (
	Template varchar(40) NOT NULL default '',
	PhraseList text NOT NULL,
	CacheDate int(11) NOT NULL default '0',
	ThemeId int(11) NOT NULL default '0',
	StylesheetId int(10) unsigned NOT NULL default '0',
	ConfigVariables text,
	PRIMARY KEY (Template)
	);

	CREATE TABLE PortalGroup (
	GroupId int(11) NOT NULL auto_increment,
	Name varchar(255) NOT NULL default '',
	Description varchar(255) default NULL,
	CreatedOn double NOT NULL default '0',
	System tinyint(4) NOT NULL default '0',
	Personal tinyint(4) NOT NULL default '0',
	Enabled tinyint(4) NOT NULL default '1',
	ResourceId int(11) NOT NULL default '0',
	PRIMARY KEY (GroupId),
	UNIQUE KEY Name (Name),
	UNIQUE KEY ResourceId (ResourceId),
	KEY Personal (Personal),
	KEY Enabled (Enabled)
	);

	CREATE TABLE PortalUser (
	PortalUserId int(11) NOT NULL auto_increment,
	Login varchar(255) default NULL,
	`Password` varchar(255) default NULL,
	FirstName varchar(255) default NULL,
	LastName varchar(255) default NULL,
	Company varchar(255) NOT NULL default '',
	Email varchar(255) NOT NULL default '',
	CreatedOn double NOT NULL default '0',
	Phone varchar(20) default NULL,
	Fax varchar(255) NOT NULL default '',
	Street varchar(255) default NULL,
	Street2 varchar(255) NOT NULL default '',
	City varchar(20) default NULL,
	State varchar(20) NOT NULL default '',
	Zip varchar(20) default NULL,
	Country varchar(20) NOT NULL default '',
	ResourceId int(11) NOT NULL default '0',
	`Status` tinyint(4) NOT NULL default '2',
	Modified int(11) NOT NULL default '0',
	dob double NOT NULL default '0',
	tz int(11) default NULL,
	ip varchar(20) default NULL,
	IsBanned tinyint(1) NOT NULL default '0',
	PassResetTime bigint(20) default NULL,
	PwResetConfirm varchar(255) default NULL,
	PwRequestTime bigint(25) default NULL,
	MinPwResetDelay int(11) NOT NULL default '1800',
	PRIMARY KEY (PortalUserId),
	UNIQUE KEY ResourceId (ResourceId),
	UNIQUE KEY Login (Login),
	KEY CreatedOn (CreatedOn)
	);

	CREATE TABLE PortalUserCustomData (
	CustomDataId int(11) NOT NULL auto_increment,
	ResourceId int(10) unsigned NOT NULL default '0',
	KEY ResourceId (ResourceId),
	PRIMARY KEY (CustomDataId)
	);

	CREATE TABLE SessionData (
	SessionKey varchar(50) NOT NULL default '',
	VariableName varchar(255) NOT NULL default '',
	VariableValue text NOT NULL,
	PRIMARY KEY (SessionKey,VariableName),
	KEY SessionKey (SessionKey),
	KEY VariableName (VariableName)
	);

	CREATE TABLE Theme (
	ThemeId int(11) NOT NULL auto_increment,
	Name varchar(40) NOT NULL default '',
	Enabled int(11) NOT NULL default '1',
	Description varchar(255) default NULL,
	PrimaryTheme int(11) NOT NULL default '0',
	CacheTimeout int(11) NOT NULL default '0',
	StylesheetId int(10) unsigned NOT NULL default '0',
	PRIMARY KEY (ThemeId)
	);

	CREATE TABLE ThemeFiles (
	FileId int(11) NOT NULL auto_increment,
	ThemeId int(11) NOT NULL default '0',
	FileName varchar(255) NOT NULL default '',
	FilePath varchar(255) NOT NULL default '',
	Description varchar(255) default NULL,
	FileType int(11) NOT NULL default '0',
	FileFound tinyint(3) unsigned NOT NULL default '0',
	PRIMARY KEY (FileId),
	KEY theme (ThemeId),
	KEY FileName (FileName),
	KEY FilePath (FilePath),
	KEY FileFound (FileFound)
	);

	CREATE TABLE UserGroup (
	PortalUserId int(11) NOT NULL default '0',
	GroupId int(11) NOT NULL default '0',
	MembershipExpires int(10) unsigned default NULL,
	PrimaryGroup tinyint(4) NOT NULL default '1',
	ExpirationReminderSent tinyint(4) NOT NULL default '0',
	PRIMARY KEY (PortalUserId,GroupId),
	KEY GroupId (GroupId),
	KEY PrimaryGroup (PrimaryGroup)
	);

	CREATE TABLE UserSession (
	SessionKey varchar(50) NOT NULL default '',
	CurrentTempKey varchar(50) default NULL,
	PrevTempKey varchar(50) default NULL,
	LastAccessed double NOT NULL default '0',
	PortalUserId varchar(255) NOT NULL default '',
	Language varchar(255) NOT NULL default '',
	Theme varchar(255) NOT NULL default '',
	GroupId int(11) NOT NULL default '0',
	IpAddress varchar(20) NOT NULL default '0.0.0.0',
	Status int(11) NOT NULL default '1',
	GroupList varchar(255) default NULL,
	tz int(11) default NULL,
	PRIMARY KEY (SessionKey),
	KEY UserId (PortalUserId),
	KEY LastAccessed (LastAccessed)
	);

	CREATE TABLE EmailLog (
	EmailLogId int(11) NOT NULL auto_increment,
	fromuser varchar(200) default NULL,
	addressto varchar(255) default NULL,
	`subject` varchar(255) default NULL,
	`timestamp` bigint(20) default '0',
	event varchar(100) default NULL,
	EventParams text NOT NULL,
	PRIMARY KEY (EmailLogId)
	);

	CREATE TABLE Cache (
	VarName varchar(255) NOT NULL default '',
	Data longtext,
	Cached int(11) default NULL,
	LifeTime int(11) NOT NULL default '-1',
	PRIMARY KEY (VarName),
	KEY Cached (Cached)
	);

	CREATE TABLE StdDestinations (
	DestId int(11) NOT NULL auto_increment,
	DestType int(11) NOT NULL default '0',
	DestParentId int(11) default NULL,
	DestName varchar(255) NOT NULL default '',
	DestAbbr char(3) NOT NULL default '',
	DestAbbr2 char(2) default '',
	PRIMARY KEY (DestId)
	);

	CREATE TABLE Category (
	CategoryId int(11) NOT NULL auto_increment,
	`Type` int(11) NOT NULL default '0',
	ParentId int(11) NOT NULL default '0',
	Name varchar(255) NOT NULL default '',
	l1_Name varchar(255) NOT NULL default '',
	l2_Name varchar(255) NOT NULL default '',
	l3_Name varchar(255) NOT NULL default '',
	l4_Name varchar(255) NOT NULL default '',
	l5_Name varchar(255) NOT NULL default '',
	Filename varchar(255) NOT NULL default '',
	AutomaticFilename tinyint(3) unsigned NOT NULL default '1',
	Description text,
	l1_Description text,
	l2_Description text,
	l3_Description text,
	l4_Description text,
	l5_Description text,
	CreatedOn int(11) NOT NULL default '0',
	EditorsPick tinyint(4) NOT NULL default '0',
	`Status` tinyint(4) NOT NULL default '0',
	Priority int(11) NOT NULL default '0',
	MetaKeywords varchar(255) default NULL,
	CachedDescendantCatsQty int(11) default NULL,
	CachedNavbar text,
	l1_CachedNavbar text,
	l2_CachedNavbar text,
	l3_CachedNavbar text,
	l4_CachedNavbar text,
	l5_CachedNavbar text,
	CreatedById int(11) NOT NULL default '0',
	ResourceId int(11) default NULL,
	ParentPath text NOT NULL,
	NamedParentPath text NOT NULL,
	MetaDescription varchar(255) default NULL,
	HotItem int(11) NOT NULL default '2',
	NewItem int(11) NOT NULL default '2',
	PopItem int(11) NOT NULL default '2',
	Modified int(11) NOT NULL default '0',
	ModifiedById int(11) NOT NULL default '0',
	CategoryTemplate varchar(255) NOT NULL default '',
	CachedCategoryTemplate varchar(255) NOT NULL default '',
	PRIMARY KEY (CategoryId),
	UNIQUE KEY ResourceId (ResourceId),
	KEY ParentId (ParentId),
	KEY Modified (Modified),
	KEY Priority (Priority),
	KEY sorting (Name,Priority),
	KEY Filename (Filename(5)),
	KEY l1_Name (l1_Name(5)),
	KEY l2_Name (l2_Name(5)),
	KEY l3_Name (l3_Name(5)),
	KEY l4_Name (l4_Name(5)),
	KEY l5_Name (l5_Name(5)),
	KEY l1_Description (l1_Description(5)),
	KEY l2_Description (l2_Description(5)),
	KEY l3_Description (l3_Description(5)),
	KEY l4_Description (l4_Description(5)),
	KEY l5_Description (l5_Description(5))
	);

	CREATE TABLE CategoryCustomData (
	CustomDataId int(11) NOT NULL auto_increment,
	ResourceId int(10) unsigned NOT NULL default '0',
	KEY ResourceId (ResourceId),
	PRIMARY KEY (CustomDataId)
	);

	CREATE TABLE CategoryItems (
	`CategoryId` int(11) NOT NULL default '0',
	`ItemResourceId` int(11) NOT NULL default '0',
	`PrimaryCat` tinyint(4) NOT NULL default '0',
	`ItemPrefix` varchar(50) NOT NULL default '',
	`Filename` varchar(255) NOT NULL default '',
	UNIQUE KEY `CategoryId` (`CategoryId`,`ItemResourceId`),
	KEY `PrimaryCat` (`PrimaryCat`),
	KEY `ItemPrefix` (`ItemPrefix`),
	KEY `Filename` (`Filename`(4))
	);

	CREATE TABLE PermCache (
	PermCacheId int(11) NOT NULL auto_increment,
	CategoryId int(11) NOT NULL default '0',
	PermId int(11) NOT NULL default '0',
	ACL varchar(255) NOT NULL default '',
	DACL varchar(255) NOT NULL default '',
	PRIMARY KEY (PermCacheId),
	KEY CategoryId (CategoryId),
	KEY PermId (PermId)
	);

	CREATE TABLE Stylesheets (
	StylesheetId int(11) NOT NULL auto_increment,
	Name varchar(255) NOT NULL default '',
	Description varchar(255) NOT NULL default '',
	AdvancedCSS text NOT NULL,
	LastCompiled int(10) unsigned NOT NULL default '0',
	Enabled int(11) NOT NULL default '0',
	PRIMARY KEY (StylesheetId)
	);

	CREATE TABLE PopupSizes (
	PopupId int(10) unsigned NOT NULL auto_increment,
	TemplateName varchar(255) NOT NULL default '',
	PopupWidth int(11) NOT NULL default '0',
	PopupHeight int(11) NOT NULL default '0',
	PRIMARY KEY (PopupId),
	KEY TemplateName (TemplateName)
	);

	Property changes on: branches/unlabeled/unlabeled-1.4.2/core/install/install_schema.sql
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.4.2.6
	\ No newline at end of property
	+1.4.2.7
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.8.2/core/units/themes/themes_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.8.2/core/units/themes/themes_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.8.2/core/units/themes/themes_config.php (revision 7829)
	@@ -1,92 +1,92 @@
	<?php

	$config = Array(
	'Prefix' => 'theme',
	'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'kDBEventHandler','file'=>'','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'ThemesTagProcessor','file'=>'themes_tag_processor.php','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	'Hooks' => Array(),
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),
	'IDField' => 'ThemeId',

	'StatusField' => Array('Enabled','Primary'),

	'TitleField' => 'Name',

	'TableName' => TABLE_PREFIX.'Theme',
	'SubItems' => Array('themefiles'),

	/*
	'Sections' => Array(
	'in-portal:configure_themes' => Array(
	'parent' => 'in-portal:system',
	'icon' => 'in-portal:conf_themes',
	'label' => 'la_tab_Themes',
	'url' => Array('index_file' => 'config/config_theme.php', 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit', 'delete'),
	'priority' => 3,
	'type' => stTREE,
	),

	),*/

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),
	),

	'Filters' => Array(
	0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
	1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ),
	)
	),

	'AutoDelete' => true,
	'AutoClone' => true,

	'ListSQLs' => Array( ''=>'SELECT * FROM %s',
	), // key - special, value - list select sql
	'ItemSQLs' => Array( ''=>' SELECT %1$s.*, style.LastCompiled, style.Name AS StyleName
	FROM %s
	LEFT JOIN '.TABLE_PREFIX.'Stylesheets style ON style.StylesheetId = %1$s.StylesheetId',
	),
	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('Name' => 'asc'),
	)
	),
	'Fields' => Array(
	- 'ThemeId' => Array(),
	+ 'ThemeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1=>'la_Enabled', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => '1','default' => '1'),
	'Description' => Array('type' => 'string','default' => ''),
	'PrimaryTheme' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'CacheTimeout' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'StylesheetId' => Array('type' => 'int','not_null' => '1','default' => '0'),
	),

	'VirtualFields' => Array(
	'LastCompiled' => Array('type'=>'int', 'formatter'=>'kDateFormatter' ),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif',0=>'icon16_style_disabled.gif',1=>'icon16_style.gif'),
	'Fields' => Array(
	'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td'),
	'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td' ),
	'Enabled' => Array( 'title'=>'la_col_Status' ),
	),

	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.8.2/core/units/themes/themes_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.8
	\ No newline at end of property
	+1.8.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.8.2/core/units/modules/modules_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.8.2/core/units/modules/modules_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.8.2/core/units/modules/modules_config.php (revision 7829)
	@@ -1,122 +1,122 @@
	<?php

	$config = Array(
	'Prefix' => 'mod',
	'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'ModulesEventHandler','file'=>'modules_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'ModulesTagProcessor','file'=>'modules_tag_processor.php','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),

	'IDField' => 'Name',
	'TitleField' => 'Name', // field, used in bluebar when editing existing item
	'StatusField' => Array('Loaded'),

	'TitlePresets' => Array(
	'modules_list' => Array( 'prefixes' => Array('mod_List'), 'format' => "!la_title_Configuration! - !la_title_Module_Status! (#mod_recordcount#)"),

	'tree_modules' => Array('format' => '!la_section_overview!'),
	),

	'PermSection' => Array('main' => 'in-portal:mod_status'),

	'Sections' => Array(
	// "Configuration" -> "Modules and Settings"
	'in-portal:modules' => Array(
	'parent' => 'in-portal:system',
	'icon' => 'modules',
	'label' => 'la_tab_ModulesManagement',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 5,
	'type' => stTREE,
	'icon_module' => 'in-portal',
	),

	'in-portal:mod_status' => Array(
	'parent' => 'in-portal:modules',
	'icon' => 'modules',
	'label' => 'la_title_Module_Status',
	'url' => Array('t' => 'modules/modules_list', 'pass' => 'm'),
	'permissions' => Array('view', 'edit', 'advanced:approve', 'advanced:decline'),
	'priority' => 1,
	'type' => stTREE,
	),

	'in-portal:addmodule' => Array(
	'parent' => 'in-portal:modules',
	'icon' => 'modules',
	'label' => 'la_title_Add_Module',
	'url' => Array('index_file' => 'modules/addmodule.php', 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit'),
	'priority' => 2,
	'type' => stTREE,
	),

	'in-portal:tag_library' => Array(
	'parent' => 'in-portal:modules',
	'icon' => 'modules',
	'label' => 'la_tab_TagLibrary',
	'url' => Array('index_file' => 'tag_listing.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 3,
	'type' => stTREE,
	),
	),

	'TableName' => TABLE_PREFIX.'Modules',

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array('enabled', 'disabled'), 'type' => WHERE_FILTER),
	),
	'Filters' => Array(
	'enabled' => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 1'),
	'disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 0'),
	)
	),

	'ListSQLs' => Array( ''=>'SELECT * FROM %s',
	), // key - special, value - list select sql
	'ItemSQLs' => Array( ''=>'SELECT * FROM %s',
	),
	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('LoadOrder' => 'asc'),
	)
	),

	'Fields' => Array(
	- 'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
	+ 'Name' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
	'Path' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Var' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Version' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Loaded' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => '1','default' => '1'),
	'LoadOrder' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'TemplatePath' => Array('type' => 'string','not_null' => '1','default' => ''),
	'RootCat' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'BuildDate' => Array('type' => 'double', 'formatter' => 'kDateFormatter', 'not_null' => '1','default' => ''),
	),

	'VirtualFields' => Array(),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default' => 'icon16_custom.gif'),
	'Fields' => Array(
	'Name' => Array('title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td_no_icon'),
	'Loaded' => Array('title' => 'la_col_Status'),
	'Version' => Array('title' => 'la_col_Version'),
	),

	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.8.2/core/units/modules/modules_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.8.2.1
	\ No newline at end of property
	+1.8.2.2
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.12.2/core/units/custom_fields/custom_fields_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.12.2/core/units/custom_fields/custom_fields_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.12.2/core/units/custom_fields/custom_fields_config.php (revision 7829)
	@@ -1,133 +1,133 @@
	<?php

	$config = Array(
	'Prefix' => 'cf',
	'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'CustomFieldsEventHandler','file'=>'custom_fields_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'CustomFieldsTagProcessor','file'=>'custom_fields_tag_processor.php','build_event'=>'OnBuild'),
	'AutoLoad' => true,
	'hooks' => Array(),
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'type',
	5 => 'mode',
	),

	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'cf',
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnSave'), // edit cloned fields to made alters :)
	'DoPrefix' => 'cf',
	'DoSpecial' => '*',
	'DoEvent' => 'OnSaveCustomField',
	),
	),

	'IDField' => 'CustomFieldId',

	'TitleField' => 'FieldName', // field, used in bluebar when editing existing item

	'TitlePhrase' => 'la_title_CustomFields',

	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('cf'=>'!la_title_addingCustom!'),
	'edit_status_labels' => Array('cf'=>'!la_title_Editing_CustomField!'),
	'new_titlefield' => Array('cf'=>''),
	),

	'custom_fields_list'=>Array( 'prefixes' => Array('cf_List'),
	'format' => "!la_tab_ConfigCustom! (#cf_recordcount#)",
	),

	'custom_fields_edit'=>Array( 'prefixes' => Array('cf'),
	'new_titlefield' => Array('cf'=>''),
	'format' => "#cf_status# '#cf_titlefield#'",
	),
	),

	'TableName' => TABLE_PREFIX.'CustomField',

	'ListSQLs' => Array( ''=>'SELECT * FROM %s',
	), // key - special, value - list select sql

	'ListSortings' => Array(
	'' => Array(
	'ForcedSorting' => Array('DisplayOrder' => 'asc'),
	'Sorting' => Array('FieldName' => 'asc'),
	),

	'general' => Array(
	'Sorting' => Array('DisplayOrder' => 'asc')
	),

	),

	'ItemSQLs' => Array( ''=>'SELECT * FROM %s',
	),
	'SubItems' => Array('confs-cf'),

	'Fields' => Array(
	- 'CustomFieldId' => Array('type' => 'int','not_null' => '1','default' => ''),
	+ 'CustomFieldId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'Type' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'FieldName' => Array('required'=>'1', 'type' => 'string','not_null' => 1,'default' => ''),
	'FieldLabel' => Array('type' => 'string', 'required' => 1, 'default' => ''),
	'Heading' => Array('type' => 'string', 'required' => 1, 'default' => ''),
	'Prompt' => Array('type' => 'string','default' => ''),
	'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null'=>1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_checkbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label', 'date' => 'la_type_date', 'datetime' => 'la_type_datetime')),
	'ValueList' => Array('type' => 'string','default' => ''),
	'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'OnGeneralTab' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => '1', 'default' => '0'),
	),
	'VirtualFields' => Array(
	'Value' => Array('type' => 'string', 'default' => ''),
	'OriginalValue' => Array('type' => 'string', 'default' => ''),
	'Error' => Array('type' => 'string', 'default' => ''),

	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif'),
	'Fields' => Array(
	'CustomFieldId' => Array( 'title'=>'la_prompt_FieldId', 'data_block' => 'grid_checkbox_td' ),
	'FieldName' => Array( 'title'=>'la_prompt_FieldName'),
	'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td' ),
	'DisplayOrder' => Array('title' => 'la_prompt_DisplayOrder'),
	),
	),

	'SeparateTab' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif'),
	'Fields' => Array(
	'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
	'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
	'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td'),
	'Error' => Array( 'title'=>'la_col_Error', 'data_block' => 'custom_error_td'),
	),
	),

	'SeparateTabOriginal' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif'),
	'Fields' => Array(
	'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
	'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
	'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td'),
	'OriginalValue' => Array( 'title'=>'la_col_OriginalValue', 'data_block' => 'grid_original_td'),
	),
	),

	),
	);

	if (constOn('DEBUG_MODE')) {
	$config['Grids']['Default']['Fields']['IsSystem'] = Array('title' => 'la_col_IsSystem');
	}

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.12.2/core/units/custom_fields/custom_fields_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.12.2.2
	\ No newline at end of property
	+1.12.2.3
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php (revision 7828)
	+++ branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php (revision 7829)
	@@ -1,180 +1,180 @@
	<?php

	$config = Array(
	'Prefix' => 'lang',
	'ItemClass' => Array('class'=>'LanguagesItem','file'=>'languages_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'LanguagesEventHandler','file'=>'languages_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'LanguagesTagProcessor','file'=>'languages_tag_processor.php','build_event'=>'OnBuild'),
	'RegisterClasses' => Array(
	Array('pseudo'=>'LangXML','class'=>'LangXML_Parser','file'=>'import_xml.php'),
	),

	'AutoLoad' => true,
	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'lang',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnSave'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnReflectMultiLingualFields',
	),

	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'lang',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnPreSave'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnCopyLabels',
	),

	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'lang',
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnSave'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnUpdatePrimary',
	),

	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'lang',
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnSave','OnMassDelete'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnScheduleTopFrameReload',
	),

	),
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),
	'IDField' => 'LanguageId',

	'StatusField' => Array('Enabled','PrimaryLang'), // field, that is affected by Approve/Decline events

	'TitleField' => 'PackName', // field, used in bluebar when editing existing item

	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('lang'=>'!la_title_Adding_Language!'),
	'edit_status_labels' => Array('lang'=>'!la_title_Editing_Language!'),
	'new_titlefield' => Array('lang'=>''),
	),

	'languages_list' => Array( 'prefixes' => Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks! (#lang_recordcount#)"),

	'languages_edit_general' => Array( 'prefixes' => Array('lang'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_General!"),

	'phrases_list' => Array( 'prefixes' => Array('lang','phrases_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_Labels! (#phrases_recordcount#)"),

	'import_language' => Array( 'prefixes' => Array('phrases.import'), 'format' => "!la_title_InstallLanguagePackStep1!"),

	'import_language_step2' => Array( 'prefixes' => Array('phrases.import'), 'format' => "!la_title_InstallLanguagePackStep2!"),

	'export_language' => Array( 'prefixes' => Array('phrases.export'), 'format' => "!la_title_ExportLanguagePackStep1!"),

	'export_language_results' => Array( 'prefixes' => Array('phrases.export'), 'format' => "!la_title_ExportLanguagePackResults!"),

	'events_list' => Array( 'prefixes' => Array('lang','emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents! (#emailevents_recordcount#)"),

	'event_edit' => Array( 'prefixes' => Array('emailevents'),
	'edit_status_labels' => Array('emailevents' => '!la_title_Editing_EmailEvent!'),
	'format' => '#emailevents_status# - #emailevents_titlefield#'),

	'email_messages_edit' => Array( 'prefixes' => Array('lang','emailmessages'),
	'new_titlefield' => Array('emailmessages' => ''),
	'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailmessages_titlefield#'"),
	),

	'PermSection' => Array('main' => 'in-portal:configure_lang'),

	'Sections' => Array(
	'in-portal:configure_lang' => Array(
	'parent' => 'in-portal:system',
	'icon' => 'conf_regional',
	'label' => 'la_tab_Regional',
	'url' => Array('t' => 'regional/languages_list', 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:set_primary', 'advanced:import', 'advanced:export'),
	'priority' => 2,
	'type' => stTREE,
	),

	),

	'TableName' => TABLE_PREFIX.'Language',
	'SubItems' => Array('phrases','emailmessages'),

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),
	),

	'Filters' => Array(
	0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
	1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ),
	)
	),

	'AutoDelete' => true,

	'AutoClone' => true,

	'ListSQLs' => Array( ''=>'SELECT * FROM %s',
	), // key - special, value - list select sql
	'ItemSQLs' => Array( ''=>'SELECT * FROM %s',
	),
	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('PackName' => 'asc'),
	)
	),
	'Fields' => Array(
	- 'LanguageId' => Array('type' => 'int'),
	+ 'LanguageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
	'PackName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'LocalName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1', 'default' => 1),
	'PrimaryLang' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'IconURL' => Array('type' => 'string','default' => ''),
	'DateFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'TimeFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'InputDateFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('m/d/Y' => 'm/d/Y', 'd/m/Y' => 'd/m/Y'), 'not_null' => '1','default' => 'm/d/Y', 'required' => 1),
	'InputTimeFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('g:i:s A' => 'g:i:s A', 'g:i A' => 'g:i A', 'H:i:s' => 'H:i:s', 'H:i' => 'H:i' ), 'not_null' => '1','default' => 'g:i:s A', 'required' => 1),
	'DecimalPoint' => Array('type' => 'string','not_null' => '1','default' => ''),
	'ThousandSep' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Charset' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'UnitSystem' => Array('type' => 'int','not_null' => '1','default' => '1','formatter' => 'kOptionsFormatter','options' => Array(1 => 'la_Metric', 2 => 'la_US_UK'),'use_phrases' => 1),
	),

	'VirtualFields' => Array(
	'CopyLabels' => Array('type' => 'int', 'default' => 0),
	'CopyFromLanguage' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language ORDER BY PackName', 'option_title_field' => 'PackName', 'option_key_field' => 'LanguageId'),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif','0_0'=>'icon16_language_disabled.gif','1_0'=>'icon16_language.gif','0_1'=>'icon16_language_disabled.gif','1_1'=>'icon16_language_primary.gif'),
	'Fields' => Array(
	'PackName' => Array( 'title'=>'la_col_PackName', 'data_block' => 'grid_checkbox_td'),
	'LocalName' => Array( 'title'=>'la_col_LocalName' ),
	'Enabled' => Array( 'title'=>'la_col_Status' ),
	),

	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.21.2.2
	\ No newline at end of property
	+1.21.2.3
	\ 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