in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Mon, Aug 25, 9:12 AM

in-portal
View Options

	Index: branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/unit_config_reader.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/unit_config_reader.php (revision 7574)
	+++ branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/unit_config_reader.php (revision 7575)
	@@ -1,669 +1,669 @@
	<?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)))) {
	+ 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'];

	$conn =& $this->Application->GetADODBConnection();
	$res = $conn->Query("DESCRIBE $tablename");

	foreach ($res as $field) {
	$f_name = $field['Field'];
	if (getArrayValue($config, 'Fields')) {
	if ( !array_key_exists ($f_name, $config['Fields']) ) {
	$debugger->appendHTML("<b class='debug_error'>Config Warning: </b>Field $f_name 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'] == '') {
	if ( $f_name != $config['IDField'] && !isset($options['not_null']) && !isset($options['required']) ) {
	$debugger->appendHTML("<b class='debug_error'>Config Error: </b>Field $f_name 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 $f_name 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);
	}
	}

	}
	}
	}
	}
	}

	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.63.4/core/kernel/utility/unit_config_reader.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.63.4.4
	\ No newline at end of property
	+1.63.4.5
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php (revision 7574)
	+++ branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php (revision 7575)
	@@ -1,343 +1,355 @@
	<?php

	$config = Array(
	'Prefix' => 'inportal-sections',
	'EventHandlerClass' => Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),

	// 'SectionPrefix' => 'u',
	'Sections' => Array(
	'in-portal:root' => Array(
	'parent' => null,
	'icon' => 'in-portal:site',
	'label' => $this->Application->ConfigValue('Site_Name'),
	'url' => Array('t' => 'sections_list', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1),
	'permissions' => Array('advanced:admin_login', 'advanced:front_login'),
	'priority' => 0,
	'type' => stTREE,
	'SectionPrefix' => 'adm',
	),

	'in-portal:site' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:struct',
	'label' => 'la_tab_Site_Structure',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 1,
	'type' => stTREE,
	'SectionPrefix' => 'c',
	),

	'in-portal:browse' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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,
	),


	'in-portal:users' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:community',
	'label' => 'la_tab_Community',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 2,
	'type' => stTREE,
	'SectionPrefix' => 'u',
	),

	+ 'in-portal:user_list' => Array(
	+ 'parent' => 'in-portal:users',
	+ 'icon' => 'in-portal:users',
	+ 'label' => 'la_tab_User_List',
	+ 'url' => Array('index_file' => 'users/user_list.php', 'pass' => 'm', 'resetpage' => 1),
	+ 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /'advanced:add_favorite', 'advanced:remove_favorite',/),
	+ 'priority' => 1,
	+ 'type' => stTREE,
	+ ),
	+
	+ 'in-portal:k4_user_list' => Array(
	+ 'parent' => 'in-portal:users',
	+ 'icon' => 'in-portal:users',
	+ 'label' => 'la_title_K4Users',
	+ 'url' => Array('t' => 'in-portal/users/users_list', 'pass' => 'm'),
	+ 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /'advanced:add_favorite', 'advanced:remove_favorite',/),
	+ 'priority' => 1.5,
	+ 'debug_only' => true,
	+ 'type' => stTREE,
	+ ),
	+
	'in-portal:user_groups' => Array(
	'parent' => 'in-portal:users',
	'icon' => 'in-portal:usergroups',
	'label' => 'la_tab_User_Groups',
	'url' => Array('t' => 'in-portal/groups/groups_list', 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:send_email', 'advanced:manage_permissions'),
	'priority' => 2,
	'type' => stTREE,
	),


	- 'in-portal:user_list' => Array(
	- 'parent' => 'in-portal:users',
	- 'icon' => 'in-portal:users',
	- 'label' => 'la_tab_User_List',
	- 'url' => Array('index_file' => 'users/user_list.php', 'pass' => 'm', 'resetpage' => 1),
	- 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /'advanced:add_favorite', 'advanced:remove_favorite',/),
	- 'priority' => 1,
	- 'type' => stTREE,
	- ),
	-
	+
	'in-portal:configure_users' => Array(
	'parent' => 'in-portal:users',
	'icon' => 'in-portal:users_settings',
	'label' => 'la_tab_ConfigSettings',
	'url' => Array('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 3,
	'type' => stTREE,
	),

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

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

	'in-portal:user_banlist' => Array(
	'parent' => 'in-portal:users',
	'icon' => 'in-portal:banlist',
	'label' => 'la_tab_BanList',
	'url' => Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit', 'delete'),
	'priority' => 6,
	'type' => stTREE,
	),

	// "Help" section
	'in-portal:help' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:help',
	'label' => 'la_tab_Help',
	'url' => Array('index_file' => 'help/manual.pdf', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 7,
	'type' => stTREE,
	),

	// "Summary & Logs" section
	'in-portal:reports' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:summary_logs',
	'label' => 'la_tab_Reports',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 4,
	'type' => stTREE,
	'SectionPrefix' => 'adm',
	),

	'in-portal:log_summary' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:summary',
	'label' => 'la_tab_Summary',
	'url' => Array('index_file' => 'logs/summary.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 1,
	'type' => stTREE,
	),

	'in-portal:searchlog' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:search_log',
	'label' => 'la_tab_SearchLog',
	'url' => Array('index_file' => 'logs/searchlog.php', 'pass' => 'm'),
	'permissions' => Array('view', 'delete'),
	'priority' => 2,
	'type' => stTREE,
	),

	'in-portal:sessionlog' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:sessions_log',
	'label' => 'la_tab_SessionLog',
	'url' => Array('index_file' => 'logs/session_list.php', 'pass' => 'm'),
	'permissions' => Array('view', 'delete'),
	'priority' => 3,
	'type' => stTREE,
	),

	'in-portal:emaillog' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:email_log',
	'label' => 'la_tab_EmailLog',
	'url' => Array('index_file' => 'logs/email_log.php', 'pass' => 'm'),
	'permissions' => Array('view', 'delete'),
	'priority' => 4,
	'type' => stTREE,
	),

	'in-portal:visits' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:visits',
	'label' => 'la_tab_Visits',
	'url' => Array('t' => 'in-portal/visits/visits_list', 'pass' => 'm'),
	'permissions' => Array('view', 'delete'),
	'priority' => 5,
	'type' => stTREE,
	),

	// "Configuration" section
	'in-portal:system' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:conf',
	'label' => 'la_tab_Sys_Config',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 5,
	'type' => stTREE,
	'SectionPrefix' => 'adm',
	),

	'in-portal:configure_general' => Array(
	'parent' => 'in-portal:system',
	'icon' => 'in-portal:conf_general',
	'label' => 'la_tab_General',
	'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'module' => 'In-Portal', 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 1,
	'type' => stTREE,
	),

	'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,
	),

	// "Tools" section
	'in-portal:tools' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:tools',
	'label' => 'la_tab_Tools',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 6,
	'type' => stTREE,
	'SectionPrefix' => 'adm',
	),

	'in-portal:backup' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:tool_backup',
	'label' => 'la_tab_Backup',
	'url' => Array('index_file' => 'backup/backup1.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 2,
	'type' => stTREE,
	),

	'in-portal:restore' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:tool_restore',
	'label' => 'la_tab_Restore',
	'url' => Array('index_file' => 'backup/restore1.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 3,
	'type' => stTREE,
	),

	'in-portal:main_import' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:tool_import',
	'label' => 'la_tab_ImportData',
	'url' => Array('index_file' => 'import/step1.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 4,
	'type' => stTREE,
	),

	'in-portal:sql_query' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:tool_import',
	'label' => 'la_tab_QueryDB',
	'url' => Array('index_file' => 'tools/sql_query.php', 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 5,
	'type' => stTREE,
	),

	'in-portal:server_info' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:server_info',
	'label' => 'la_tab_ServerInfo',
	'url' => Array('index_file' => 'tools/server_info.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 6,
	'type' => stTREE,
	),
	),
	);
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.1.2.4
	\ No newline at end of property
	+1.1.2.5
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/group_selector.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/group_selector.tpl (nonexistent)
	+++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/group_selector.tpl (revision 7575)
	@@ -0,0 +1,46 @@
	+<inp2:adm_SetPopupSize width="582" height="504"/>
	+<inp2:m_include t="incs/header" nobody="yes"/>
	+
	+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
	+
	+<inp2:m_ParseBlock name="blue_bar" prefix="g" title_preset="select_group" module="custom" icon="icon46_usergroups"/>
	+
	+<!-- ToolBar --->
	+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	+<tbody>
	+ <tr>
	+ <td>
	+ <script type="text/javascript">
	+ a_toolbar = new ToolBar();
	+ a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', edit) );
	+ a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	+ window.close();
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	+ show_viewmenu(a_toolbar,'view');
	+ }
	+ ) );
	+
	+ a_toolbar.Render();
	+
	+ function edit()
	+ {
	+ set_hidden_field('remove_specials[g.user]', 1);
	+ submit_event('<inp2:m_recall name="main_prefix"/>', 'OnProcessSelected');
	+ }
	+ </script>
	+
	+ </td>
	+ </tr>
	+</tbody>
	+</table>
	+
	+<inp2:m_ParseBlock name="grid" PrefixSpecial="g.user" IdField="GroupId" grid="GroupSelector"/>
	+<script type="text/javascript">
	+ Grids['g.user'].SetDependantToolbarButtons( new Array('select') );
	+</script>
	+<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/group_selector.tpl
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1.2.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php (revision 7574)
	+++ branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php (revision 7575)
	@@ -1,343 +1,355 @@
	<?php

	$config = Array(
	'Prefix' => 'inportal-sections',
	'EventHandlerClass' => Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
	'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),

	// 'SectionPrefix' => 'u',
	'Sections' => Array(
	'in-portal:root' => Array(
	'parent' => null,
	'icon' => 'in-portal:site',
	'label' => $this->Application->ConfigValue('Site_Name'),
	'url' => Array('t' => 'sections_list', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1),
	'permissions' => Array('advanced:admin_login', 'advanced:front_login'),
	'priority' => 0,
	'type' => stTREE,
	'SectionPrefix' => 'adm',
	),

	'in-portal:site' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:struct',
	'label' => 'la_tab_Site_Structure',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 1,
	'type' => stTREE,
	'SectionPrefix' => 'c',
	),

	'in-portal:browse' => Array(
	'parent' => 'in-portal:site',
	'icon' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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' => 'in-portal: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,
	),


	'in-portal:users' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:community',
	'label' => 'la_tab_Community',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 2,
	'type' => stTREE,
	'SectionPrefix' => 'u',
	),

	+ 'in-portal:user_list' => Array(
	+ 'parent' => 'in-portal:users',
	+ 'icon' => 'in-portal:users',
	+ 'label' => 'la_tab_User_List',
	+ 'url' => Array('index_file' => 'users/user_list.php', 'pass' => 'm', 'resetpage' => 1),
	+ 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /'advanced:add_favorite', 'advanced:remove_favorite',/),
	+ 'priority' => 1,
	+ 'type' => stTREE,
	+ ),
	+
	+ 'in-portal:k4_user_list' => Array(
	+ 'parent' => 'in-portal:users',
	+ 'icon' => 'in-portal:users',
	+ 'label' => 'la_title_K4Users',
	+ 'url' => Array('t' => 'in-portal/users/users_list', 'pass' => 'm'),
	+ 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /'advanced:add_favorite', 'advanced:remove_favorite',/),
	+ 'priority' => 1.5,
	+ 'debug_only' => true,
	+ 'type' => stTREE,
	+ ),
	+
	'in-portal:user_groups' => Array(
	'parent' => 'in-portal:users',
	'icon' => 'in-portal:usergroups',
	'label' => 'la_tab_User_Groups',
	'url' => Array('t' => 'in-portal/groups/groups_list', 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:send_email', 'advanced:manage_permissions'),
	'priority' => 2,
	'type' => stTREE,
	),


	- 'in-portal:user_list' => Array(
	- 'parent' => 'in-portal:users',
	- 'icon' => 'in-portal:users',
	- 'label' => 'la_tab_User_List',
	- 'url' => Array('index_file' => 'users/user_list.php', 'pass' => 'm', 'resetpage' => 1),
	- 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /'advanced:add_favorite', 'advanced:remove_favorite',/),
	- 'priority' => 1,
	- 'type' => stTREE,
	- ),
	-
	+
	'in-portal:configure_users' => Array(
	'parent' => 'in-portal:users',
	'icon' => 'in-portal:users_settings',
	'label' => 'la_tab_ConfigSettings',
	'url' => Array('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 3,
	'type' => stTREE,
	),

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

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

	'in-portal:user_banlist' => Array(
	'parent' => 'in-portal:users',
	'icon' => 'in-portal:banlist',
	'label' => 'la_tab_BanList',
	'url' => Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit', 'delete'),
	'priority' => 6,
	'type' => stTREE,
	),

	// "Help" section
	'in-portal:help' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:help',
	'label' => 'la_tab_Help',
	'url' => Array('index_file' => 'help/manual.pdf', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 7,
	'type' => stTREE,
	),

	// "Summary & Logs" section
	'in-portal:reports' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:summary_logs',
	'label' => 'la_tab_Reports',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 4,
	'type' => stTREE,
	'SectionPrefix' => 'adm',
	),

	'in-portal:log_summary' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:summary',
	'label' => 'la_tab_Summary',
	'url' => Array('index_file' => 'logs/summary.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 1,
	'type' => stTREE,
	),

	'in-portal:searchlog' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:search_log',
	'label' => 'la_tab_SearchLog',
	'url' => Array('index_file' => 'logs/searchlog.php', 'pass' => 'm'),
	'permissions' => Array('view', 'delete'),
	'priority' => 2,
	'type' => stTREE,
	),

	'in-portal:sessionlog' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:sessions_log',
	'label' => 'la_tab_SessionLog',
	'url' => Array('index_file' => 'logs/session_list.php', 'pass' => 'm'),
	'permissions' => Array('view', 'delete'),
	'priority' => 3,
	'type' => stTREE,
	),

	'in-portal:emaillog' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:email_log',
	'label' => 'la_tab_EmailLog',
	'url' => Array('index_file' => 'logs/email_log.php', 'pass' => 'm'),
	'permissions' => Array('view', 'delete'),
	'priority' => 4,
	'type' => stTREE,
	),

	'in-portal:visits' => Array(
	'parent' => 'in-portal:reports',
	'icon' => 'in-portal:visits',
	'label' => 'la_tab_Visits',
	'url' => Array('t' => 'in-portal/visits/visits_list', 'pass' => 'm'),
	'permissions' => Array('view', 'delete'),
	'priority' => 5,
	'type' => stTREE,
	),

	// "Configuration" section
	'in-portal:system' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:conf',
	'label' => 'la_tab_Sys_Config',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 5,
	'type' => stTREE,
	'SectionPrefix' => 'adm',
	),

	'in-portal:configure_general' => Array(
	'parent' => 'in-portal:system',
	'icon' => 'in-portal:conf_general',
	'label' => 'la_tab_General',
	'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'module' => 'In-Portal', 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 1,
	'type' => stTREE,
	),

	'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,
	),

	// "Tools" section
	'in-portal:tools' => Array(
	'parent' => 'in-portal:root',
	'icon' => 'in-portal:tools',
	'label' => 'la_tab_Tools',
	'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 6,
	'type' => stTREE,
	'SectionPrefix' => 'adm',
	),

	'in-portal:backup' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:tool_backup',
	'label' => 'la_tab_Backup',
	'url' => Array('index_file' => 'backup/backup1.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 2,
	'type' => stTREE,
	),

	'in-portal:restore' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:tool_restore',
	'label' => 'la_tab_Restore',
	'url' => Array('index_file' => 'backup/restore1.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 3,
	'type' => stTREE,
	),

	'in-portal:main_import' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:tool_import',
	'label' => 'la_tab_ImportData',
	'url' => Array('index_file' => 'import/step1.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 4,
	'type' => stTREE,
	),

	'in-portal:sql_query' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:tool_import',
	'label' => 'la_tab_QueryDB',
	'url' => Array('index_file' => 'tools/sql_query.php', 'pass' => 'm'),
	'permissions' => Array('view', 'edit'),
	'priority' => 5,
	'type' => stTREE,
	),

	'in-portal:server_info' => Array(
	'parent' => 'in-portal:tools',
	'icon' => 'in-portal:server_info',
	'label' => 'la_tab_ServerInfo',
	'url' => Array('index_file' => 'tools/server_info.php', 'pass' => 'm'),
	'permissions' => Array('view'),
	'priority' => 6,
	'type' => stTREE,
	),
	),
	);
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.1.2.4
	\ No newline at end of property
	+1.1.2.5
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.1.2/core/units/user_groups/user_groups_eh.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.1.2/core/units/user_groups/user_groups_eh.php (nonexistent)
	+++ branches/unlabeled/unlabeled-1.1.2/core/units/user_groups/user_groups_eh.php (revision 7575)
	@@ -0,0 +1,91 @@
	+<?php
	+
	+ class UserGroupsEventHandler extends kDBEventHandler {
	+
	+ /**
	+ * Adds user as member for selected groups
	+ *
	+ * @param kEvent $event
	+ */
	+ function OnProcessSelected(&$event)
	+ {
	+ $new_groups = $this->Application->GetVar('g');
	+ if (!$new_groups) {
	+ return ;
	+ }
	+
	+ $new_groups = array_keys($new_groups);
	+
	+ // don't insert duplicate group membership record
	+ $user_id = $this->Application->GetVar('u_id');
	+ $table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroup', 'prefix:u');
	+ $sql = 'SELECT GroupId
	+ FROM '.$table_name.'
	+ WHERE PortalUserId = '.$user_id;
	+ $old_groups = $this->Conn->GetCol($sql);
	+
	+ $new_groups = array_diff($new_groups, $old_groups);
	+ if ($new_groups) {
	+ foreach ($new_groups as $new_group) {
	+ $fields_hash = Array (
	+ 'GroupId' => $new_group,
	+ 'PortalUserId' => $user_id,
	+ 'PrimaryGroup' => 0,
	+ );
	+ $this->Conn->doInsert($fields_hash, $table_name);
	+ }
	+ }
	+
	+ $event->SetRedirectParam('opener', 'u');
	+ }
	+
	+ /**
	+ * Sets primary group for user (in editing only)
	+ *
	+ * @param kEvent $event
	+ */
	+ function OnSetPrimary(&$event)
	+ {
	+ $ids = $this->StoreSelectedIDs($event);
	+ if ($ids) {
	+ $id = array_shift($ids);
	+ $object =& $event->getObject( Array('skip_autoload' => true) );
	+ $user_id = $this->Application->GetVar('u_id');
	+
	+ $sql = 'UPDATE '.$object->TableName.'
	+ SET PrimaryGroup = 0
	+ WHERE PortalUserId = '.$user_id;
	+ $this->Conn->Query($sql);
	+
	+ $sql = 'UPDATE '.$object->TableName.'
	+ SET PrimaryGroup = 1
	+ WHERE '.$object->IDField.' = '.$id.' AND PortalUserId = '.$user_id;
	+ $this->Conn->Query($sql);
	+ }
	+
	+ $this->clearSelectedIDs($event);
	+ }
	+
	+ /**
	+ * Don't allow primary group record deleting
	+ *
	+ * @param kEvent $event
	+ */
	+ function customProcessing(&$event, $type)
	+ {
	+ if ($event->Name == 'OnMassDelete' && $type == 'before') {
	+ $ids = $event->getEventParam('ids');
	+ if ($ids) {
	+ $object =& $event->getObject( Array('skip_autoload' => true) );
	+ $user_id = $this->Application->GetVar('u_id');
	+ $sql = 'SELECT '.$object->IDField.'
	+ FROM '.$object->TableName.'
	+ WHERE '.$object->IDField.' IN ('.implode(',', $ids).') AND PortalUserId = '.$user_id.' AND PrimaryGroup = 0';
	+ $ids = $this->Conn->GetCol($sql);
	+ $event->setEventParam('ids', $ids);
	+ }
	+ }
	+ }
	+ }
	+
	+?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.1.2/core/units/user_groups/user_groups_eh.php
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1.2.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/group_selector.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/group_selector.tpl (nonexistent)
	+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/group_selector.tpl (revision 7575)
	@@ -0,0 +1,46 @@
	+<inp2:adm_SetPopupSize width="582" height="504"/>
	+<inp2:m_include t="incs/header" nobody="yes"/>
	+
	+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
	+
	+<inp2:m_ParseBlock name="blue_bar" prefix="g" title_preset="select_group" module="custom" icon="icon46_usergroups"/>
	+
	+<!-- ToolBar --->
	+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	+<tbody>
	+ <tr>
	+ <td>
	+ <script type="text/javascript">
	+ a_toolbar = new ToolBar();
	+ a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', edit) );
	+ a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	+ window.close();
	+ }
	+ ) );
	+
	+ a_toolbar.AddButton( new ToolBarSeparator('sep3') );
	+
	+ a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	+ show_viewmenu(a_toolbar,'view');
	+ }
	+ ) );
	+
	+ a_toolbar.Render();
	+
	+ function edit()
	+ {
	+ set_hidden_field('remove_specials[g.user]', 1);
	+ submit_event('<inp2:m_recall name="main_prefix"/>', 'OnProcessSelected');
	+ }
	+ </script>
	+
	+ </td>
	+ </tr>
	+</tbody>
	+</table>
	+
	+<inp2:m_ParseBlock name="grid" PrefixSpecial="g.user" IdField="GroupId" grid="GroupSelector"/>
	+<script type="text/javascript">
	+ Grids['g.user'].SetDependantToolbarButtons( new Array('select') );
	+</script>
	+<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/group_selector.tpl
	___________________________________________________________________
	Added: cvs2svn:cvs-rev
	## -0,0 +1 ##
	+1.1.2.1
	\ No newline at end of property
	Added: svn:executable
	## -0,0 +1 ##
	+*
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php (revision 7574)
	+++ branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php (revision 7575)
	@@ -1,190 +1,193 @@
	<?php

	class TagProcessor extends kBase {

	/**
	* Processes tag
	*
	* @param Tag $tag
	* @return string
	* @access public
	*/
	function ProcessTag(&$tag)
	{
	return $this->ProcessParsedTag($tag->Tag, $tag->NP, $tag->getPrefixSpecial());

	/*$Method=$tag->Tag;
	if(method_exists($this, $Method))
	{
	//echo htmlspecialchars($tag->GetFullTag()).'<br>';
	return $this->$Method($tag->NP);
	}
	else
	{
	if ($this->Application->hasObject('TagsAggregator')) {
	$aggregator =& $this->Application->recallObject('TagsAggregator');
	$tag_mapping = $aggregator->GetArrayValue($tag->Prefix, $Method);
	if ($tag_mapping) {

	$mapped_tag =& new Tag('', $this->Application->Parser);
	$mapped_tag->CopyFrom($tag);
	$mapped_tag->Processor = $tag_mapping[0];
	$mapped_tag->Tag = $tag_mapping[1];
	$mapped_tag->NP['PrefixSpecial'] = $tag->getPrefixSpecial();
	$mapped_tag->RebuildTagData();
	return $mapped_tag->DoProcessTag();
	}
	}
	trigger_error('Tag '.$Method.' Undefined in '.get_class($this).'[Agregated Tag]:<br><b>'.$tag->RebuildTagData().'</b>',E_USER_WARNING);
	return false;
	}*/
	}

	function ProcessParsedTag($tag, $params, $prefix)
	{
	$Method = $tag;
	if(method_exists($this, $Method))
	{
	if ($this->Application->isDebugMode() && constOn('DBG_SHOW_TAGS')) {
	$this->Application->Debugger->appendHTML('Processing PreParsed Tag '.$Method.' in '.$this->Prefix);
	}

	$backup_prefix = $this->Prefix;
	$backup_special = $this->Special;

	// process all possible flags: begin
	$flags = Array('js_escape', 'result_to_var', 'pass_params', 'html_escape');
	$flag_values = Array();

	foreach ($flags as $flag_name) {
	$flag_values[$flag_name] = false;
	if (isset($params[$flag_name])) {
	$flag_values[$flag_name] = $params[$flag_name];
	unset($params[$flag_name]);
	}
	}
	// process all possible flags: end

	// pass_params for non ParseBlock tags :)
	if ($flag_values['pass_params']) {
	$params = array_merge_recursive2($this->Application->Parser->Params, $params);
	}

	$ret = $this->$Method($params);

	$this->Prefix = $backup_prefix;
	$this->Special = $backup_special;

	if ($flag_values['js_escape']) {
	$ret = str_replace('\'', ''', $ret);
	$ret = addslashes($ret);
	$ret = str_replace(Array("\r", "\n"), Array('\r', '\n'), $ret);
	$ret = str_replace('</script>', "</'+'script>", $ret);
	}
	if ($flag_values['html_escape']) {
	$ret = htmlspecialchars($ret);
	}
	if ($flag_values['result_to_var']) {
	$this->Application->Parser->SetParam($flag_values['result_to_var'], $ret);
	$ret = '';
	}
	return $ret;
	}
	else
	{
	if ($this->Application->hasObject('TagsAggregator')) {
	$aggregator =& $this->Application->recallObject('TagsAggregator');
	$tmp = $this->Application->processPrefix($prefix);
	$tag_mapping = $aggregator->GetArrayValue($tmp['prefix'], $Method);
	if ($tag_mapping) {
	$tmp = $this->Application->processPrefix($tag_mapping[0]);
	$__tag_processor = $tmp['prefix'].'_TagProcessor';
	$processor =& $this->Application->recallObject($__tag_processor);
	$processor->Prefix = $tmp['prefix'];
	$processor->Special = getArrayValue($tag_mapping, 2) ? $tag_mapping[2] : $tmp['special'];
	$params['PrefixSpecial'] = $prefix;
	$ret = $processor->ProcessParsedTag($tag_mapping[1], $params, $prefix);
	if (isset($params['result_to_var'])) {
	$this->Application->Parser->SetParam($params['result_to_var'], $ret);
	$ret = '';
	}
	return $ret;
	}
	+ if ($this->Application->isDebugMode()) {
	+ $this->Application->Debugger->appendTrace();
	+ }
	trigger_error('Tag <b>'.$Method.'</b> Undefined in '.get_class($this).'[Agregated Tag]:<br><b>'.$tag.'</b>', E_USER_WARNING);
	}
	trigger_error('Tag Undefined:<br><b>'.$prefix.':'.$tag.'</b>',E_USER_WARNING);
	return false;
	}
	}


	/**
	* Not tag, method for parameter
	* selection from list in this TagProcessor
	*
	* @param Array $params
	* @param string $possible_names
	* @return string
	* @access public
	*/
	function SelectParam($params, $possible_names)
	{
	if (!is_array($params)) return;
	if (!is_array($possible_names))

	$possible_names = explode(',', $possible_names);
	foreach ($possible_names as $name)
	{
	if( isset($params[$name]) ) return $params[$name];
	}
	return false;
	}
	}

	/*class ProcessorsPool {
	var $Processors = Array();
	var $Application;
	var $Prefixes = Array();
	var $S;

	function ProcessorsPool()
	{
	$this->Application =& KernelApplication::Instance();
	$this->S =& $this->Application->Session;
	}

	function RegisterPrefix($prefix, $path, $class)
	{
	// echo " RegisterPrefix $prefix, $path, $class <br>";
	$prefix_item = Array(
	'path' => $path,
	'class' => $class
	);
	$this->Prefixes[$prefix] = $prefix_item;
	}

	function CreateProcessor($prefix, &$tag)
	{
	// echo " prefix : $prefix <br>";
	if (!isset($this->Prefixes[$prefix]))
	$this->Application->ApplicationDie ("<b>Filepath and ClassName for prefix $prefix not defined while processing ".htmlspecialchars($tag->GetFullTag())."!</b>");
	include_once($this->Prefixes[$prefix]['path']);
	$ClassName = $this->Prefixes[$prefix]['class'];
	$a_processor =& new $ClassName($prefix);
	$this->SetProcessor($prefix, $a_processor);
	}

	function SetProcessor($prefix, &$a_processor)
	{
	$this->Processors[$prefix] =& $a_processor;
	}

	function &GetProcessor($prefix, &$tag)
	{
	if (!isset($this->Processors[$prefix]))
	$this->CreateProcessor($prefix, $tag);
	return $this->Processors[$prefix];
	}
	}*/

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.13.4/core/kernel/processors/tag_processor.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.13.4.2
	\ No newline at end of property
	+1.13.4.3
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.2.2/core/units/groups/groups_event_handler.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.2.2/core/units/groups/groups_event_handler.php (revision 7574)
	+++ branches/unlabeled/unlabeled-1.2.2/core/units/groups/groups_event_handler.php (revision 7575)
	@@ -1,19 +1,38 @@
	<?php

	class GroupsEventHandler extends kDBEventHandler {

	/**
	* Adds grouping by userid
	*
	* @param kEvent $event
	*/
	function SetCustomQuery(&$event)
	{
	- if ($event->Special == 'total') {
	$object =& $event->getObject();
	+ /* @var $object kDBList */
	+
	+ switch ($event->Special) {
	+ case 'total':
	$object->AddGroupByField('%1$s.GroupId');
	+ break;
	+
	+ case 'user':
	+ $user_id = $this->Application->GetVar('u_id');
	+ if ($user_id !== false) {
	+ // show only groups, that user doesn't belong to
	+ $table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroup', 'prefix:u');
	+ $sql = 'SELECT GroupId
	+ FROM '.$table_name.'
	+ WHERE PortalUserId = '.$user_id;
	+ $group_ids = $this->Conn->GetCol($sql);
	+ array_push($group_ids, 14, 15); // Guest & Everyone groups are set dynamically
	+
	+ $object->addFilter('already_member_filter', '%1$s.GroupId NOT IN ('.implode(',', $group_ids).')');
	+ }
	+ break;
	}
	}
	}

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.2.2/core/units/groups/groups_event_handler.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.2
	\ No newline at end of property
	+1.2.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl (revision 7574)
	+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl (revision 7575)
	@@ -1,58 +1,58 @@
	<inp2:m_block name="init_tab"/>
	<inp2:m_if prefix="m" function="is_active" templ="$t$"/>
	<inp2:m_set main_prefix="$main_prefix"/>
	<inp2:m_endif/>
	<inp2:m_blockend/>

	<inp2:m_block name="prepare_tab"/>
	<inp2:m_if prefix="m" function="is_active" templ="$t$"/>
	<inp2:m_set active="active_" bgcolor="#FFA916" class="tab"/>
	<inp2:m_else/>
	<inp2:m_set active="" bgcolor="#009FF0" class="tab2"/>
	<inp2:m_endif/>
	<inp2:m_blockend/>

	<inp2:m_block name="tab"/>
	<inp2:m_ParseBlock name="prepare_tab" t="$t"/>
	<td>
	- <table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
	+ <table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param" name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
	<tr>
	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
	<td nowrap align="center" style="border-top: 1px solid #000000;">
	<a href="javascript:go_to_tab('<inp2:m_param name="main_prefix"/>', '<inp2:m_param name="t"/>')" class="<inp2:m_get param="class"/>" onClick=""><inp2:m_phrase name="$title"/></a><br>
	</td>
	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>right.gif" width="15" height="23"></td>
	</tr>
	</table>
	</td>
	<inp2:m_blockend/>

	<inp2:m_block name="tab_direct" pass="m"/>
	<inp2:m_ParseBlock name="prepare_tab" t="$t"/>
	<td>
	- <table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
	+ <table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param" name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
	<tr>
	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
	<td nowrap align="center" style="border-top: 1px solid #000000;">
	<a href="<inp2:m_t t="$t" pass="$pass"/>" class="<inp2:m_get param="class"/>" onClick=""><inp2:m_phrase name="$title"/></a><br>
	</td>
	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>right.gif" width="15" height="23"></td>
	</tr>
	</table>
	</td>
	<inp2:m_blockend/>

	<inp2:m_block name="tab_list"/>
	<inp2:m_ParseBlock name="prepare_tab" t="$t"/>
	<td>
	- <table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
	+ <table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param" name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
	<tr>
	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
	<td nowrap align="center" <inp2:m_if check="m_getequals" name="active" value="active_">style="border-top: black 1px solid;"</inp2:m_if> background="img/tab_<inp2:m_get param="active"/>back.gif">
	<a href="javascript:go_to_list('<inp2:m_get param="main_prefix"/>', '<inp2:m_param name="t"/>')" class="<inp2:m_get param="class"/>" onClick=""><inp2:m_phrase name="$title"/></a><br>
	</td>
	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>right.gif" width="15" height="23"></td>
	</tr>
	</table>
	</td>
	<inp2:m_blockend/>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.2.2.2
	\ No newline at end of property
	+1.2.2.3
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.3.2/core/units/user_groups/user_groups_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.3.2/core/units/user_groups/user_groups_config.php (revision 7574)
	+++ branches/unlabeled/unlabeled-1.3.2/core/units/user_groups/user_groups_config.php (revision 7575)
	@@ -1,95 +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'=>'kDBEventHandler','file'=>'','build_event'=>'OnBuild'),
	+ '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',
	- ),
	+ 'QueryString' => Array (
	+ 1 => 'id',
	+ 2 => 'page',
	+ 3 => 'event',
	+ ),

	'IDField' => 'GroupId',
	- 'StatusField' => Array('UserStatus'),

	'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 AND %1$s.PrimaryGroup = 1
	- LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON u.PortalUserId = %1$s.PortalUserId'),
	+ 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 AND %1$s.PrimaryGroup = 1
	- LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON u.PortalUserId = %1$s.PortalUserId'),
	+ LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId'),

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

	- 'CalculatedFields' => Array(
	- '' => Array(
	- 'Login' => 'u.Login',
	- 'FirstName' => 'u.FirstName',
	- 'LastName' => 'u.LastName',
	- 'Email' => 'u.Email',
	- 'PrimaryGroup' => 'g.Name',
	- 'CreatedOn' => 'u.CreatedOn',
	- 'UserStatus' => 'u.Status'
	- ),
	- ),
	+ 'CalculatedFields' => Array (
	+ '' => Array(
	+ 'GroupName' => 'g.Name',
	+ ),
	+ ),

	'Fields' => Array(
	- 'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => '0'),
	- 'GroupId' => Array(),
	- 'MembershipExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
	- 'PrimaryGroup' => Array('type' => 'int','not_null' => '1','default' => '1'),
	- 'ExpirationReminderSent' => Array('type' => 'int','not_null' => '1','default' => '0'),
	+ 'PortalUserId' => Array('type' => 'int'),
	+ 'GroupId' => Array('type' => 'int', 'not_null' => 1, 'default' => 1),
	+ '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(
	- 'Login' => Array('type' => 'string'),
	- 'FirstName' => Array('type' => 'string'),
	- 'LastName' => Array('type' => 'string'),
	- 'Email' => Array('type' => 'string'),
	- 'PrimaryGroup' => Array('type' => 'string'),
	- 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'),
	- 'UserStatus' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled', 2 => 'la_Pending'), 'use_phrases' => 1, 'not_null' => '1','default' => 2),
	- ),
	+ 'VirtualFields' => Array (
	+ 'GroupName' => Array('type' => 'string'),
	+ ),


	'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'),
	+ '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'),
	- 'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
	- ),
	- ),
	- ),
	+ 'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td'),
	+ ),
	+ ),
	+ ),

	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.3.2/core/units/user_groups/user_groups_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.3.2.1
	\ No newline at end of property
	+1.3.2.2
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.32.2/core/units/users/users_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.32.2/core/units/users/users_config.php (revision 7574)
	+++ branches/unlabeled/unlabeled-1.32.2/core/units/users/users_config.php (revision 7575)
	@@ -1,207 +1,210 @@
	<?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'=>'!la_title_New_User!'),
	),

	'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(),
	'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', 'not_null' => '1', 'default' => '', 'required'=>1),
	'tz' => Array('type' => 'int','default' => ''),
	'ip' => Array('type' => 'string','default' => ''),
	'IsBanned' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'PassResetTime' => Array('type' => 'int','default' => ''),
	'PwResetConfirm' => Array('type' => 'string','default' => ''),
	'PwRequestTime' => Array('type' => 'int','default' => ''),
	'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),
	),

	'VirtualFields' => Array(
	'ValidateLogin' => Array('type'=>'string','default'=>''),
	'SubscribeEmail' => Array('type'=>'string','default'=>''),
	'PrimaryGroup' => 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.32.2/core/units/users/users_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.32.2.4
	\ No newline at end of property
	+1.32.2.5
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.15.2/core/units/groups/groups_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.15.2/core/units/groups/groups_config.php (revision 7574)
	+++ branches/unlabeled/unlabeled-1.15.2/core/units/groups/groups_config.php (revision 7575)
	@@ -1,123 +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' => '!la_title_New_Group!'),
	),

	'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!" ),

	- 'groups_select' => Array('prefixes' => Array('g_List'), 'format' => "!la_title_Groups! (#g_recordcount#) - !la_title_SelectGroup!"),
	+ '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
	+ '' => '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
	+ '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(),
	'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'),
	- ),
	- ),
	-
	- '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(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'),
	- ),
	- ),*/
	- ),
	+ '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.15.2/core/units/groups/groups_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.15.2.1
	\ No newline at end of property
	+1.15.2.2
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl
	===================================================================
	--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl (revision 7574)
	+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl (revision 7575)
	@@ -1,493 +1,493 @@
	<inp2:m_DefineElement name="combined_header">
	<inp2:m_RequireLogin permissions="$section.view" system="1"/>
	<inp2:m_if check="m_Param" name="prefix" inverse="1"><inp2:adm_SectionInfo section="$section" info="SectionPrefix" result_to_var="prefix"/></inp2:m_if>
	<inp2:m_if check="m_get" var="m_wid" inverse="1">
	<table cellpadding="0" cellspacing="0" border="0" width="100%">
	<tr style="background: url(<inp2:adm_SectionInfo section="$section" parent="1" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;">
	<td valign="top" class="admintitle" align="left" style="padding-top: 10px; padding-bottom: 10px;">
	<img width="46" height="46" src="<inp2:adm_SectionInfo section="$section" parent="1" info="module_path"/>img/icons/icon46_<inp2:adm_SectionInfo section="$section" parent="1" info="icon"/>.gif" align="absmiddle" title="<inp2:adm_SectionInfo section="$section" parent="1" info="label"/>"> <inp2:adm_SectionInfo section="$section" parent="1" info="label"/>
	</td>
	</tr>
	</table>
	</inp2:m_if>


	<inp2:m_if check="m_Param" name="tabs">
	<inp2:m_include t="$tabs"/>
	</inp2:m_if>

	<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
	<tr>
	<td class="header_left_bg" nowrap valign="middle">
	<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
	<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="$default_title" cut_first="100" pass_params="true"/></span>
	</td>
	<td align="right" class="tablenav" valign="middle">
	<script type="text/javascript">
	set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
	</script>
	<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
	<script>
	var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
	$help_url = $help_url.replace(/#/g, '%23');
	</script>
	<a href="javascript: OpenHelp($help_url);">
	<img src="img/blue_bar_help.gif" border="0">
	</a>
	</inp2:m_if>
	<inp2:m_if check="m_Param" name="pagination">
	<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$prefix" pass_params="1"/>
	</inp2:m_if>
	</td>
	</tr>
	</table>
	</inp2:m_DefineElement>

	<inp2:m_block name="section_header"/>
	<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
	<inp2:m_RenderElement name="section_header_new" pass_params="true"/>
	<inp2:m_else />
	<table cellpadding="0" cellspacing="0" border="0" width="100%">
	<tr class="section_header_bg">
	<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
	<img width="46" height="46" src="img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>"> <inp2:adm_GetSectionTitle phrase="$title"/>
	</td>
	</tr>
	</table>
	</inp2:m_if>
	<inp2:m_blockend/>

	<inp2:m_DefineElement name="section_header_new" module="#session#">
	<table cellpadding="0" cellspacing="0" border="0" width="100%">
	<tr style="background: url(<inp2:ModulePath module="$module"/>img/logo_bg.gif) no-repeat top right; height: 65px;">
	<td valign="top" class="admintitle" align="left" style="padding-top: 15px; padding-bottom: 15px;">
	<img width="46" height="46" src="<inp2:ModulePath module="$module"/>img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>"> <inp2:adm_GetSectionTitle phrase="$title"/>
	</td>
	</tr>
	</table>
	</inp2:m_DefineElement>

	<inp2:m_block name="blue_bar" module="" icon="" pagination="0"/>
	<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
	<tr>
	<td class="header_left_bg" nowrap width="80%" valign="middle">
	<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/></span>
	</td>
	<td align="right" class="tablenav" width="20%" valign="middle">
	<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
	<script>
	var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
	$help_url = $help_url.replace(/#/g, '%23');
	set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') );
	</script>
	<a href="javascript: OpenHelp($help_url);">
	<img src="img/blue_bar_help.gif" border="0">
	</a>
	</inp2:m_if>
	<inp2:m_if check="m_Param" name="pagination">
	<inp2:m_RenderElement name="grid_pagination_elem" grid="st" PrefixSpecial="$prefix" pass_params="1"/>
	</inp2:m_if>
	</td>
	</tr>
	</table>
	<inp2:m_blockend/>

	<inp2:m_DefineElement name="inp_original_label">
	<td><inp2:$prefix.original_Field field="$field"/></td>
	</inp2:m_DefineElement>

	<inp2:m_block name="subsection" prefix=""/>
	<tr class="subsectiontitle">
	<td colspan="3"><inp2:m_phrase label="$title"/></td>
	<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<td><inp2:m_phrase name="$original_title"/></td>
	</inp2:m_if>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_field_caption" subfield="" NamePrefix=""/>
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="text">
	<label for="<inp2:m_param name="NamePrefix"/><inp2:$prefix_InputName field="$field" subfield="$subfield"/>">
	<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
	<inp2:m_phrase label="$title"/></span><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:
	</label>
	</td>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_label" is_last="" as_label="" currency="" is_last=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td valign="top"><span class="text"><inp2:$prefix_Field field="$field" as_label="$as_label" currency="$currency"/></span></td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	-<inp2:m_block name="inp_id_label"/>
	+<inp2:m_block name="inp_id_label" db=""/>
	<inp2:m_if check="{$prefix}_FieldEquals" field="$field" value="" inverse="inverse">
	<inp2:m_ParseBlock name="inp_label" pass_params="true"/>
	</inp2:m_if>
	<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="$db"/>">
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_box" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
	<td>
	<input type="text" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" value="<inp2:$prefix_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
	<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_DefineElement name="inp_edit_password" class="" size="">
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
	<td>
	<input type="password" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" />
	<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	</inp2:m_DefineElement>

	<inp2:m_block name="inp_edit_upload" class="" is_last=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<input type="file" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>">
	<inp2:m_if check="$prefix_FieldEquals" name="$field" value="" inverse="inverse">
	(<inp2:$prefix_Field field="$field"/>)
	</inp2:m_if>
	<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>[upload]" id="<inp2:$prefix_InputName field="$field"/>[upload]" value="<inp2:$prefix_Field field="$field"/>">
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_box_ml" class="" size="" maxlength=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<td class="text" valign="top">
	<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
	<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span></inp2:m_if>:</span><br>
	<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name="prefix"/>', '<inp2:m_param name="field"/>', 'popups/translator');" title="<inp2:m_Phrase label="la_Translate"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
	</td>
	<td>
	<input type="text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" format="no_default"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_hidden" db=""/>
	<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="$db"/>">
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_date" class="" is_last=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif"> <span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
	<script type="text/javascript">
	initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
	</script>
	<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time" input_format="1"/>" value="">
	</td>
	<td class="error"><inp2:$prefix_Error field="{$field}_date"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>


	<inp2:m_block name="inp_edit_date_time" class="" is_last=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<!-- <input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>"> -->
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
	<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
	<script type="text/javascript">
	initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
	</script>
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>"><span class="small"> (<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_textarea" class="" allow_html="allow_html"/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<td class="text" valign="top">
	<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
	<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
	<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
	<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:$prefix_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
	</inp2:m_if>
	</td>
	<td>
	<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" class="<inp2:m_param name="class"/>"><inp2:$prefix_Field field="$field"/></textarea>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_textarea_ml" class=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<td class="text" valign="top">
	<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
	<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
	<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:$prefix_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
	<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name="prefix"/>', '<inp2:m_param name="field"/>', 'popups/translator', 1);" title="<inp2:m_Phrase label="la_Translate"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
	</td>
	<td>
	<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" class="<inp2:m_param name="class"/>"><inp2:$prefix_Field field="$field"/></textarea>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_user" class="" is_last="" old_style="0" onkeyup=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<input type="text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
	<inp2:m_if check="m_ParamEquals" name="old_style" value="1">
	<a href="#" onclick="return OpenUserSelector('','kernel_form','<inp2:$prefix_InputName field="$field"/>');">
	<inp2:m_else/>
	<a href="javascript:openSelector('<inp2:m_param name="prefix"/>', '<inp2:m_t t="user_selector" pass="all,$prefix" escape="1"/>', '<inp2:m_param name="field"/>');">
	</inp2:m_if>
	<img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
	</a>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>


	<inp2:m_block name="inp_option_item"/>
	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_option_phrase"/>
	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_options" is_last="" has_empty="0" empty_value=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" onchange="<inp2:m_Param name="onchange"/>">
	<inp2:m_if prefix="m" function="ParamEquals" name="use_phrases" value="1"/>
	<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
	<inp2:m_else/>
	<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
	<inp2:m_endif/>
	</select>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_radio_item" onclick="" onchange=""/>
	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="<inp2:m_param name="onclick"/>" onchange="<inp2:m_param name="onchange"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_radio_phrase" onclick="" onchange=""/>
	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="<inp2:m_param name="onclick"/>" onchange="<inp2:m_param name="onchange"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="" use_phrases="1"/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
	<inp2:$prefix_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_phrase" selected="checked" onclick="$onclick" onchange="$onchange" />
	<inp2:m_else />
	<inp2:$prefix_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_item" selected="checked" onclick="$onclick" onchange="$onchange" />
	</inp2:m_if>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_checkbox" is_last="" field_class="" onchange="" onclick=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last" NamePrefix="_cb_"/>
	<td>
	<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>">
	<!--<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:$prefix_InputName field="$field"/>" name="_cb_<inp2:$prefix_InputName field="$field"/>" <inp2:$prefix_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'));" onchange="<inp2:m_param name="onchange"/>">-->
	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:$prefix_InputName field="$field"/>" name="_cb_<inp2:$prefix_InputName field="$field"/>" <inp2:$prefix_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onchange="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'));<inp2:m_param name="onchange"/>" onclick="<inp2:m_param name="onclick"/>">
	<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>


	<inp2:m_block name="inp_checkbox_item"/>
	<input type="checkbox" <inp2:m_param name="checked"/> id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="update_checkbox_options(/^<inp2:$prefix_InputName field="$field" as_preg="1"/>_([0-9A-Za-z-]+)/, '<inp2:$prefix_InputName field="$field"/>');"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_checkbox_phrase"/>
	<input type="checkbox" <inp2:m_param name="checked"/> id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="update_checkbox_options(/^<inp2:$prefix_InputName field="$field" as_preg="1"/>_([0-9A-Za-z-]+)/, '<inp2:$prefix_InputName field="$field"/>');"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_checkboxes" is_last=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	<td>
	<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
	<inp2:$prefix_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" hint_label="$hint_label" block="inp_checkbox_phrase" selected="checked"/>
	<inp2:m_else/>
	<inp2:$prefix_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" hint_label="$hint_label" block="inp_checkbox_item" selected="checked"/>
	</inp2:m_if>
	<inp2:m_ParseBlock prefix="$prefix" name="inp_edit_hidden" field="$field"/>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_checkbox_allow_html"/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<td colspan="2">
	<label for="_cb_<inp2:m_param name="field"/>"><inp2:m_phrase label="la_enable_html"/></label>
	<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>">
	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:$prefix_Field field="$field" checked="checked"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'))">
	<br>
	<span class="hint"><img src="img/smicon7.gif" width="14" height="14" align="absmiddle"><inp2:m_phrase label="la_Warning_Enable_HTML"/></span>

	</td>
	<td> </td>
	</tr>
	<inp2:m_blockend/>

	<inp2:m_block name="inp_edit_weight" subfield="" class="" is_last="" maxlength=""/>
	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
	<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
	<td>
	<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
	<input type="text" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" value="<inp2:$prefix_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
	<inp2:m_phrase label="la_kg" />
	</inp2:m_if>
	<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_a" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="{$field}_a" subfield="$subfield"/>" value="<inp2:$prefix_Field field="{$field}_a" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
	<inp2:m_phrase label="la_lbs" />
	<input type="text" name="<inp2:$prefix_InputName field="{$field}_b" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="{$field}_b" subfield="$subfield"/>" value="<inp2:$prefix_Field field="{$field}_b" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
	<inp2:m_phrase label="la_oz" />
	</inp2:m_if>
	</td>
	<td class="error"><inp2:$prefix_Error field="$field"/> </td>
	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
	<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
	</inp2:m_if>
	</tr>
	<inp2:m_blockend />


	<inp2:m_DefineElement name="ajax_progress_bar">
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
	<tr class="table_color1">
	<td colspan="2">
	<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
	<!-- progress bar paddings: begin -->
	<table width="90%" cellpadding="2" cellspacing="0" border="0" align="center">
	<tr>
	<td class="progress-text">0%</td>
	<td width="100%">
	<!-- progress bar: begin -->
	<table cellspacing="0" cellpadding="0" width="100%" border="0" align="center" style="background-color: #FFFFFF; border: 1px solid #E6E6E6;">
	<tr>
	<td colspan="3"><img src="img/spacer.gif" height="2" width="1" alt="" /></td>
	</tr>
	<tr>
	<td width="2"><img src="img/spacer.gif" height="13" width="3" alt="" /></td>
	<td align="center" width="100%">
	<table cellspacing="0" cellpadding="0" width="100%" border="0" style="background: url(img/progress_left.gif) repeat-x;">
	<tr>
	<td id="progress_bar[done]" style="background: url(img/progress_done.gif);" align="left"></td>
	<td id="progress_bar[left]" align="right"><img src="img/spacer.gif" height="9" width="1" alt="" /></td>
	</tr>
	</table>
	</td>
	<td width="1"><img src="img/spacer.gif" height="13" width="3" alt="" /></td>
	</tr>
	<tr>
	<td colspan="3"><img src="img/spacer.gif" height="2" width="1" alt="" /></td>
	</tr>
	</table>
	<!-- progress bar: end -->
	</td>
	<td class="progress-text">100%</td>
	</tr>
	</table>
	<!-- progress bar paddings: end -->
	<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
	</td>
	</tr>
	<tr class="table_color2">
	<td width="50%" align="right"><inp2:m_phrase name="la_fld_PercentsCompleted"/>:</td>
	<td id="progress_display[percents_completed]">0%</td>
	</tr>
	<tr class="table_color1">
	<td align="right"><inp2:m_phrase name="la_fld_ElapsedTime"/>:</td>
	<td id="progress_display[elapsed_time]">00:00</td>
	</tr>
	<tr class="table_color2">
	<td align="right"><inp2:m_phrase name="la_fld_EstimatedTime"/>:</td>
	<td id="progress_display[Estimated_time]">00:00</td>
	</tr>
	<tr class="table_color1">
	<td align="center" colspan="2">
	<input type="button" class="button" onclick="<inp2:m_param name="cancel_action"/>" value="<inp2:m_phrase name="la_Cancel"/>" />
	</td>
	</tr>
	</table>
	</inp2:m_DefineElement>

	<inp2:m_DefineElement name="ml_selector" prefix="">

	</inp2:m_DefineElement>

	Property changes on: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.4.2.11
	\ No newline at end of property
	+1.4.2.12
	\ 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