in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Sun, Jul 20, 10:00 AM

in-portal
View Options

	Index: trunk/kernel/startup.php
	===================================================================
	--- trunk/kernel/startup.php (revision 4884)
	+++ trunk/kernel/startup.php (revision 4885)
	@@ -1,215 +1,210 @@
	<?php
	if( !defined('FULL_PATH') ) define('FULL_PATH', realpath(dirname(__FILE__).'/..') );

	require_once FULL_PATH.'/globals.php';

	if( !isset($FrontEnd) ) $FrontEnd = 0;

	if( !class_exists('kApplication') )
	{
	// KENEL4 INIT: BEGIN
	if ($FrontEnd != 1 && !defined('ADMIN') ) {
	define('ADMIN', 1);
	}

	if ( !defined('APPLICATION_CLASS') ) {
	define('APPLICATION_CLASS', 'MyApplication');
	}
	include_once(FULL_PATH.'/kernel/kernel4/startup.php');

	- // just to make sure that this is correctly detected
	- if ( IsDebugMode() ) {
	- $debugger->printConstants('FULL_PATH,SQL_DB');
	- }
	-
	$application =& kApplication::Instance();
	$application->Init();
	$application->ProcessRequest();
	// KERNEL4 INIT: END
	}

	// compatibility constants
	$g_TablePrefix = TABLE_PREFIX;
	$pathtoroot = preg_replace('/(.*)\/$/', '\\1', FULL_PATH).'/';

	$admin = 'admin';
	$rootURL = PROTOCOL.SERVER_NAME.(defined('PORT')?':'.PORT : '').rtrim(BASE_PATH, '/').'/';
	$localURL = $rootURL.'kernel/';
	$adminURL = $rootURL.$admin;
	$imagesURL = $adminURL.'/images';
	$browseURL = $adminURL.'/browse';
	$cssURL = $adminURL.'/include';
	$pathchar = '/';

	if(!get_magic_quotes_gpc())
	{
	function addSlashesA($a)
	{
	foreach($a as $k => $v)
	{
	$a[$k] = is_array($v) ? addSlashesA($v) : addslashes($v);
	}
	return $a;
	}
	foreach(Array(
	'HTTP_GET_VARS','HTTP_POST_VARS','HTTP_COOKIE_VARS','HTTP_SESSION_VARS','HTTP_SERVER_VARS',
	'_POST','_GET','_COOKIE','_SESSION','_SERVER','_REQUEST') as $_)
	if(isset($GLOBALS[$_]))
	$GLOBALS[$_]=addSlashesA($GLOBALS[$_]);
	}

	/*
	startup.php: this is the primary startup sequence for in-portal services
	*/

	if( file_exists(FULL_PATH.'/debug.php') && !defined('DEBUG_MODE') ) include_once(FULL_PATH.'/debug.php');
	if( !defined('DEBUG_MODE') ) error_reporting(0);

	ini_set('memory_limit', constOn('IS_INSTALL') ? -1 : '32M');
	ini_set('include_path', '.');

	$kernel_version = "1.0.0";
	$FormError = array();
	$FormValues = array();
	/* include PHP version compatibility functions */
	require_once(FULL_PATH.'/compat.php');
	/* set global variables and module lists */

	if( constOn('DEBUG_MODE') ) include_once(FULL_PATH.'/kernel/include/debugger.php');

	// put all non-checked checkboxes in $_POST & $_REQUEST with 0 values
	if( GetVar('form_fields') )
	{
	$form_fields = GetVar('form_fields');
	foreach($form_fields as $checkbox_name)
	{
	if( GetVar($checkbox_name) === false ) SetVar($checkbox_name,0);
	}
	}

	LogEntry("Initalizing System..\n");
	/* for 64 bit timestamps */
	if( !function_exists('adodb_mktime') ) require_once(FULL_PATH.'/kernel/include/adodb/adodb-time.inc.php');
	require_once(FULL_PATH.'/kernel/include/dates.php');

	/* create the global error object */
	require_once(FULL_PATH.'/kernel/include/error.php');
	$Errors = new clsErrorManager();

	require_once(FULL_PATH.'/kernel/include/itemdb.php');

	require_once(FULL_PATH.'/kernel/include/db.class.php'); // moved from kernel/include/config.php
	require_once(FULL_PATH.'/kernel/include/adodb/adodb.inc.php'); // moved from kernel/include/config.php

	require_once(FULL_PATH.'/kernel/include/config.php');
	/* create the global configuration object */
	LogEntry("Creating Config Object..\n");
	$objConfig = new clsConfig();
	$objConfig->Load(); /* Populate our configuration data */
	LogEntry("Done Loading Configuration\n");
	if( defined('ADODB_EXTENSION') && constant('ADODB_EXTENSION') > 0 )
	LogEntry("ADO Extension: ".ADODB_EXTENSION."\n");

	require_once(FULL_PATH.'/kernel/include/parseditem.php');

	require_once(FULL_PATH.'/kernel/include/itemreview.php'); // moved from kernel/include/item.php
	require_once(FULL_PATH.'/kernel/include/itemrating.php'); // moved from kernel/include/item.php

	require_once(FULL_PATH.'/kernel/include/item.php');
	require_once(FULL_PATH.'/kernel/include/syscache.php');
	require_once(FULL_PATH.'/kernel/include/modlist.php');
	require_once(FULL_PATH.'/kernel/include/searchconfig.php');
	require_once(FULL_PATH.'/kernel/include/banrules.php');

	$objModules = new clsModList();
	$objSystemCache = new clsSysCacheList();
	$objSystemCache->PurgeExpired();
	$objBanList = new clsBanRuleList();

	require_once(FULL_PATH.'/kernel/include/image.php');

	require_once(FULL_PATH.'/kernel/include/itemtypes.php');
	$objItemTypes = new clsItemTypeList();

	require_once(FULL_PATH.'/kernel/include/theme.php');
	$objThemes = new clsThemeList();

	require_once(FULL_PATH.'/kernel/include/language.php');
	$objLanguages = new clsLanguageList();
	$objImageList = new clsImageList();

	/* Load session and user class definitions */
	//require_once("include/customfield.php");
	//require_once("include/custommetadata.php");
	require_once(FULL_PATH.'/kernel/include/usersession.php');
	require_once(FULL_PATH.'/kernel/include/favorites.php');
	require_once(FULL_PATH.'/kernel/include/portaluser.php');
	require_once(FULL_PATH.'/kernel/include/portalgroup.php');

	/* create the user management class */
	$objFavorites = new clsFavoriteList();
	$objUsers = new clsUserManager();
	$objGroups = new clsGroupList();

	require_once(FULL_PATH.'/kernel/include/cachecount.php');
	require_once(FULL_PATH.'/kernel/include/customfield.php');
	require_once(FULL_PATH.'/kernel/include/custommetadata.php');
	require_once(FULL_PATH.'/kernel/include/permissions.php');
	require_once(FULL_PATH.'/kernel/include/relationship.php');
	require_once(FULL_PATH.'/kernel/include/category.php');
	require_once(FULL_PATH.'/kernel/include/statitem.php');
	/* category base class, used by all the modules at some point */
	$objPermissions = new clsPermList();
	$objPermCache = new clsPermCacheList();

	$objCatList = new clsCatList();
	$objCustomFieldList = new clsCustomFieldList();
	$objCustomDataList = new clsCustomDataList();
	$objCountCache = new clsCacheCountList();

	require_once(FULL_PATH.'/kernel/include/smtp.php');
	require_once(FULL_PATH.'/kernel/include/emailmessage.php');
	require_once(FULL_PATH.'/kernel/include/events.php');
	LogEntry("Creating Mail Queue..\n");
	$objMessageList = new clsEmailMessageList();
	$objEmailQueue = new clsEmailQueue();
	LogEntry("Done creating Mail Queue Objects\n");

	require_once(FULL_PATH.'/kernel/include/searchitems.php');
	require_once(FULL_PATH.'/kernel/include/advsearch.php');

	require_once(FULL_PATH.'/kernel/include/parse.php');
	require_once(FULL_PATH.'/kernel/include/socket.php');

	/* responsible for including module code as required
	This script also creates an instance of the user session onject and
	handles all session management. The global session object is created
	and populated, then the global user object is created and populated

	each module's parser functions and action code is included here
	*/

	LogEntry("Startup complete\n");
	include_once("include/modules.php");

	if( IsDebugMode() && function_exists('DebugByFile') ) DebugByFile();

	/* startup is complete, so now check the mail queue to see if there's anything that needs to be sent*/
	$objEmailQueue->SendMailQeue();

	$ado=&GetADODBConnection();
	$rs = $ado->Execute("SELECT * FROM ".GetTablePrefix()."Modules WHERE LoadOrder = 0");

	$kernel_version = $rs->fields['Version'];


	$adminDir = $objConfig->Get("AdminDirectory");
	if ($adminDir == '') {
	$adminDir = 'admin';
	}

	/*if (strstr(__FILE__, $adminDir) && !GetVar('logout') && !strstr(__FILE__, "install") && !strstr(__FILE__, "index")) {
	require_login(null, 'expired='.(int)GetVar('expired') );
	}*/

	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/startup.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.42
	\ No newline at end of property
	+1.43
	\ No newline at end of property
	Index: trunk/kernel/units/languages/languages_event_handler.php
	===================================================================
	--- trunk/kernel/units/languages/languages_event_handler.php (revision 4884)
	+++ trunk/kernel/units/languages/languages_event_handler.php (revision 4885)
	@@ -1,416 +1,416 @@
	<?php

	class LanguagesEventHandler extends InpDBEventHandler
	{
	/**
	* Allows to override standart permission mapping
	*
	*/
	function mapPermissions()
	{
	parent::mapPermissions();
	$permissions = Array(
	'OnChangeLanguage' => Array('self' => true),
	'OnSetPrimary' => Array('self' => 'advanced:set_primary\|add\|edit'),
	'OnImportLanguage' => Array('self' => 'advanced:import'),
	'OnExportLanguage' => Array('self' => 'advanced:export'),
	'OnExportProgress' => Array('self' => 'advanced:export'),

	);
	$this->permMapping = array_merge($this->permMapping, $permissions);
	}

	/**
	* Updates table structure on new language adding/removing language
	*
	* @param kEvent $event
	*/
	function OnReflectMultiLingualFields($event)
	{
	$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');

	- $this->Application->UnitConfigReader->includeConfigFiles(); //make sure to re-read all configs
	+ $this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH); //make sure to re-read all configs
	foreach ($this->Application->UnitConfigReader->configData as $prefix => $config_data) {
	$ml_helper->createFields($prefix);
	}
	}

	/**
	* Allows to set selected language as primary
	*
	* @param kEvent $event
	*/
	function OnSetPrimary(&$event)
	{
	$this->StoreSelectedIDs($event);
	$ids = $this->getSelectedIDs($event);
	if ($ids) {
	$id = array_shift($ids);
	$object =& $event->getObject( Array('skip_autoload' => true) );
	$object->Load($id);
	$object->setPrimary();
	}
	}

	/**
	* [HOOK] Reset primary status of other languages if we are saving primary language
	*
	* @param kEvent $event
	*/
	function OnUpdatePrimary(&$event)
	{
	$object =& $event->getObject( Array('skip_autoload' => true) );
	$object->SwitchToLive();

	// set primary for each languages, that have this checkbox checked
	$ids = explode(',', $event->MasterEvent->getEventParam('ids'));
	foreach ($ids as $id) {
	$object->Load($id);
	if ($object->GetDBField('PrimaryLang')) {
	$object->setPrimary();
	}

	}

	// if no primary language left, then set primary last language (not to load again) from edited list
	$sql = 'SELECT '.$object->IDField.'
	FROM '.$object->TableName.'
	WHERE PrimaryLang = 1';
	$primary_language = $this->Conn->GetOne($sql);

	if (!$primary_language) {
	$object->setPrimary(false);
	}
	}


	/**
	* Occurse before updating item
	*
	* @param kEvent $event
	* @access public
	*/
	function OnBeforeItemUpdate(&$event)
	{
	$object =& $event->getObject();
	$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );

	if ($object->GetDBField('PrimaryLang') == 1 && $object->GetDBField($status_field) == 0) {
	$object->SetDBField($status_field, 1);
	}
	}

	/**
	* Shows only enabled languages on front
	*
	* @param kEvent $event
	*/
	function SetCustomQuery(&$event)
	{
	if($event->Special == 'enabled')
	{
	$object =& $event->getObject();
	$object->addFilter('enabled_filter', '%1$s.Enabled = 1');
	}
	}

	/**
	* Copy labels from another language
	*
	* @param kEvent $event
	*/
	function OnCopyLabels(&$event)
	{
	$object =& $event->getObject();
	$from_lang_id = $object->GetDBField('CopyFromLanguage');

	if( ($event->MasterEvent->status == erSUCCESS) && $object->GetDBField('CopyLabels') == 1 && ($from_lang_id > 0) )
	{
	$lang_id = $object->GetID();

	// 1. phrases import
	$phrases_live = $this->Application->getUnitOption('phrases','TableName');
	$phrases_temp = $this->Application->GetTempName($phrases_live);
	$sql = 'INSERT INTO '.$phrases_temp.'
	SELECT Phrase, Translation, PhraseType, 0-PhraseId, '.$lang_id.', '.adodb_mktime().', "", Module
	FROM '.$phrases_live.'
	WHERE LanguageId='.$from_lang_id;
	$this->Conn->Query($sql);

	// 2. events import
	$em_table_live = $this->Application->getUnitOption('emailmessages','TableName');
	$em_table_temp = $this->Application->GetTempName($em_table_live);

	$sql = 'SELECT * FROM '.$em_table_live.' WHERE LanguageId = '.$from_lang_id;
	$email_messages = $this->Conn->Query($sql);
	if($email_messages)
	{
	$id = $this->Conn->GetOne('SELECT MIN(EmailMessageId) FROM '.$em_table_live);
	if($id > 0) $id = 0;
	$id--;

	$sqls = Array();
	foreach($email_messages as $email_message)
	{
	$sqls[] = $id.','.$this->Conn->qstr($email_message['Template']).','.$this->Conn->qstr($email_message['MessageType']).','.$lang_id.','.$email_message['EventId'];
	$id--;
	}
	$sql = 'INSERT INTO '.$em_table_temp.'(EmailMessageId,Template,MessageType,LanguageId,EventId) VALUES ('.implode('),(',$sqls).')';
	$this->Conn->Query($sql);
	}

	$object->SetDBField('CopyLabels', 0);
	}
	}

	/**
	* Prepare temp tables for creating new item
	* but does not create it. Actual create is
	* done in OnPreSaveCreated
	*
	* @param kEvent $event
	*/
	function OnPreCreate(&$event)
	{
	parent::OnPreCreate($event);

	$object =& $event->getObject();
	$object->SetDBField('CopyLabels', 1);

	$live_table = $this->Application->GetLiveName($object->TableName);
	$primary_lang_id = $this->Conn->GetOne('SELECT '.$object->IDField.' FROM '.$live_table.' WHERE PrimaryLang = 1');

	$object->SetDBField('CopyFromLanguage', $primary_lang_id);
	}


	function OnChangeLanguage(&$event)
	{
	$this->Application->SetVar('m_lang', $this->Application->GetVar('language'));

	//$this->Application->LinkVar('language', 'm_lang');
	}

	/**
	* Parse language XML file into temp tables and redirect to progress bar screen
	*
	* @param kEvent $event
	*/
	function OnImportLanguage(&$event)
	{
	$items_info = $this->Application->GetVar('phrases_import');
	if($items_info)
	{
	list($id,$field_values) = each($items_info);
	$object =& $this->Application->recallObject('phrases.import', 'phrases', Array('skip_autoload' => true) );
	$object->SetFieldsFromHash($field_values);

	$filename = getArrayValue($field_values, 'LangFile', 'tmp_name');
	if( filesize($filename) )
	{
	$modules = getArrayValue($field_values,'Module');
	$lang_xml =& $this->Application->recallObject('LangXML');
	$lang_xml->Parse($filename, $field_values['PhraseType'], $modules, $field_values['ImportOverwrite']);

	$event->redirect = 'dummy';
	$event->SetRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'mode'=>$field_values['ImportOverwrite']) );
	}
	else
	{
	$object =& $this->Application->recallObject('phrases.import');
	$object->SetError('LangFile', 'la_empty_file', 'la_EmptyFile');
	$event->redirect = false;
	}
	}
	}

	/**
	* Copies imported from xml file from temp table to live table
	*
	* @param kEvent $event
	*/
	function OnImportProgress(&$event)
	{
	define('IMPORT_BY', 300); // import this much records per step
	$template_name = 'regional/languages_import_step2';

	$import_mode = (int)$this->Application->GetVar('mode'); // 1 - overwrite existing phrases, 0 - don't overwrite existing phrases
	$import_source = (int)$this->Application->GetVar('source');
	$import_steps = Array(0 => 'lang', 1 => 'phrases', 2 => 'emailmessages', 3 => 'finish');

	$key_fields = Array(0 => 'PackName', 1 => 'Phrase', 2 => 'EventId'); // by what field should we search record match

	$import_titles = Array(0 => 'la_ImportingLanguages', 1 => 'la_ImportingPhrases', 2 => 'la_ImportingEmailEvents', 3 => 'la_Done');

	// --- BEFORE ---
	$import_prefix = $import_steps[$import_source];
	$import_start = (int)$this->Application->GetVar('start');
	$id_field = $this->Application->getUnitOption($import_prefix,'IDField');
	$dst_table = $this->Application->getUnitOption($import_prefix,'TableName');
	$src_table = $this->Application->GetTempName($dst_table);

	$import_total = $this->Application->GetVar('total');
	if(!$import_total) $import_total = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$src_table);
	// --- AFTER ---

	if($import_start == $import_total)
	{
	$import_source++;
	$import_prefix = $import_steps[$import_source];
	if($import_prefix == 'finish')
	{
	$event->SetRedirectParam('opener','u');
	return true;
	}

	$import_start = 0;
	$id_field = $this->Application->getUnitOption($import_prefix,'IDField');
	$dst_table = $this->Application->getUnitOption($import_prefix,'TableName');
	$src_table = $this->Application->GetTempName($dst_table);
	$import_total = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$src_table);
	}

	if($import_total > 0)
	{
	$done_percent = ($import_start * 100) / $import_total;
	}
	else
	{
	$done_percent = 100;
	}

	$block_params = Array( 'name' => $template_name,
	'title' => $import_titles[$import_source],
	'percent_done' => $done_percent,
	'percent_left' => 100 - $done_percent);

	$this->Application->InitParser();
	$this->Application->setUnitOption('phrases','AutoLoad',false);
	echo $this->Application->ParseBlock($block_params);
	flush();

	$sql = 'SELECT * FROM %s LIMIT %s,%s';
	$rows = $this->Conn->Query( sprintf($sql,$src_table,$import_start,IMPORT_BY) );

	$values_sql = '';

	// if found and mode = 1 (overwrite)
	$search_sql = 'SELECT '.$id_field.' FROM '.$dst_table.' WHERE '.$key_fields[$import_source].' = %s AND LanguageId = %s';
	$update_sql = 'UPDATE '.$dst_table.' SET %s WHERE '.$id_field.' = %s';

	foreach($rows as $row)
	{
	$tmp_sql = sprintf($search_sql, $this->Conn->qstr($row[ $key_fields[$import_source] ]), $row['LanguageId'] );
	$tmp_id = $this->Conn->GetOne($tmp_sql);
	if($tmp_id > 0 && $import_mode == 1)
	{
	// update
	$update_fields = '';
	foreach($row as $field_name => $field_value)
	{
	if($field_name == $id_field) continue;
	$update_fields .= '`'.$field_name.'` = '.$this->Conn->qstr($field_value).',';
	}
	$update_fields = preg_replace('/(.*),$/', '\\1', $update_fields);
	$this->Conn->Query( sprintf($update_sql, $update_fields, $tmp_id) );
	}
	elseif(!$tmp_id)
	{
	$values_sql .= '(';
	foreach($row as $field_value)
	{
	$values_sql .= $this->Conn->qstr($field_value).',';
	}
	$values_sql = preg_replace('/(.*),$/', '\\1', $values_sql).'),';
	}
	}

	if($values_sql)
	{
	$fields_sql = '';
	$fields = array_keys( $this->Application->getUnitOption($import_prefix,'Fields') );
	foreach($fields as $field_name)
	{
	$fields_sql .= '`'.$field_name.'`,';
	}
	$fields_sql = preg_replace('/(.*),$/', '\\1', $fields_sql);

	$values_sql = preg_replace('/(.*),$/', '\\1', $values_sql);
	$sql = sprintf('INSERT INTO %s (%s) VALUES %s', $dst_table, $fields_sql, $values_sql);
	$this->Conn->Query($sql);
	}
	$event->setRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'start' => $import_start += count($rows), 'total' => $import_total, 'source' => $import_source, 'mode' => $import_mode) );
	}

	/**
	* Stores ids of selected languages and redirects to export language step 1
	*
	* @param kEvent $event
	*/
	function OnExportLanguage(&$event)
	{
	$this->Application->setUnitOption('phrases','AutoLoad',false);

	$this->StoreSelectedIDs($event);
	$this->Application->StoreVar('export_language_ids', implode(',', $this->getSelectedIDs($event)) );

	$event->setRedirectParams( Array('m_opener'=>'d','phrases.export_event'=>'OnNew','pass'=>'all,phrases.export') );
	$event->redirect = 'regional/languages_export';
	}

	/**
	* Saves selected languages to xml file passed
	*
	* @param kEvent $event
	*/
	function OnExportProgress(&$event)
	{
	$items_info = $this->Application->GetVar('phrases_export');
	if($items_info)
	{
	list($id,$field_values) = each($items_info);
	$object =& $this->Application->recallObject('phrases.export', 'phrases', Array('skip_autoload' => true) );
	$object->SetFieldsFromHash($field_values);

	$lang_ids = explode(',', $this->Application->RecallVar('export_language_ids') );

	if( !getArrayValue($field_values,'LangFile') )
	{
	$object->SetError('LangFile', 'required');
	$event->redirect = false;
	return false;
	}
	if( !is_writable(EXPORT_PATH) )
	{
	$object->SetError('LangFile', 'write_error', 'la_ExportFolderNotWritable');
	$event->redirect = false;
	return false;
	}
	if( substr($field_values['LangFile'], -5) != '.lang' ) $field_values['LangFile'] .= '.lang';
	$filename = EXPORT_PATH.'/'.$field_values['LangFile'];

	$lang_xml =& $this->Application->recallObject('LangXML');
	if ($object->GetDBField('DoNotEncode')) {
	$lang_xml->SetEncoding('plain');
	}
	$lang_xml->Create($filename, $field_values['PhraseType'], $lang_ids, $field_values['Module']);

	}

	$event->redirect = 'regional/languages_export_step2';
	$event->SetRedirectParam('export_file', $field_values['LangFile']);
	}

	/**
	* Returns to previous template in opener stack
	*
	* @param kEvent $event
	*/
	function OnGoBack(&$event)
	{
	$event->redirect_params['opener'] = 'u';
	}

	}

	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/units/languages/languages_event_handler.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.25
	\ No newline at end of property
	+1.26
	\ No newline at end of property
	Index: trunk/kernel/units/general/helpers/sections_helper.php
	===================================================================
	--- trunk/kernel/units/general/helpers/sections_helper.php (revision 4884)
	+++ trunk/kernel/units/general/helpers/sections_helper.php (revision 4885)
	@@ -1,109 +1,109 @@
	<?php

	/**
	* Porcesses sections information from configs
	*
	*/
	class kSectionsHelper extends kHelper {

	/**
	* Holds information about all sections
	*
	* @var Array
	*/
	var $Tree = Array();

	/**
	* Set's prefix and special
	*
	* @param string $prefix
	* @param string $special
	* @access public
	*/
	function Init($prefix, $special, $event_params = null)
	{
	parent::Init($prefix, $special, $event_params);
	$this->BuildTree();
	}

	/**
	* Builds xml for tree in left frame in admin
	*
	* @param Array $params
	*/
	function BuildTree()
	{
	$unit_config_reader = false;
	$data = $this->Conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "sections_parsed"');
	if ($data) {
	$this->Tree = unserialize($data['Data']);
	return ;
	}
	- $this->Application->UnitConfigReader->includeConfigFiles();
	+ $this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH);

	$this->Tree = Array();
	if (!$unit_config_reader) {
	$unit_config_reader =& $this->Application->recallObject('kUnitConfigReader');
	}

	$prefixes = array_keys($unit_config_reader->configData);
	foreach ($prefixes as $prefix) {
	$config =& $unit_config_reader->configData[$prefix];
	$sections = getArrayValue($config, 'Sections');
	if (!$sections) continue;

	// echo 'Prefix: ['.$prefix.'] has ['.count($sections).'] sections<br />';

	foreach ($sections as $section_name => $section_params) {
	// we could also skip not allowed sections here in future
	$section_params['SectionPrefix'] = $prefix;
	$section_params['url']['m_opener'] = 'r';

	$pass_section = getArrayValue($section_params, 'url', 'pass_section');

	if ($pass_section) {
	unset($section_params['url']['pass_section']);
	$section_params['url']['section'] = $section_name;
	if (!isset($section_params['url']['module'])) {
	$module_name = $this->Application->findModule('Path', $config['ModuleFolder'].'/', 'Name');
	$section_params['url']['module'] = $module_name;
	}
	}
	if (!isset($section_params['url']['t'])) {
	$section_params['url']['t'] = 'index';
	}

	$current_data = isset($this->Tree[$section_name]) ? $this->Tree[$section_name] : Array();
	$this->Tree[$section_name] = array_merge_recursive2($current_data, $section_params);

	$this->Tree[ $section_params['parent'] ]['children'][ "{$section_params['priority']}" ] = $section_name;

	if ($section_params['type'] == stTAB) {
	// if this is tab, then mark parent section as TabOnly
	$this->Tree[ $section_params['parent'] ]['tabs_only'] = true;
	}
	}
	}

	$this->Conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("sections_parsed", '.$this->Conn->qstr(serialize($this->Tree)).', '.adodb_mktime().')');
	}

	/**
	* Returns details information about section
	*
	* @param string $section_name
	* @return Array
	*/
	function &getSectionData($section_name)
	{
	if (isset($this->Tree[$section_name])) {
	$ret =& $this->Tree[$section_name];
	}
	else {
	$ret = Array();
	}
	return $ret;
	}
	}

	?>
	\ No newline at end of file

	Property changes on: trunk/kernel/units/general/helpers/sections_helper.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.5
	\ No newline at end of property
	+1.6
	\ No newline at end of property
	Index: trunk/admin/install/install_lib.php
	===================================================================
	--- trunk/admin/install/install_lib.php (revision 4884)
	+++ trunk/admin/install/install_lib.php (revision 4885)
	@@ -1,1042 +1,1044 @@
	<?php
	function minimum_php_version( $vercheck )
	{
	$minver = explode(".", $vercheck);
	$curver = explode(".", phpversion());
	if (($curver[0] < $minver[0])
	\|\| (($curver[0] == $minver[0])
	&& ($curver[1] < $minver[1]))
	\|\| (($curver[0] == $minver[0]) && ($curver[1] == $minver[1])
	&& ($curver[2][0] < $minver[2][0])))
	return false;
	else
	return true;
	}

	function VersionSort($a, $b)
	{
	if( preg_match('/inportal_upgrade_v(.*).(php\|sql)$/', $a, $rets) )
	{
	$a_version = $rets[1];
	$a_extension = $rets[2];
	}

	if( preg_match('/inportal_upgrade_v(.*).(php\|sql)$/', $b, $rets) )
	{
	$b_version = $rets[1];
	$b_extension = $rets[2];
	}
	if( !isset($a_version) \|\| !isset($b_version) ) return 0; // not php or sql file

	if($a_version == $b_version) // got PHP and SQL file for one version
	{
	if($a_extension == $b_extension)
	{
	return 0;
	}
	else
	{
	return ($a_extension == 'php') ? 1 : -1;
	}
	}
	else
	{
	return (ConvertVersion($a_version) < ConvertVersion($b_version)) ? -1 : 1;
	}
	}

	function GetMaxPortalVersion($admindirname)
	{
	$dir = @dir($admindirname.'/install/upgrades');

	$upgrades_arr = Array();

	$version = '';
	while($file = $dir->read())
	{
	if ($file != "." && $file != ".." && !is_dir($admindirname.$file))
	{
	if (strstr($file, 'inportal_upgrade_v')) $upgrades_arr[] = $file;
	}
	}

	usort($upgrades_arr, "VersionSort");

	foreach($upgrades_arr as $file)
	{
	if( preg_match('/inportal_upgrade_v(.*).(php\|sql)$/', $file, $rets) )
	{
	$a_version = $rets[1];

	if (ConvertVersion($a_version) > ConvertVersion($version)) {
	$version = $a_version;
	}
	}
	}

	return $version;
	}

	function ConvertVersion($version)
	{
	$parts = explode('.', $version);

	$bin = '';
	foreach ($parts as $part) {
	$bin .= str_pad(decbin($part), 8, '0', STR_PAD_LEFT);
	}

	$dec = bindec($bin);

	return $dec;
	}

	function TableExists(&$ado, $tables)
	{
	global $g_TablePrefix;

	$t = explode(",",$tables);

	$i = $ado->MetaTables();
	for($x=0;$x<count($i);$x++)
	$i[$x] = strtolower($i[$x]);

	$AllFound = TRUE;
	for($tIndex=0;$tIndex<count($t);$tIndex++)
	{
	$table = $g_TablePrefix.$t[$tIndex];
	$table = strtolower($table);
	if(!in_array($table,$i))
	{
	$AllFound = FALSE;
	}

	}
	return $AllFound;
	}

	function set_ini_value($section, $key, $newvalue)
	{
	global $ini_vars;
	$ini_vars[$section][$key] = $newvalue;
	}

	function save_values()
	{
	// Should write something to somwere, but it doesn't :(
	global $ini_file,$ini_vars;

	//if( file_exists($ini_file) )
	//{
	$fp = fopen($ini_file, "w");
	fwrite($fp,'<'.'?'.'php die() ?'.">\n\n");
	foreach($ini_vars as $secname => $section)
	{
	fwrite($fp,"[".$secname."]\n");
	foreach($section as $key => $value) fwrite($fp,"$key = \"$value\"\n");
	fwrite($fp,"\n");
	}
	fclose($fp);
	//}
	}

	function getConnectionInterface($action, $dbo_type='adodb')
	{
	if($dbo_type == 'adodb')
	{
	switch($action)
	{
	case 'query': return 'Execute'; break;
	case 'errorno': return 'ErrorNo'; break;
	case 'errormsg': return 'ErrorMsg'; break;
	}
	}

	if($dbo_type == 'dbconnection')
	{
	switch($action)
	{
	case 'query': return 'Query'; break;
	case 'errorno': return 'getErrorCode'; break;
	case 'errormsg': return 'getErrorMsg'; break;
	}

	}
	}

	function RunSchemaFile(&$ado, $filename, $dbo_type='adodb')
	{
	if( file_exists($filename) )
	{
	$sql = file_get_contents($filename);
	if($sql) RunSchemaText($ado,$sql,$dbo_type);
	}
	}

	function RunSchemaText(&$ado, $sql, $dbo_type='adodb')
	{
	global $g_TablePrefix;

	if(strlen($g_TablePrefix))
	{
	$what = "CREATE TABLE ";
	$replace = "CREATE TABLE ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "DROP TABLE ";
	$replace = "DROP TABLE IF EXISTS ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "INSERT INTO ";
	$replace = "INSERT INTO ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "UPDATE ";
	$replace = "UPDATE ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "ALTER TABLE ";
	$replace = "ALTER TABLE ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);
	}

	$commands = explode("# --------------------------------------------------------",$sql);
	if(count($commands)>0)
	{
	$query_func = getConnectionInterface('query',$dbo_type);
	$errorno_func = getConnectionInterface('errorno',$dbo_type);
	$errormsg_func = getConnectionInterface('errormsg',$dbo_type);

	for($i = 0; $i < count($commands); $i++)
	{
	$cmd = $commands[$i];
	$cmd = trim($cmd);
	if(strlen($cmd)>0)
	{
	$ado->$query_func($cmd);
	if($ado->$errorno_func() != 0)
	{
	$db_error = $ado->$errormsg_func()." COMMAND:<PRE>$cmd</PRE>";
	}
	}
	}
	}
	}

	function RunSQLText(&$ado, $allsql, $dbo_type='adodb')
	{
	global $g_TablePrefix;

	$line = 0;
	$query_func = getConnectionInterface('query',$dbo_type);
	$errorno_func = getConnectionInterface('errorno',$dbo_type);
	$errormsg_func = getConnectionInterface('errormsg',$dbo_type);

	while($line<count($allsql))
	{
	$sql = $allsql[$line];
	if(strlen(trim($sql))>0 && substr($sql,0,1)!="#")
	{
	if(strlen($g_TablePrefix))
	{
	$what = "CREATE TABLE ";
	$replace = "CREATE TABLE ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "DELETE FROM ";
	$replace = "DELETE FROM ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "DROP TABLE ";
	$replace = "DROP TABLE IF EXISTS ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "DROP TABLE IF EXISTS ";
	$replace = "DROP TABLE IF EXISTS ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "INSERT INTO ";
	$replace = "INSERT INTO ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "UPDATE ";
	$replace = "UPDATE ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);

	$what = "ALTER TABLE ";
	$replace = "ALTER TABLE ".$g_TablePrefix;
	$sql = ereg_replace($what, $replace, $sql);
	}
	$sql = trim($sql);
	if(strlen($sql)>0)
	{
	$ado->$query_func($sql);
	if($ado->$errorno_func()!=0)
	{
	$db_error = $ado->$errormsg_func()." COMMAND:<PRE>$sql</PRE>";
	$error = TRUE;
	}
	}
	}
	$line++;
	}
	}

	function RunSQLFile(&$ado, $filename, $dbo_type='adodb')
	{
	if(file_exists($filename))
	{
	$allsql = file($filename);
	RunSQLText($ado,$allsql,$dbo_type);
	}
	}

	function RunRestoreFile($ado,$filename,$FileOffset,$MaxLines)
	{
	$size = filesize($filename);

	if($FileOffset > $size)
	return -2;

	$fp = fopen($filename,"r");
	if(!$fp)
	return -1;

	if($FileOffset>0)
	{
	fseek($fp,$FileOffset);
	}
	else
	{
	$EndOfSQL = FALSE;
	$sql = "";
	while(!feof($fp) && !$EndOfSQL)
	{
	$l = fgets($fp,16384);
	if(substr($l,0,11)=="INSERT INTO")
	{
	$EndOfSQL = TRUE;
	}
	else
	{
	$sql .= $l;
	$FileOffset = ftell($fp) - strlen($l);
	}
	}
	if(strlen($sql))
	{
	RunSchemaText($ado,$sql);
	}
	fseek($fp,$FileOffset);
	}
	$LinesRead = 0;
	$sql = "";
	$AllSql = array();
	while($LinesRead < $MaxLines && !feof($fp))
	{
	$sql = fgets($fp, 16384);
	if(strlen($sql))
	{
	$AllSql[] = $sql;
	$LinesRead++;
	}
	}
	if(!feof($fp))
	{
	$FileOffset = ftell($fp);
	}
	else
	{
	$FileOffset = $TotalSize;
	}
	fclose($fp);
	if(count($AllSql)>0)
	RunSQLText($ado,$AllSql);
	return (int)$FileOffset;
	}


	function _inst_keyED($txt,$encrypt_key)
	{
	$encrypt_key = md5($encrypt_key);
	$ctr=0;
	$tmp = "";
	for ($i=0;$i<strlen($txt);$i++)
	{
	if ($ctr==strlen($encrypt_key)) $ctr=0;
	$tmp.= substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1);
	$ctr++;
	}
	return $tmp;
	}


	function _inst_decrypt($txt,$key)
	{
	$txt = _inst_keyED($txt,$key);
	$tmp = "";
	for ($i=0;$i<strlen($txt);$i++)
	{
	$md5 = substr($txt,$i,1);
	$i++;
	$tmp.= (substr($txt,$i,1) ^ $md5);
	}
	return $tmp;
	}

	function inst_LoadFromRemote()
	{
	return "";
	}

	function mod_DLid()
	{
	global $DownloadId;
	echo $DownloadId."\n";
	die();
	}

	function ae666b1b8279502f4c4b570f133d513e($LoadRemote=FALSE,$file="")
	{
	return _inst_LoadLicense($LoadRemote,$file);
	}

	function _inst_LoadLicense($LoadRemote=FALSE,$file="")
	{
	global $path,$admin;

	$data = Array();

	if(!strlen($file))
	{
	$f = $path.$admin."/include/inportal.dat";
	}
	else
	$f = $file;
	if(file_exists($f))
	{
	$contents = file($f);
	$data[0] = base64_decode($contents[1]);
	$data[1] = $contents[2];
	}
	else
	if($LoadRemote)
	return $LoadFromRemote;
	return $data;
	}

	function inst_SaveLicense($data)
	{

	}

	function _inst_VerifyKey($domain,$k)
	{
	$key = md5($domain);
	$lkey = substr($key,0,strlen($key)/2);
	$rkey = substr($key,strlen($key)/2);
	$r = $rkey.$lkey;
	if($k==$r)
	return TRUE;
	return FALSE;
	}

	function a83570933e44bc66b31dd7127cf3f23a($txt)
	{
	return _inst_ParseLicense($txt);
	}

	function _inst_ParseLicense($txt)
	{
	global $i_User, $i_Pswd, $i_Keys;
	$data = _inst_decrypt($txt,"beagle");
	$i_Keys = array();
	$lines = explode("\n",$data);

	for($x=0;$x<count($lines);$x++)
	{
	$l = $lines[$x];
	$p = explode("=",$l,2);
	switch($p[0])
	{
	case "Username":
	$i_User = $p[1];
	break;
	case "UserPass":
	$i_Pswd = $p[1];
	break;
	default:
	if(substr($p[0],0,3)=="key")
	{
	$parts = explode("\|",$p[1]);
	if(_inst_VerifyKey($parts[0],$parts[1]))
	{
	unset($K);
	$k["domain"]=$parts[0];
	$k["key"]=$parts[1];
	$k["desc"]=$parts[2];
	$k["mod"]=$parts[3];
	$i_Keys[] = $k;
	}
	}
	break;
	}
	}
	}


	function de3ec1b7a142cccd0d51f03d24280744($domain)
	{
	_inst_falseIsLocalSite($domain);
	return _inst_IsLocalSite($domain);
	}

	function _inst_GetObscureValue($i)
	{
	+ $z = null;
	if ($i == 'x') return 0254;
	if ($i == 'z') return 0x7F.'.';
	if ($i >= 5 && $i < 7) return _inst_GetObscureValue($z)*_inst_GetObscureValue('e');
	if ($i > 30) return Array(0x6c,0x6f,0x63,0x61,0x6c,0x68,0x6f,0x73,0x74);
	if ($i > 20) return 99;
	if ($i > 10) return '.'.(_inst_GetObscureValue(6.5)+1);
	if ($i == 'a') return 0xa;
	}

	function _inst_Chr($val)
	{
	$x = _inst_GetObscureValue(25);
	$f = chr($x).chr($x+5).chr($x+15);
	return $f($val);
	}

	function _inst_IsLocalSite($domain)
	{
	+ $yy = '';
	$ee = _inst_GetObscureValue(35);
	- foreach ($ee as $e) {
	- $yy .= _inst_Chr($e);
	- }
	+ foreach ($ee as $e) {
	+ $yy .= _inst_Chr($e);
	+ }
	$localb = FALSE;
	if(substr($domain,0,3)==_inst_GetObscureValue('x'))
	{
	$b = substr($domain,0,6);
	$p = explode(".",$domain);
	$subnet = $p[1];
	if($p[1]>15 && $p[1]<32)
	$localb=TRUE;
	}
	$zz = _inst_GetObscureValue('z')._inst_GetObscureValue(5).'.'.(int)_inst_GetObscureValue(7)._inst_GetObscureValue(12);
	$ff = _inst_GetObscureValue('z')+65;
	$hh = $ff-0x18;
	if($domain==$yy \|\| $domain==$zz \|\| substr($domain,0,7)==$ff._inst_Chr(46).$hh \|\|
	substr($domain,0,3)==_inst_GetObscureValue('a')._inst_Chr(46) \|\| $localb \|\| strpos($domain,".")==0)
	{
	return TRUE;
	}
	return FALSE;
	}

	function _inst_falseIsLocalSite($domain)
	{
	$localb = FALSE;
	if(substr($domain,0,3)=="172" \|\| $domain == '##code##')
	{
	$b = substr($domain,0,6);
	$p = explode(".",$domain);
	$subnet = $p[1];
	if($p[1]>15 && $p[1]<32)
	$localb=TRUE;
	}
	if($domain=="localhost" \|\| $domain=="127.0.0.1" \|\| substr($domain,0,7)=="192.168" \|\|
	substr($domain,0,3)=="10." \|\| $localb \|\| strpos($domain,".")==0)
	{
	return TRUE;
	}
	return FALSE;
	}

	function ed592fe427e1ce60e32ffcb0c82d8557($name)
	{
	return _inst_ModuleLicensed($name);
	}

	function _inst_ModuleLicensed($name)
	{
	global $i_Keys, $objConfig, $g_License, $g_Domain;

	$lic = base64_decode($g_License);
	_inst_ParseLicense($lic);

	$modules = array();
	if(!_inst_IsLocalSite($g_Domain))
	{
	for($x=0;$x<count($i_Keys);$x++)
	{
	$key = $i_Keys[$x];
	if (strlen(stristr($g_Domain,$key["domain"])))
	{
	$modules = explode(",",strtolower($key["mod"]));
	}
	}
	if(in_array(strtolower($name),$modules))
	{
	return TRUE;
	}
	else
	{
	return FALSE;
	}
	}
	else
	return TRUE;

	return FALSE;
	}

	function inst_parse_portal_ini($file, $parse_section = false) {
	if(!file_exists($file) && !is_readable($file))
	die("Could Not Open Ini File $file");

	$contents = file($file);

	$retval = array();

	$section = '';
	$ln = 1;
	$resave = false;
	foreach($contents as $line) {
	if ($ln == 1 && $line != '<'.'?'.'php die() ?'.">\n") {
	$resave = true;
	}
	$ln++;
	$line = trim($line);
	$line = eregi_replace(';[.]*','',$line);
	if(strlen($line) > 0) {
	if(eregi('^[[a-z]+]$',str_replace(' ', '', $line))) {
	$section = substr($line,1,(strlen($line)-2));
	if ($parse_section) {
	$retval[$section] = array();
	}
	continue;
	} elseif(eregi('=',$line)) {
	list($key,$val) = explode(' = ',$line);
	if (!$parse_section) {
	$retval[trim($key)] = str_replace('"', '', $val);
	}
	else {
	$retval[$section][trim($key)] = str_replace('"', '', $val);
	}
	} //end if
	} //end if
	} //end foreach
	if ($resave) {
	$fp = fopen($file, "w");
	reset($contents);
	fwrite($fp,'<'.'?'.'php die() ?'.">\n\n");
	foreach($contents as $line) fwrite($fp,"$line");
	fclose($fp);
	}

	return $retval;
	}

	function a48d819089308a9aeb447e7248b2587f()
	{
	return _inst_GetModuleList();
	}

	function _inst_GetModuleList()
	{
	global $rootpath,$pathchar,$admin, $pathtoroot;

	$path = $pathtoroot;

	$new = array();
	if ($dir = @opendir($path))
	{
	while (($file = readdir($dir)) !== false)
	{
	if($file !="." && $file !=".." && substr($file,0,1)!="_")
	{
	if(is_dir($path."/".$file))
	{
	$ModuleAdminDir = $path.$file.'/admin/';
	$inst_file = $ModuleAdminDir.'install.php';
	if( file_exists($inst_file) && file_exists($ModuleAdminDir.'install/inportal_schema.sql') )
	{
	if(_inst_ModuleLicensed($file)) {
	$new[$file] = $inst_file;
	}
	}
	}
	}
	}
	closedir($dir);
	}
	return array_keys($new);
	}

	function GetDirList ($dirName)
	{

	$filedates = array();
	$d = dir($dirName);

	while($entry = $d->read())
	{
	if ($entry != "." && $entry != "..")
	{
	if (!is_dir($dirName."/".$entry))
	{
	$filedate[]=$entry;
	}
	}
	}
	$d->close();
	return $filedate;
	}

	function GetLanguageList()
	{
	global $pathtoroot, $admin;

	$packs = array();
	$dir = $pathtoroot.$admin."/install/langpacks";
	$files = GetDirList($dir);

	if(is_array($files))
	{
	foreach($files as $f)
	{
	$p = pathinfo($f);
	if($p["extension"]=="lang")
	{
	$packs[] = $f;
	}
	}
	}
	return $packs;
	}

	function section_header($title, $return_result = false)
	{
	$ret = '<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">'.
	'<tr><td class="tablenav" width="580" nowrap background="images/tabnav_left.jpg"><span class="tablenav_link"> '.$title.'</span>'.
	'</td><td align="right" class="tablenav" background="images/tabnav_back.jpg" width="100%">'.
	"<a class=\"link\" onclick=\"ShowHelp('in-portal:install');\"><img src=\"images/blue_bar_help.gif\" border=\"0\"></A>".
	'</td></tr></table>';
	if( $return_result )
	return $ret;
	else
	echo $ret;
	}

	function &VerifyDB($error_state, $next_state, $success_func = null, $db_must_exist = false)
	{
	// perform various check type to database specified
	// 1. user is allowed to connect to database
	// 2. user has all types of permissions in database
	global $state, $db_error;

	// enshure we use data from post & not from config
	$GLOBALS['g_DBType'] = $_POST["ServerType"];
	$GLOBALS['g_DBHost'] = $_POST["ServerHost"];
	$GLOBALS['g_DBName'] = $_POST["ServerDB"];
	$GLOBALS['g_DBUser'] = $_POST["ServerUser"];
	$GLOBALS['g_DBUserPassword'] = $_POST["ServerPass"];

	if (strlen($_POST['TablePrefix']) > 7) {
	$db_error = 'Table prefix should not be longer than 7 characters';
	$state = $error_state;
	return false;
	}

	// connect to database
	$ado =& inst_GetADODBConnection();
	if($ado->ErrorNo() != 0)
	{
	// was error while connecting
	$db_error = "Connection Error: (".$ado->ErrorNo().") ".$ado->ErrorMsg();
	$state = $error_state;

	}
	elseif( $ado->ErrorNo() == 0 )
	{
	// if connected, then check if all sql statements work
	$test_result = 1;

	$sql_tests[] = 'DROP TABLE IF EXISTS test_table';
	$sql_tests[] = 'CREATE TABLE test_table(test_col mediumint(6))';
	$sql_tests[] = 'LOCK TABLES test_table WRITE';
	$sql_tests[] = 'INSERT INTO test_table(test_col) VALUES (5)';
	$sql_tests[] = 'UPDATE test_table SET test_col = 12';
	$sql_tests[] = 'UNLOCK TABLES';
	$sql_tests[] = 'ALTER TABLE test_table ADD COLUMN new_col varchar(10)';
	$sql_tests[] = 'SELECT * FROM test_table';
	$sql_tests[] = 'DELETE FROM test_table';
	$sql_tests[] = 'DROP TABLE IF EXISTS test_table';

	foreach($sql_tests as $sql_test)
	{
	$ado->Execute($sql_test);
	if( $ado->ErrorNo()!=0 )
	{
	$test_result = 0;
	break;
	}
	}

	if($test_result == 1)
	{
	// if statements work & connection made, then check table existance
	$db_exists = TableExists($ado,"ConfigurationAdmin,Category,Permissions");
	if($db_exists != $db_must_exist)
	{
	$state = $error_state;
	$db_error = $db_must_exist ? 'An In-Portal Database already exists at this location' : 'An In-Portal Database was not found at this location';
	}
	else
	{
	$state = $next_state;
	if( isset($success_func) ) $success_func();
	}
	}
	else
	{
	// user has insufficient permissions in database specified
	$db_error = "Permission Error: (".$ado->ErrorNo().") ".$ado->ErrorMsg();
	$state = $error_state;
	}
	}
	return $ado;
	}

	function SaveDBConfig()
	{
	// save new database configuration
	set_ini_value("Database", "DBType",$_POST["ServerType"]);
	set_ini_value("Database", "DBHost",$_POST["ServerHost"]);
	set_ini_value("Database", "DBName",$_POST["ServerDB"]);
	set_ini_value("Database", "DBUser",$_POST["ServerUser"]);
	set_ini_value("Database", "DBUserPassword",$_POST["ServerPass"]);
	set_ini_value("Database","TablePrefix",$_POST["TablePrefix"]);
	save_values();
	$GLOBALS['include_file'] = 'install/install_finish.php';
	}

	function ReSetVar($var)
	{
	// define varible if not defined before
	if( !isset($GLOBALS[$var]) ) $GLOBALS[$var] = '';
	}

	// if globals.php not yet included (1st steps of install),
	// then define GetVar function
	if( !function_exists('GetVar') )
	{
	function GetVar($name, $post_priority = false)
	{
	if(!$post_priority) // follow gpc_order in php.ini
	return isset($_REQUEST[$name]) ? $_REQUEST[$name] : false;
	else // get variable from post 1stly if not found then from get
	return isset($_POST[$name]) && $_POST[$name] ? $_POST[$name] : ( isset($_GET[$name]) && $_GET[$name] ? $_GET[$name] : false );
	}
	}

	function RadioChecked($name, $value)
	{
	// return " checked" word in case if radio is checked
	$submit_value = GetVar($name);
	return $submit_value == $value ? ' checked' : '';
	}

	function StripDisallowed($string, $item_info)
	{
	$not_allowed = Array( ' ', '\\', '/', ':', '*', '?', '"', '<', '>', '\|',
	'~', '!', '@', '#', '$', '%', '^', '&', '(', ')',
	'+', '=', '-', '{', '}', ']', '[', "'", ';', '.', ',');

	$string = str_replace($not_allowed, '_', $string);
	$string = preg_replace('/(_+)/', '_', $string);
	$string = checkAutoFilename($string, $item_info);

	return $string;
	}

	function checkAutoFilename($filename, $item_info)
	{
	// 'table' => 'Category', 'id_field' => 'CategoryId', 'title_field' => 'Name'
	$item_id = $item_info['item_id'];
	$prefix = GetTablePrefix();
	$db =& inst_GetADODBConnection();

	$sql = 'SELECT '.$item_info['id_field'].' FROM '.$prefix.$item_info['table'].' WHERE Filename = '.$db->qstr($filename);
	$found_item_id = $db->GetOne($sql);
	$has_page = preg_match('/(.)_([\d]+)([a-z])$/', $filename, $rets);
	if( ($found_item_id != $item_id) \|\| $has_page ) // other category has same filename as ours OR we have filename, that ends with _number
	{
	$append = $found_item_id ? 'a' : '';
	if($has_page)
	{
	$filename = $rets[1].'_'.$rets[2];
	$append = $rets[3] ? $rets[3] : 'a';
	}

	$sql = 'SELECT '.$item_info['id_field'].' FROM '.$prefix.$item_info['table'].' WHERE (Filename = %s) AND ('.$item_info['id_field'].' != '.$item_id.')';
	while ( $db->GetOne( sprintf($sql, $db->qstr($filename.$append)) ) > 0 )
	{
	if (substr($append, -1) == 'z') $append .= 'a';
	$append = substr($append, 0, strlen($append) - 1) . chr( ord( substr($append, -1) ) + 1 );
	}

	return $filename.$append;
	}

	return $filename;
	}

	/**
	* [INSTALL] Perform operations required for each module separate install (from admin)
	*
	* @param string $module_name
	* @param bool $has_theme
	* @return bool
	*/
	function finalizeModuleInstall($module_name, $has_theme = true)
	{
	global $objThemes;

	$app =& kApplication::Instance();
	if (!$app->GetVar('redirect')) return false;

	if ($has_theme)
	{
	$objThemes->CreateMissingThemes(true);
	}

	// 2. import languagepack in case of separate install
	$lang_xml =& $app->recallObject('LangXML');
	$lang_xml->tables['phrases'] = TABLE_PREFIX.'Phrase';
	$lang_xml->tables['emailmessages'] = TABLE_PREFIX.'EmailMessage';

	$lang_path = FULL_PATH.'/'.$module_name.'/admin/install/langpacks';
	$lang_xml->Parse($lang_path.'/english.lang', '\|0\|1\|2\|', '');

	$app->Redirect('', Array('pass' => 'all', 'admin' => 1, 'Refresh' => 1), '', 'modules/mod_status.php');

	}

	/**
	* [UPGRADE] Initializes [cached] category/item templates with default values for each module
	*
	* @param string $module
	* @param string $category_template
	* @param string $item_template
	*/
	function updateItemCategoryTemplate($module, $category_template, $item_template)
	{
	$table_prefix = GetTablePrefix();
	$inst_ado =& inst_GetADODBConnection();

	// get module root category by module name
	$sql = 'SELECT RootCat
	FROM '.$table_prefix.'Modules
	WHERE Name = '.$inst_ado->qstr($module);
	$module_root = $inst_ado->GetOne($sql);

	// set category & item template to module root category
	$sql = 'UPDATE '.$table_prefix.'Category
	SET CategoryTemplate = '.$inst_ado->qstr($category_template).', ItemTemplate = '.$inst_ado->qstr($item_template).'
	WHERE CategoryId = '.$module_root;
	$inst_ado->Execute($sql);

	// set cached category & item templates to all sub-categories of module root category
	$sql = 'UPDATE '.$table_prefix.'Category
	SET CachedCategoryTemplate = '.$inst_ado->qstr($category_template).', CachedItemTemplate = '.$inst_ado->qstr($item_template).'
	WHERE ParentPath LIKE "\|'.$module_root.'\|%';
	$inst_ado->Execute($sql);
	}

	/**
	* [UPGRADE] Moves custom field values for prefix specified from CustomMetaData table to prefix dependant separate table
	*
	* @param string $prefix
	*/
	function convertCustomFields($prefix)
	{
	$application =& kApplication::Instance();

	$ml_helper =& $application->recallObject('kMultiLanguageHelper');
	$ml_helper->createFields($prefix.'-cdata', true);

	$db =& $application->GetADODBConnection();

	$custom_fields = $application->getUnitOption($prefix, 'CustomFields');
	if (!$custom_fields) {
	return true;
	}

	$custom_table = $application->getUnitOption($prefix.'-cdata', 'TableName');

	// copy value from Value field to l<lang_id>_Value field, where destination field is empty
	$m_lang = $application->GetVar('m_lang');
	$sql = 'UPDATE '.TABLE_PREFIX.'CustomMetaData
	SET l'.$m_lang.'_Value = Value
	WHERE LENGTH(l'.$m_lang.'_Value) = 0';
	$db->Query($sql);

	$i = 1;
	$field_mask = '';
	$language_count = $ml_helper->getLanguageCount();
	while ($i <= $language_count) {
	$field_mask .= 'cdata%1$s.l'.$i.'_Value AS l'.$i.'_cust_%1$s, ';
	$i++;
	}
	$field_mask = preg_replace('/(.*), $/', '\\1', $field_mask);

	$join_mask = 'LEFT JOIN '.TABLE_PREFIX.'CustomMetaData cdata%1$s ON main_table.ResourceId = cdata%1$s.ResourceId AND cdata%1$s.CustomFieldId = %1$s';

	$fields_sql = Array();
	$joins_sql = Array();
	foreach ($custom_fields as $custom_id => $custom_name) {
	array_push($fields_sql, sprintf($field_mask, $custom_id) );
	array_push($joins_sql, sprintf($join_mask, $custom_id));
	}

	$sql = 'INSERT INTO '.$custom_table.'
	SELECT 0 AS CustomDataId, main_table.ResourceId, '.implode(', ', $fields_sql).'
	FROM '.$application->getUnitOption($prefix, 'TableName').' main_table '.implode(' ', $joins_sql);
	$db->Query($sql);
	}

	/**
	* [INSTALL] Link custom field records with search config records + create custom field columns
	*
	* @param string $module_name
	* @param int $item_type
	*/
	function linkCustomFields($module_name, $prefix, $item_type)
	{
	$application =& kApplication::Instance();
	$db =& $application->GetADODBConnection();
	$sql = 'SELECT FieldName, CustomFieldId
	FROM '.TABLE_PREFIX.'CustomField
	WHERE Type = '.$item_type.' AND IsSystem = 0'; // config is not read here yet :( $application->getUnitOption('p', 'ItemType');
	$custom_fields = $db->GetCol($sql, 'CustomFieldId');
	foreach ($custom_fields as $cf_id => $cf_name) {
	$sql = 'UPDATE '.TABLE_PREFIX.'SearchConfig
	SET CustomFieldId = '.$cf_id.'
	WHERE (TableName = "CustomField") AND (LOWER(ModuleName) = "'.strtolower($module_name).'") AND (FieldName = '.$db->qstr($cf_name).')';
	$db->Query($sql);
	}

	$application->refreshModuleInfo(); // this module configs are now processed

	// because of configs was read only from installed before modules (in-portal), then reread configs
	$unit_config_reader =& $application->recallObject('kUnitConfigReader');
	$unit_config_reader->scanModules(MODULES_PATH.'/'.strtolower($module_name));

	// create correct columns in ProductsCustomData table
	$ml_helper =& $application->recallObject('kMultiLanguageHelper');
	$ml_helper->createFields($prefix.'-cdata', true);
	}
	?>

	Property changes on: trunk/admin/install/install_lib.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.42
	\ No newline at end of property
	+1.43
	\ No newline at end of property
	Index: trunk/core/kernel/utility/debugger.php
	===================================================================
	--- trunk/core/kernel/utility/debugger.php (revision 4884)
	+++ trunk/core/kernel/utility/debugger.php (revision 4885)
	@@ -1,957 +1,963 @@
	<?php

	if( !class_exists('Debugger') ) {
	class Debugger {

	/**
	* Set to true if fatal error occured
	*
	* @var bool
	*/
	var $IsFatalError = false;

	/**
	* Debugger data for building report
	*
	* @var Array
	*/
	var $Data = Array();

	var $ProfilerData = Array();
	var $ProfilerTotals = Array();
	var $ProfilerTotalCount = Array();

	/**
	* Prevent recursion when processing debug_backtrace() function results
	*
	* @var Array
	*/
	var $RecursionStack = Array();

	var $scrollbarWidth = 0;

	/**
	* Long errors are saved here, because trigger_error doesn't support error messages over 1KB in size
	*
	* @var Array
	*/
	var $longErrors = Array();

	var $IncludesData = Array();
	var $IncludeLevel = 0;

	var $reportDone = false;

	/**
	* Transparent spacer image used in case of none spacer image defined via SPACER_URL contant.
	* Used while drawing progress bars (memory usage, time usage, etc.)
	*
	* @var string
	*/
	var $dummyImage = 'http://www.adamauto.lv/chevrolet/images/spacer.gif';

	/**
	* Temporary files created by debugger will be stored here
	*
	* @var string
	*/
	var $tempFolder = '';

	/**
	* Debug rows will be separated using this string before writing to debug file
	*
	* @var string
	*/
	var $rowSeparator = '@@';

	/**
	* Base URL for debugger includes
	*
	* @var string
	*/
	var $baseURL = '';

	function Debugger()
	{
	global $start;

	$this->InitDebugger();
	$this->profileStart('kernel4_startup', 'Startup and Initialization of kernel4', $start);
	$this->profileStart('script_runtime', 'Script runtime', $start);

	ini_set('display_errors', $this->constOn('DBG_ZEND_PRESENT') ? 0 : 1); // show errors on screen in case if not in Zend Studio debugging

	$this->scrollbarWidth = $this->isGecko() ? 22 : 25; // vertical scrollbar width differs in Firefox and other browsers
	$this->appendRequest();
	}

	/**
	* Set's default values to constants debugger uses
	*
	*/
	function InitDebugger()
	{
	unset($_REQUEST['debug_host'], $_REQUEST['debug_fastfile']); // this var messed up whole detection stuff :(

	// Detect fact, that this session beeing debugged by Zend Studio
	foreach ($_REQUEST as $rq_name => $rq_value) {
	if (substr($rq_name, 0, 6) == 'debug_') {
	$this->safeDefine('DBG_ZEND_PRESENT', 1);
	break;
	}
	}

	$this->safeDefine('DBG_ZEND_PRESENT', 0); // set this constant value to 0 (zero) to debug debugger using Zend Studio

	// set default values for debugger constants
	$dbg_constMap = Array(
	'DBG_USE_HIGHLIGHT' => 1, // highlight output same as php code using "highlight_string" function
	'DBG_WINDOW_WIDTH' => 700, // set width of debugger window (in pixels) for better viewing large amount of debug data
	'DBG_USE_SHUTDOWN_FUNC' => DBG_ZEND_PRESENT ? 0 : 1, // use shutdown function to include debugger code into output
	'DBG_HANDLE_ERRORS' => DBG_ZEND_PRESENT ? 0 : 1, // handle all allowed by php (see php manual) errors instead of default handler
	'DBG_IGNORE_STRICT_ERRORS' => 1, // ignore PHP5 errors about private/public view modified missing in class declarations
	'DBG_DOMVIEWER' => '/temp/domviewer.html', // path to DOMViewer on website
	'DOC_ROOT' => str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack
	'DBG_LOCAL_BASE_PATH' => 'w:' // replace DOC_ROOT in filenames (in errors) using this path
	);

	// only for IE, in case if no windows php script editor defined
	if (!defined('DBG_EDITOR')) {
	// $dbg_constMap['DBG_EDITOR'] = 'c:\Program Files\UltraEdit\uedit32.exe %F/%L';
	$dbg_constMap['DBG_EDITOR'] = 'c:\Program Files\Zend\ZendStudio-5.2.0\bin\ZDE.exe %F';
	}

	foreach ($dbg_constMap as $dbg_constName => $dbg_constValue) {
	$this->safeDefine($dbg_constName, $dbg_constValue);
	}
	}

	function constOn($const_name)
	{
	return defined($const_name) && constant($const_name);
	}

	function safeDefine($const_name, $const_value) {
	if (!defined($const_name)) {
	define($const_name, $const_value);
	}
	}

	function InitReport()
	{
	if (!class_exists('kApplication')) return false;

	$application =& kApplication::Instance();

	// string used to separate debugger records while in file (used in debugger dump filename too)
	$this->rowSeparator = '@'.$application->GetSID().'@';

	// include debugger files from this url
	$reg_exp = '/^'.preg_quote(FULL_PATH, '/').'/';
	$kernel_path = preg_replace($reg_exp, '', KERNEL_PATH, 1);
	$this->baseURL = PROTOCOL.SERVER_NAME.rtrim(BASE_PATH, '/').$kernel_path.'/utility/debugger';

	// save debug output in this folder
	$this->tempFolder = FULL_PATH.'/kernel/cache';
	}

	function mapLongError($msg)
	{
	$key = $this->generateID();
	$this->longErrors[$key] = $msg;
	return $key;
	}

	/**
	* Appends all passed variable values (wihout variable names) to debug output
	*
	*/
	function dumpVars()
	{
	$dumpVars = func_get_args();
	foreach ($dumpVars as $varValue) {
	$this->Data[] = Array('value' => $varValue, 'debug_type' => 'var_dump');
	}
	}

	function prepareHTML($dataIndex)
	{
	$Data =& $this->Data[$dataIndex];
	if ($Data['debug_type'] == 'html') {
	return $Data['html'];
	}

	switch ($Data['debug_type']) {
	case 'error':
	$fileLink = $this->getFileLink($Data['file'], $Data['line']);
	$ret = '<b class="debug_error">'.$this->getErrorNameByCode($Data['no']).'</b>: '.$Data['str'];
	$ret .= ' in <b>'.$fileLink.'</b> on line <b>'.$Data['line'].'</b>';
	return $ret;
	break;

	case 'var_dump':
	return $this->highlightString( print_r($Data['value'], true) );
	break;

	case 'trace':
	ini_set('memory_limit', '500M');
	$trace =& $Data['trace'];

	$i = 0; $traceCount = count($trace);
	$ret = '';
	while ($i < $traceCount) {
	$traceRec =& $trace[$i];
	$argsID = 'trace_args_'.$dataIndex.'_'.$i;

	$has_args = isset($traceRec['args']);

	if (isset($traceRec['file'])) {
	$func_name = isset($traceRec['class']) ? $traceRec['class'].$traceRec['type'].$traceRec['function'] : $traceRec['function'];
	$args_link = $has_args ? '<a href="javascript:$Debugger.ToggleTraceArgs(\''.$argsID.'\');" title="Show/Hide Function Arguments"><b>Function</b></a>' : '<b>Function</b>';

	$ret .= $args_link.': '.$this->getFileLink($traceRec['file'], $traceRec['line'], $func_name);
	$ret .= ' in <b>'.basename($traceRec['file']).'</b> on line <b>'.$traceRec['line'].'</b><br>';
	}
	else {
	$ret .= 'no file information available';
	}

	// ensure parameter value is not longer then 200 symbols
	if ($has_args) {
	$this->processTraceArguments($traceRec['args']);
	$args = $this->highlightString(print_r($traceRec['args'], true));
	$ret .= '<div id="'.$argsID.'" style="display: none;">'.$args.'</div>';
	}
	$i++;
	}
	return $ret;
	break;

	case 'profiler':
	$profileKey = $Data['profile_key'];
	$Data =& $this->ProfilerData[$profileKey];
	$runtime = ($Data['ends'] - $Data['begins']); // in seconds

	$totals_key = getArrayValue($Data, 'totalsKey');
	if ($totals_key) {
	$total_before = $Data['totalsBefore'];
	$total = $this->ProfilerTotals[$totals_key];

	$div_width = Array();
	$total_width = ($this->getWindowWidth()-10);
	$div_width['before'] = round(($total_before / $total) * $total_width);
	$div_width['current'] = round(($runtime / $total) * $total_width);
	$div_width['left'] = round((($total - $total_before - $runtime) / $total) * $total_width);

	$ret = '<b>Name</b>: '.$Data['description'].'<br>';
	$ret .= '<b>Runtime</b>: '.$runtime.'s';
	$ret .= '<div class="dbg_profiler" style="width: '.$div_width['before'].'px; border-right: 0px; background-color: #298DDF;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
	$ret .= '<div class="dbg_profiler" style="width: '.$div_width['current'].'px; border-left: 0px; border-right: 0px; background-color: #EF4A4A;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';
	$ret .= '<div class="dbg_profiler" style="width: '.$div_width['left'].'px; border-left: 0px; background-color: #DFDFDF;"><img src="'.$this->dummyImage.'" width="1" height="1"/></div>';

	return $ret;
	}
	else {
	return '<b>Name</b>: '.$Data['description'].'<br><b>Runtime</b>: '.$runtime.'s';
	}
	break;

	default:
	return 'incorrect debug data';
	break;
	}
	}

	function getWindowWidth()
	{
	return DBG_WINDOW_WIDTH - $this->scrollbarWidth - 8;
	}

	/**
	* Tells debugger to skip objects that are heavy in plan of memory usage while printing debug_backtrace results
	*
	* @param Object $object
	* @return bool
	*/
	function IsBigObject(&$object)
	{
	$skip_classes = Array(
	defined('APPLICATION_CLASS') ? APPLICATION_CLASS : 'kApplication',
	'kFactory',
	'TemplateParser',
	);

	foreach ($skip_classes as $class_name) {
	if (strtolower(get_class($object)) == strtolower($class_name)) {
	return true;
	}
	}

	return false;
	}

	function processTraceArguments(&$traceArgs)
	{
	if (!$traceArgs) return '';

	$array_keys = array_keys($traceArgs);
	foreach ($array_keys as $argID) {
	$argValue =& $traceArgs[$argID];

	if (is_array($argValue) \|\| is_object($argValue)) {
	if (is_object($argValue) && !in_array(get_class($argValue), $this->RecursionStack)) {
	array_push($this->RecursionStack, get_class($argValue));

	if ($this->IsBigObject($argValue)) {
	$argValue = null;
	continue;
	}

	// object & not in stack - ok
	settype($argValue, 'array');
	$this->processTraceArguments($argValue);
	array_pop($this->RecursionStack);
	}
	elseif (is_object($argValue) && in_array(get_class($argValue), $this->RecursionStack)) {
	// object & in stack - recursion
	$traceArgs[$argID] = '** RECURSION *';
	}
	else {
	// normal array here
	$this->processTraceArguments($argValue);
	}
	}
	else {
	$traceArgs[$argID] = $this->cutStringForHTML($traceArgs[$argID]);
	}
	}
	}

	/**
	* Returns only first 200 chars of string, this allow to save amount of data sent to browser
	*
	* @param string $string
	* @return string
	*/
	function cutStringForHTML($string)
	{
	if (strlen($string) > 200) {
	$string = substr($string,0,50).' ...';
	}
	return $string;
	}

	/**
	* Format SQL Query using predefined formatting
	* and highlighting techniques
	*
	* @param string $sql
	* @return string
	*/
	function formatSQL($sql)
	{
	$sql = preg_replace('/(\n\|\t\| )+/is', ' ', $sql);
	$sql = preg_replace('/(CREATE TABLE\|DROP TABLE\|SELECT\|UPDATE\|SET\|REPLACE\|INSERT\|DELETE\|VALUES\|FROM\|LEFT JOIN\|INNER JOIN\|LIMIT\|WHERE\|HAVING\|GROUP BY\|ORDER BY) /is', "\n\t$1 ", $sql);
	return $this->highlightString($sql);
	}

	function highlightString($string)
	{
	if (!$this->constOn('DBG_USE_HIGHLIGHT')) {
	return $string;
	}

	$string = str_replace( Array('\\', '/') , Array('_no_match_string_', '_n_m_s_'), $string);
	$string = highlight_string('<?php '.$string.'?>', true);
	$string = str_replace( Array('_no_match_string_', '_n_m_s_'), Array('\\', '/'), $string);
	return preg_replace('/<\?(.)php(.)\?>/Us', '\\2', $string);
	}

	/**
	* Determine by php type of browser used to show debugger
	*
	* @return bool
	*/
	function isGecko()
	{
	return strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'firefox') !== false;
	}

	/**
	* Returns link for editing php file (from error) in external editor
	*
	* @param string $file filename with path from root folder
	* @param int $lineno line number in file where error is found
	* @param string $title text to show on file edit link
	* @return string
	*/
	function getFileLink($file, $lineno = 1, $title = '')
	{
	if (!$title) {
	$title = $file;
	}

	if ($this->isGecko()) {
	return '<a href="file://'.$this->getLocalFile($file).'">'.$title.'</a>';
	}
	else {
	return '<a href="javascript:$Debugger.editFile(\''.$this->getLocalFile($file).'\', '.$lineno.');" title="'.$file.'">'.$title.'</a>';
	}

	}

	/**
	* Converts filepath on server to filepath in mapped DocumentRoot on developer pc
	*
	* @param string $remoteFile
	* @return string
	*/
	function getLocalFile($remoteFile)
	{
	return str_replace(DOC_ROOT, DBG_LOCAL_BASE_PATH, $remoteFile);
	}

	/**
	* Appends call trace till this method call
	*
	*/
	function appendTrace()
	{
	$trace = debug_backtrace();
	array_shift($trace);
	$this->Data[] = Array('trace' => $trace, 'debug_type' => 'trace');
	}

	function appendMemoryUsage($msg, $used = null)
	{
	if (!isset($used)) {
	$used = round(memory_get_usage() / 1024);
	}
	$this->appendHTML('<b>Memory usage</b> '.$msg.' '.$used.'Kb');
	}

	/**
	* Appends HTML code whithout transformations
	*
	* @param string $html
	*/
	function appendHTML($html)
	{
	$this->Data[] = Array('html' => $html, 'debug_type' => 'html');
	}

	/**
	* Change debugger info that was already generated before.
	* Returns true if html was set.
	*
	* @param int $index
	* @param string $html
	* @param string $type = {'append','prepend','replace'}
	* @return bool
	*/
	function setHTMLByIndex($index, $html, $type = 'append')
	{
	if (!isset($this->Data[$index]) \|\| $this->Data[$index]['debug_type'] != 'html') {
	return false;
	}

	switch ($type) {
	case 'append':
	$this->Data[$index]['html'] .= '<br>'.$html;
	break;

	case 'prepend':
	$this->Data[$index]['html'] = $this->Data[$index]['html'].'<br>'.$html;
	break;

	case 'replace':
	$this->Data[$index]['html'] = $html;
	break;
	}
	return true;
	}

	/**
	* Move $debugLineCount lines of input from debug output
	* end to beginning.
	*
	* @param int $debugLineCount
	*/
	function moveToBegin($debugLineCount)
	{
	$lines = array_splice($this->Data,count($this->Data)-$debugLineCount,$debugLineCount);
	$this->Data = array_merge($lines,$this->Data);
	}

	function moveAfterRow($new_row, $debugLineCount)
	{
	$lines = array_splice($this->Data,count($this->Data)-$debugLineCount,$debugLineCount);
	$rows_before = array_splice($this->Data,0,$new_row,$lines);
	$this->Data = array_merge($rows_before,$this->Data);
	}

	function appendRequest()
	{
	if (isset($_SERVER['SCRIPT_FILENAME'])) {
	$script = $_SERVER['SCRIPT_FILENAME'];
	}
	else {
	$script = $_SERVER['DOCUMENT_ROOT'].$_SERVER['PHP_SELF'];
	}

	$this->appendHTML('ScriptName: <b>'.$this->getFileLink($script, 1, basename($script)).'</b> (<b>'.dirname($script).'</b>)');

	$this->appendHTML('<a href="http://www.brainjar.com/dhtml/domviewer/" target="_blank">DomViewer</a>: <input id="dbg_domviewer" type="text" value="window" style="border: 1px solid #000000;"/> <button class="button" onclick="return $Debugger.OpenDOMViewer();">Show</button>');

	ob_start();
	?>
	<table border="0" cellspacing="0" cellpadding="0" class="dbg_flat_table" style="width: <?php echo $this->getWindowWidth(); ?>px;">
	<thead style="font-weight: bold;">
	<td width="20">Src</td><td>Name</td><td>Value</td>
	</thead>
	<?php
	foreach ($_REQUEST as $key => $value) {
	if(!is_array($value) && trim($value) == '') {
	$value = '<b class="debug_error">no value</b>';
	}
	else {
	$value = htmlspecialchars(print_r($value, true));
	}

	$in_cookie = isset($_COOKIE[$key]);
	$src = isset($_GET[$key]) && !$in_cookie ? 'GE' : (isset($_POST[$key]) && !$in_cookie ? 'PO' : ($in_cookie ? 'CO' : '?') );
	echo '<tr><td>'.$src.'</td><td>'.$key.'</td><td>'.$value.'</td></tr>';
	}
	?>
	</table>
	<?php
	$this->appendHTML(ob_get_contents());
	ob_end_clean();
	}

	/**
	* Appends php session content to debugger output
	*
	*/
	function appendSession()
	{
	if (isset($_SESSION) && $_SESSION) {
	$this->appendHTML('PHP Session: [<b>'.ini_get('session.name').'</b>]');
	$this->dumpVars($_SESSION);
	$this->moveToBegin(2);
	}
	}

	function profileStart($key, $description = null, $timeStamp = null)
	{
	if (!isset($timeStamp)) {
	$timeStamp = $this->getMoment();
	}
	$this->ProfilerData[$key] = Array('begins' => $timeStamp, 'ends' => 5000, 'debuggerRowID' => count($this->Data));
	if (isset($description)) {
	$this->ProfilerData[$key]['description'] = $description;
	}

	$this->Data[] = array('profile_key' => $key, 'debug_type' => 'profiler');
	}

	function profileFinish($key, $description = null, $timeStamp = null)
	{
	if (!isset($timeStamp)) {
	$timeStamp = $this->getMoment();
	}
	$this->ProfilerData[$key]['ends'] = $timeStamp;

	if (isset($description)) {
	$this->ProfilerData[$key]['description'] = $description;
	}
	}

	function profilerAddTotal($total_key, $key = null, $value = null)
	{
	if (!isset($this->ProfilerTotals[$total_key])) {
	$this->ProfilerTotals[$total_key] = 0;
	$this->ProfilerTotalCount[$total_key] = 0;
	}

	if (!isset($value)) {
	$value = $this->ProfilerData[$key]['ends'] - $this->ProfilerData[$key]['begins'];
	}

	if (isset($key)) {
	$this->ProfilerData[$key]['totalsKey'] = $total_key;
	$this->ProfilerData[$key]['totalsBefore'] = $this->ProfilerTotals[$total_key];
	}

	$this->ProfilerTotals[$total_key] += $value;
	$this->ProfilerTotalCount[$total_key]++;
	}

	function getMoment()
	{
	list($usec, $sec) = explode(' ', microtime());
	return ((float)$usec + (float)$sec);
	}

	function generateID()
	{
	list($usec, $sec) = explode(' ', microtime());

	$id_part_1 = substr($usec, 4, 4);
	$id_part_2 = mt_rand(1,9);
	$id_part_3 = substr($sec, 6, 4);
	$digit_one = substr($id_part_1, 0, 1);
	if ($digit_one == 0) {
	$digit_one = mt_rand(1,9);
	$id_part_1 = ereg_replace("^0",'',$id_part_1);
	$id_part_1=$digit_one.$id_part_1;
	}
	return $id_part_1.$id_part_2.$id_part_3;
	}


	function getErrorNameByCode($error_code)
	{
	$error_map = Array(
	'Fatal Error' => Array(E_USER_ERROR),
	'Warning' => Array(E_WARNING, E_USER_WARNING),
	'Notice' => Array(E_NOTICE, E_USER_NOTICE),
	);

	if (defined('E_STRICT')) {
	$error_map['PHP5 Strict'] = Array(E_STRICT);
	}

	foreach ($error_map as $error_name => $error_codes) {
	if (in_array($error_code, $error_codes)) {
	return $error_name;
	}
	}

	return '';
	}

	/**
	* Generates report
	*
	*/
	function printReport($returnResult = false, $clean_output_buffer = true)
	{
	$this->profileFinish('script_runtime');

	$this->breakOutofBuffering();
	if ($this->reportDone) {
	// don't print same report twice
	return '';
	}

	if ($this->constOn('DBG_SKIP_REPORTING') \|\| $this->constOn('DBG_ZEND_PRESENT')) return '';

	$debugger_start = memory_get_usage();

	if (defined('SPACER_URL')) {
	$this->dummyImage = SPACER_URL;
	}

	$this->InitReport(); // set parameters required by AJAX

	// defined here, because user can define this contant while script is running, not event before debugger is started
	$this->safeDefine('DBG_RAISE_ON_WARNINGS', 0);

	$this->appendSession(); // show php session if any

	// ensure, that 1st line of debug output always is this one:
	$this->appendHTML('[<a href="javascript:window.location.reload();">Reload Frame</a>] [<a href="javascript:$Debugger.Toggle(27);">Hide Debugger</a>] [Current Time: <b>'.date('H:i:s').'</b>]');
	$this->moveToBegin(1);

	if ($this->constOn('DBG_SQL_PROFILE') && isset($this->ProfilerTotals['sql'])) {
	// sql query profiling was enabled -> show totals
	$this->appendHTML('<b>SQL Total time:</b> '.$this->ProfilerTotals['sql'].' <b>Number of queries</b>: '.$this->ProfilerTotalCount['sql']);
	}

	if ($this->constOn('DBG_PROFILE_INCLUDES') && isset($this->ProfilerTotals['includes'])) {
	// included file profiling was enabled -> show totals
	$this->appendHTML('<b>Included Files Total time:</b> '.$this->ProfilerTotals['includes'].' Number of includes: '.$this->ProfilerTotalCount['includes']);
	}

	if ($this->constOn('DBG_PROFILE_MEMORY')) {
	// detailed memory usage reporting by objects was enabled -> show totals
	$this->appendHTML('<b>Memory used by Objects:</b> '.round($this->ProfilerTotals['objects'] / 1024, 2).'Kb');
	}

	/*if ($this->constOn('DBG_INCLUDED_FILES')) {
	$files = get_included_files();
	$this->appendHTML('<b>Included files:</b>');
	foreach ($files as $file) {
	$this->appendHTML($this->getFileLink($this->getLocalFile($file)).' ('.round(filesize($file) / 1024, 2).'Kb)');
	}
	}*/

	/*if ($this->constOn('DBG_PROFILE_INCLUDES')) {
	$this->appendHTML('<b>Included files statistics:</b>'.( $this->constOn('DBG_SORT_INCLUDES_MEM') ? ' (sorted by memory usage)':''));
	$totals = Array( 'mem' => 0, 'time' => 0);
	$totals_configs = Array( 'mem' => 0, 'time' => 0);
	if (is_array($this->IncludesData['mem'])) {
	if ( $this->constOn('DBG_SORT_INCLUDES_MEM') ) {
	array_multisort($this->IncludesData['mem'], SORT_DESC, $this->IncludesData['file'], $this->IncludesData['time'], $this->IncludesData['level']);
	}
	foreach ($this->IncludesData['file'] as $key => $file_name) {
	$this->appendHTML( str_repeat(' -> ', ($this->IncludesData['level'][$key] >= 0 ? $this->IncludesData['level'][$key] : 0)).$file_name.' Mem: '.sprintf("%.4f Kb", $this->IncludesData['mem'][$key]/1024).' Time: '.sprintf("%.4f", $this->IncludesData['time'][$key]));
	if ($this->IncludesData['level'][$key] == 0) {
	$totals['mem'] += $this->IncludesData['mem'][$key];
	$totals['time'] += $this->IncludesData['time'][$key];
	}
	else if ($this->IncludesData['level'][$key] == -1) {
	$totals_configs['mem'] += $this->IncludesData['mem'][$key];
	$totals_configs['time'] += $this->IncludesData['time'][$key];
	}
	}
	$this->appendHTML('<b>Sub-Total classes:</b> '.' Mem: '.sprintf("%.4f Kb", $totals['mem']/1024).' Time: '.sprintf("%.4f", $totals['time']));
	$this->appendHTML('<b>Sub-Total configs:</b> '.' Mem: '.sprintf("%.4f Kb", $totals_configs['mem']/1024).' Time: '.sprintf("%.4f", $totals_configs['time']));
	$this->appendHTML('<span class="error"><b>Grand Total:</b></span> '.' Mem: '.sprintf("%.4f Kb", ($totals['mem']+$totals_configs['mem'])/1024).' Time: '.sprintf("%.4f", $totals['time']+$totals_configs['time']));
	}
	}*/

	$debug_file = $this->tempFolder.'/debug_'.$this->rowSeparator.'.txt';
	if (file_exists($debug_file)) unlink($debug_file);

	$i = 0;
	$fp = fopen($debug_file, 'a');
	$lineCount = count($this->Data);
	while ($i < $lineCount) {
	fwrite($fp, $this->prepareHTML($i).$this->rowSeparator);
	$i++;
	}
	fclose($fp);
	ob_start();
	?>
	<script type="text/javascript" src="<?php echo $this->baseURL; ?>/debugger.js"></script>
	<link rel="stylesheet" rev="stylesheet" href="<?php echo $this->baseURL; ?>/debugger.css" type="text/css" />
	<div id="debug_layer" class="debug_layer_container" style="display: none; width: <?php echo DBG_WINDOW_WIDTH; ?>px;">
	<div class="debug_layer" style="width: <?php echo $this->getWindowWidth(); ?>px;">
	<table width="100%" cellpadding="0" cellspacing="1" border="0" class="debug_layer_table" style="width: <?php echo $this->getWindowWidth(); ?>px;" align="left">
	<tbody id="debug_table"></tbody>
	</table>
	</div>
	</div>

	<script type="text/javascript">
	var $Debugger = new Debugger();
	$Debugger.IsFatalError = <?php echo $this->IsFatalError ? 'true' : 'false'; ?>;
	$Debugger.DOMViewerURL = '<?php echo constant('DBG_DOMVIEWER'); ?>';
	$Debugger.EditorPath = '<?php echo defined('DBG_EDITOR') ? addslashes(DBG_EDITOR) : '' ?>';
	$Debugger.RowSeparator = '<?php echo $this->rowSeparator; ?>';
	$Debugger.DebugURL = '<?php echo $this->baseURL.'/debugger_responce.php?sid='.$this->rowSeparator; ?>';
	<?php
	if ($this->IsFatalError \|\| DBG_RAISE_ON_WARNINGS) {
	echo '$Debugger.Toggle();';
	}
	?>
	window.focus();
	</script>
	<?php
	- $memory_used = $debugger_start - $this->ProfilerTotals['error_handling'];
	+ if (!isset($this->ProfilerTotals['error_handling'])) {
	+ $memory_used = $debugger_start;
	+ $this->ProfilerTotalCount['error_handling'] = 0;
	+ }
	+ else {
	+ $memory_used = $debugger_start - $this->ProfilerTotals['error_handling'];
	+ }

	if ($returnResult) {
	$ret = ob_get_contents();
	if ($clean_output_buffer) {
	ob_clean();
	}
	$ret .= $this->getShortReport($memory_used);

	$this->reportDone = true;
	return $ret;
	}
	else {
	if (!$this->constOn('DBG_HIDE_FULL_REPORT')) {
	$this->breakOutofBuffering();
	}
	elseif ($clean_output_buffer) {
	ob_clean();
	}
	echo $this->getShortReport($memory_used);

	$this->reportDone = true;
	}
	}

	/**
	* Format's memory usage report by debugger
	*
	* @return string
	* @access private
	*/
	function getShortReport($memory_used)
	{
	$info = Array(
	'Script Runtime' => 'PROFILE:script_runtime',
	'-' => 'SEP:-',
	'Notice / Warning' => 'PROFILE_TC:error_handling',
	'SQLs Count' => 'PROFILE_TC:sql',
	);

	$ret = '<tr><td>Application:</td><td><b>'.$this->formatSize($memory_used).'</b> ('.$memory_used.')</td></tr>';
	foreach ($info as $title => $value_key) {
	list ($record_type, $record_data) = explode(':', $value_key, 2);
	switch ($record_type) {
	case 'PROFILE': // profiler totals value
	$Data =& $this->ProfilerData[$record_data];
	$profile_time = ($Data['ends'] - $Data['begins']); // in seconds
	$ret .= '<tr><td>'.$title.':</td><td><b>'.sprintf('%.5f', $profile_time).' s</b></td></tr>';
	break;

	case 'PROFILE_TC': // profile totals record count
	$ret .= '<tr><td>'.$title.':</td><td><b>'.$this->ProfilerTotalCount[$record_data].'</b></td></tr>';
	break;

	case 'SEP':
	$ret .= '<tr><td colspan="2" style="height: 1px; background-color: #000000; padding: 0px;"><img src="'.$this->dummyImage.'" height="1" alt=""/></td></tr>';
	break;
	}
	}

	return '<br /><table class="dbg_stats_table">'.$ret.'</table>';
	}


	/**
	* User-defined error handler
	*
	* @param int $errno
	* @param string $errstr
	* @param string $errfile
	* @param int $errline
	* @param array $errcontext
	*/
	function saveError($errno, $errstr, $errfile = '', $errline = '', $errcontext = '')
	{
	$this->ProfilerData['error_handling']['begins'] = memory_get_usage();

	$errorType = $this->getErrorNameByCode($errno);
	if (!$errorType) {
	trigger_error('Unknown error type ['.$errno.']', E_USER_ERROR);
	return false;
	}

	if ($this->constOn('DBG_IGNORE_STRICT_ERRORS') && defined('E_STRICT') && ($errno == E_STRICT)) return;

	if (preg_match('/(.*)#([\d]+)$/', $errstr, $rets) ) {
	// replace short message with long one (due triger_error limitations on message size)
	$long_id = $rets[2];
	$errstr = $this->longErrors[$long_id];
	unset($this->longErrors[$long_id]);
	}

	if (strpos($errfile,'eval()\'d code') !== false) {
	$errstr = '[<b>EVAL</b>, line <b>'.$errline.'</b>]: '.$errstr;
	$tmpStr = $errfile;
	$pos = strpos($tmpStr,'(');
	$errfile = substr($tmpStr, 0, $pos);
	$pos++;
	$errline = substr($tmpStr,$pos,strpos($tmpStr,')',$pos)-$pos);
	}

	$this->Data[] = Array('no' => $errno, 'str' => $errstr, 'file' => $errfile, 'line' => $errline, 'context' => $errcontext, 'debug_type' => 'error');
	$this->ProfilerData['error_handling']['ends'] = memory_get_usage();
	$this->profilerAddTotal('error_handling', 'error_handling');
	if (substr($errorType, 0, 5) == 'Fatal') {
	$this->breakOutofBuffering(false);
	$this->IsFatalError = true;
	if (ob_get_level()) ob_flush();
	if (!$this->constOn('DBG_USE_SHUTDOWN_FUNC')) {
	$this->printReport();
	}
	exit;
	}
	}

	function breakOutofBuffering($flush = true)
	{
	while (ob_get_level()) {
	if ($flush) {
	ob_end_flush();
	}
	else {
	ob_end_clean();
	}
	}
	}

	function saveToFile($msg)
	{
	$fp = fopen($_SERVER['DOCUMENT_ROOT'].'/vb_debug.txt', 'a');
	fwrite($fp, $msg."\n");
	fclose($fp);
	}

	/**
	* Formats file/memory size in nice way
	*
	* @param int $bytes
	* @return string
	* @access public
	*/
	function formatSize($bytes)
	{
	if ($bytes >= 1099511627776) {
	$return = round($bytes / 1024 / 1024 / 1024 / 1024, 2);
	$suffix = "TB";
	} elseif ($bytes >= 1073741824) {
	$return = round($bytes / 1024 / 1024 / 1024, 2);
	$suffix = "GB";
	} elseif ($bytes >= 1048576) {
	$return = round($bytes / 1024 / 1024, 2);
	$suffix = "MB";
	} elseif ($bytes >= 1024) {
	$return = round($bytes / 1024, 2);
	$suffix = "KB";
	} else {
	$return = $bytes;
	$suffix = "Byte";
	}
	$return .= ' '.$suffix;
	return $return;
	}

	function printConstants($constants)
	{
	if (!is_array($constants)) {
	$constants = explode(',', $constants);
	}
	$contant_tpl = '<tr><td>%s</td><td><b>%s</b></td></tr>';
	$ret = '<table class="dbg_flat_table" style="width: '.$this->getWindowWidth().'px;">';
	foreach ($constants as $constant_name) {
	$ret .= sprintf($contant_tpl, $constant_name, constant($constant_name));
	}
	$ret .= '</table>';
	$this->appendHTML($ret);
	}

	function AttachToApplication() {
	if (!$this->constOn('DBG_HANDLE_ERRORS')) return true;

	if (class_exists('kApplication')) {
	restore_error_handler();
	$application =& kApplication::Instance();
	$application->Debugger =& $this;
	$application->errorHandlers[] = Array(&$this, 'saveError');
	}
	else {
	set_error_handler(Array(&$this, 'saveError'));
	}
	}
	}

	if (!function_exists('memory_get_usage')) {
	function memory_get_usage(){ return -1; }
	}

	if (!Debugger::constOn('DBG_ZEND_PRESENT')) {
	$debugger = new Debugger();
	}

	if (Debugger::constOn('DBG_USE_SHUTDOWN_FUNC')) {
	register_shutdown_function( Array(&$debugger, 'printReport') );
	}
	}
	?>
	\ No newline at end of file

	Property changes on: trunk/core/kernel/utility/debugger.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.54
	\ No newline at end of property
	+1.55
	\ No newline at end of property
	Index: trunk/core/units/languages/languages_event_handler.php
	===================================================================
	--- trunk/core/units/languages/languages_event_handler.php (revision 4884)
	+++ trunk/core/units/languages/languages_event_handler.php (revision 4885)
	@@ -1,416 +1,416 @@
	<?php

	class LanguagesEventHandler extends InpDBEventHandler
	{
	/**
	* Allows to override standart permission mapping
	*
	*/
	function mapPermissions()
	{
	parent::mapPermissions();
	$permissions = Array(
	'OnChangeLanguage' => Array('self' => true),
	'OnSetPrimary' => Array('self' => 'advanced:set_primary\|add\|edit'),
	'OnImportLanguage' => Array('self' => 'advanced:import'),
	'OnExportLanguage' => Array('self' => 'advanced:export'),
	'OnExportProgress' => Array('self' => 'advanced:export'),

	);
	$this->permMapping = array_merge($this->permMapping, $permissions);
	}

	/**
	* Updates table structure on new language adding/removing language
	*
	* @param kEvent $event
	*/
	function OnReflectMultiLingualFields($event)
	{
	$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');

	- $this->Application->UnitConfigReader->includeConfigFiles(); //make sure to re-read all configs
	+ $this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH); //make sure to re-read all configs
	foreach ($this->Application->UnitConfigReader->configData as $prefix => $config_data) {
	$ml_helper->createFields($prefix);
	}
	}

	/**
	* Allows to set selected language as primary
	*
	* @param kEvent $event
	*/
	function OnSetPrimary(&$event)
	{
	$this->StoreSelectedIDs($event);
	$ids = $this->getSelectedIDs($event);
	if ($ids) {
	$id = array_shift($ids);
	$object =& $event->getObject( Array('skip_autoload' => true) );
	$object->Load($id);
	$object->setPrimary();
	}
	}

	/**
	* [HOOK] Reset primary status of other languages if we are saving primary language
	*
	* @param kEvent $event
	*/
	function OnUpdatePrimary(&$event)
	{
	$object =& $event->getObject( Array('skip_autoload' => true) );
	$object->SwitchToLive();

	// set primary for each languages, that have this checkbox checked
	$ids = explode(',', $event->MasterEvent->getEventParam('ids'));
	foreach ($ids as $id) {
	$object->Load($id);
	if ($object->GetDBField('PrimaryLang')) {
	$object->setPrimary();
	}

	}

	// if no primary language left, then set primary last language (not to load again) from edited list
	$sql = 'SELECT '.$object->IDField.'
	FROM '.$object->TableName.'
	WHERE PrimaryLang = 1';
	$primary_language = $this->Conn->GetOne($sql);

	if (!$primary_language) {
	$object->setPrimary(false);
	}
	}


	/**
	* Occurse before updating item
	*
	* @param kEvent $event
	* @access public
	*/
	function OnBeforeItemUpdate(&$event)
	{
	$object =& $event->getObject();
	$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );

	if ($object->GetDBField('PrimaryLang') == 1 && $object->GetDBField($status_field) == 0) {
	$object->SetDBField($status_field, 1);
	}
	}

	/**
	* Shows only enabled languages on front
	*
	* @param kEvent $event
	*/
	function SetCustomQuery(&$event)
	{
	if($event->Special == 'enabled')
	{
	$object =& $event->getObject();
	$object->addFilter('enabled_filter', '%1$s.Enabled = 1');
	}
	}

	/**
	* Copy labels from another language
	*
	* @param kEvent $event
	*/
	function OnCopyLabels(&$event)
	{
	$object =& $event->getObject();
	$from_lang_id = $object->GetDBField('CopyFromLanguage');

	if( ($event->MasterEvent->status == erSUCCESS) && $object->GetDBField('CopyLabels') == 1 && ($from_lang_id > 0) )
	{
	$lang_id = $object->GetID();

	// 1. phrases import
	$phrases_live = $this->Application->getUnitOption('phrases','TableName');
	$phrases_temp = $this->Application->GetTempName($phrases_live);
	$sql = 'INSERT INTO '.$phrases_temp.'
	SELECT Phrase, Translation, PhraseType, 0-PhraseId, '.$lang_id.', '.adodb_mktime().', "", Module
	FROM '.$phrases_live.'
	WHERE LanguageId='.$from_lang_id;
	$this->Conn->Query($sql);

	// 2. events import
	$em_table_live = $this->Application->getUnitOption('emailmessages','TableName');
	$em_table_temp = $this->Application->GetTempName($em_table_live);

	$sql = 'SELECT * FROM '.$em_table_live.' WHERE LanguageId = '.$from_lang_id;
	$email_messages = $this->Conn->Query($sql);
	if($email_messages)
	{
	$id = $this->Conn->GetOne('SELECT MIN(EmailMessageId) FROM '.$em_table_live);
	if($id > 0) $id = 0;
	$id--;

	$sqls = Array();
	foreach($email_messages as $email_message)
	{
	$sqls[] = $id.','.$this->Conn->qstr($email_message['Template']).','.$this->Conn->qstr($email_message['MessageType']).','.$lang_id.','.$email_message['EventId'];
	$id--;
	}
	$sql = 'INSERT INTO '.$em_table_temp.'(EmailMessageId,Template,MessageType,LanguageId,EventId) VALUES ('.implode('),(',$sqls).')';
	$this->Conn->Query($sql);
	}

	$object->SetDBField('CopyLabels', 0);
	}
	}

	/**
	* Prepare temp tables for creating new item
	* but does not create it. Actual create is
	* done in OnPreSaveCreated
	*
	* @param kEvent $event
	*/
	function OnPreCreate(&$event)
	{
	parent::OnPreCreate($event);

	$object =& $event->getObject();
	$object->SetDBField('CopyLabels', 1);

	$live_table = $this->Application->GetLiveName($object->TableName);
	$primary_lang_id = $this->Conn->GetOne('SELECT '.$object->IDField.' FROM '.$live_table.' WHERE PrimaryLang = 1');

	$object->SetDBField('CopyFromLanguage', $primary_lang_id);
	}


	function OnChangeLanguage(&$event)
	{
	$this->Application->SetVar('m_lang', $this->Application->GetVar('language'));

	//$this->Application->LinkVar('language', 'm_lang');
	}

	/**
	* Parse language XML file into temp tables and redirect to progress bar screen
	*
	* @param kEvent $event
	*/
	function OnImportLanguage(&$event)
	{
	$items_info = $this->Application->GetVar('phrases_import');
	if($items_info)
	{
	list($id,$field_values) = each($items_info);
	$object =& $this->Application->recallObject('phrases.import', 'phrases', Array('skip_autoload' => true) );
	$object->SetFieldsFromHash($field_values);

	$filename = getArrayValue($field_values, 'LangFile', 'tmp_name');
	if( filesize($filename) )
	{
	$modules = getArrayValue($field_values,'Module');
	$lang_xml =& $this->Application->recallObject('LangXML');
	$lang_xml->Parse($filename, $field_values['PhraseType'], $modules, $field_values['ImportOverwrite']);

	$event->redirect = 'dummy';
	$event->SetRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'mode'=>$field_values['ImportOverwrite']) );
	}
	else
	{
	$object =& $this->Application->recallObject('phrases.import');
	$object->SetError('LangFile', 'la_empty_file', 'la_EmptyFile');
	$event->redirect = false;
	}
	}
	}

	/**
	* Copies imported from xml file from temp table to live table
	*
	* @param kEvent $event
	*/
	function OnImportProgress(&$event)
	{
	define('IMPORT_BY', 300); // import this much records per step
	$template_name = 'regional/languages_import_step2';

	$import_mode = (int)$this->Application->GetVar('mode'); // 1 - overwrite existing phrases, 0 - don't overwrite existing phrases
	$import_source = (int)$this->Application->GetVar('source');
	$import_steps = Array(0 => 'lang', 1 => 'phrases', 2 => 'emailmessages', 3 => 'finish');

	$key_fields = Array(0 => 'PackName', 1 => 'Phrase', 2 => 'EventId'); // by what field should we search record match

	$import_titles = Array(0 => 'la_ImportingLanguages', 1 => 'la_ImportingPhrases', 2 => 'la_ImportingEmailEvents', 3 => 'la_Done');

	// --- BEFORE ---
	$import_prefix = $import_steps[$import_source];
	$import_start = (int)$this->Application->GetVar('start');
	$id_field = $this->Application->getUnitOption($import_prefix,'IDField');
	$dst_table = $this->Application->getUnitOption($import_prefix,'TableName');
	$src_table = $this->Application->GetTempName($dst_table);

	$import_total = $this->Application->GetVar('total');
	if(!$import_total) $import_total = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$src_table);
	// --- AFTER ---

	if($import_start == $import_total)
	{
	$import_source++;
	$import_prefix = $import_steps[$import_source];
	if($import_prefix == 'finish')
	{
	$event->SetRedirectParam('opener','u');
	return true;
	}

	$import_start = 0;
	$id_field = $this->Application->getUnitOption($import_prefix,'IDField');
	$dst_table = $this->Application->getUnitOption($import_prefix,'TableName');
	$src_table = $this->Application->GetTempName($dst_table);
	$import_total = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$src_table);
	}

	if($import_total > 0)
	{
	$done_percent = ($import_start * 100) / $import_total;
	}
	else
	{
	$done_percent = 100;
	}

	$block_params = Array( 'name' => $template_name,
	'title' => $import_titles[$import_source],
	'percent_done' => $done_percent,
	'percent_left' => 100 - $done_percent);

	$this->Application->InitParser();
	$this->Application->setUnitOption('phrases','AutoLoad',false);
	echo $this->Application->ParseBlock($block_params);
	flush();

	$sql = 'SELECT * FROM %s LIMIT %s,%s';
	$rows = $this->Conn->Query( sprintf($sql,$src_table,$import_start,IMPORT_BY) );

	$values_sql = '';

	// if found and mode = 1 (overwrite)
	$search_sql = 'SELECT '.$id_field.' FROM '.$dst_table.' WHERE '.$key_fields[$import_source].' = %s AND LanguageId = %s';
	$update_sql = 'UPDATE '.$dst_table.' SET %s WHERE '.$id_field.' = %s';

	foreach($rows as $row)
	{
	$tmp_sql = sprintf($search_sql, $this->Conn->qstr($row[ $key_fields[$import_source] ]), $row['LanguageId'] );
	$tmp_id = $this->Conn->GetOne($tmp_sql);
	if($tmp_id > 0 && $import_mode == 1)
	{
	// update
	$update_fields = '';
	foreach($row as $field_name => $field_value)
	{
	if($field_name == $id_field) continue;
	$update_fields .= '`'.$field_name.'` = '.$this->Conn->qstr($field_value).',';
	}
	$update_fields = preg_replace('/(.*),$/', '\\1', $update_fields);
	$this->Conn->Query( sprintf($update_sql, $update_fields, $tmp_id) );
	}
	elseif(!$tmp_id)
	{
	$values_sql .= '(';
	foreach($row as $field_value)
	{
	$values_sql .= $this->Conn->qstr($field_value).',';
	}
	$values_sql = preg_replace('/(.*),$/', '\\1', $values_sql).'),';
	}
	}

	if($values_sql)
	{
	$fields_sql = '';
	$fields = array_keys( $this->Application->getUnitOption($import_prefix,'Fields') );
	foreach($fields as $field_name)
	{
	$fields_sql .= '`'.$field_name.'`,';
	}
	$fields_sql = preg_replace('/(.*),$/', '\\1', $fields_sql);

	$values_sql = preg_replace('/(.*),$/', '\\1', $values_sql);
	$sql = sprintf('INSERT INTO %s (%s) VALUES %s', $dst_table, $fields_sql, $values_sql);
	$this->Conn->Query($sql);
	}
	$event->setRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'start' => $import_start += count($rows), 'total' => $import_total, 'source' => $import_source, 'mode' => $import_mode) );
	}

	/**
	* Stores ids of selected languages and redirects to export language step 1
	*
	* @param kEvent $event
	*/
	function OnExportLanguage(&$event)
	{
	$this->Application->setUnitOption('phrases','AutoLoad',false);

	$this->StoreSelectedIDs($event);
	$this->Application->StoreVar('export_language_ids', implode(',', $this->getSelectedIDs($event)) );

	$event->setRedirectParams( Array('m_opener'=>'d','phrases.export_event'=>'OnNew','pass'=>'all,phrases.export') );
	$event->redirect = 'regional/languages_export';
	}

	/**
	* Saves selected languages to xml file passed
	*
	* @param kEvent $event
	*/
	function OnExportProgress(&$event)
	{
	$items_info = $this->Application->GetVar('phrases_export');
	if($items_info)
	{
	list($id,$field_values) = each($items_info);
	$object =& $this->Application->recallObject('phrases.export', 'phrases', Array('skip_autoload' => true) );
	$object->SetFieldsFromHash($field_values);

	$lang_ids = explode(',', $this->Application->RecallVar('export_language_ids') );

	if( !getArrayValue($field_values,'LangFile') )
	{
	$object->SetError('LangFile', 'required');
	$event->redirect = false;
	return false;
	}
	if( !is_writable(EXPORT_PATH) )
	{
	$object->SetError('LangFile', 'write_error', 'la_ExportFolderNotWritable');
	$event->redirect = false;
	return false;
	}
	if( substr($field_values['LangFile'], -5) != '.lang' ) $field_values['LangFile'] .= '.lang';
	$filename = EXPORT_PATH.'/'.$field_values['LangFile'];

	$lang_xml =& $this->Application->recallObject('LangXML');
	if ($object->GetDBField('DoNotEncode')) {
	$lang_xml->SetEncoding('plain');
	}
	$lang_xml->Create($filename, $field_values['PhraseType'], $lang_ids, $field_values['Module']);

	}

	$event->redirect = 'regional/languages_export_step2';
	$event->SetRedirectParam('export_file', $field_values['LangFile']);
	}

	/**
	* Returns to previous template in opener stack
	*
	* @param kEvent $event
	*/
	function OnGoBack(&$event)
	{
	$event->redirect_params['opener'] = 'u';
	}

	}

	?>
	\ No newline at end of file

	Property changes on: trunk/core/units/languages/languages_event_handler.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.25
	\ No newline at end of property
	+1.26
	\ No newline at end of property
	Index: trunk/core/units/general/helpers/sections_helper.php
	===================================================================
	--- trunk/core/units/general/helpers/sections_helper.php (revision 4884)
	+++ trunk/core/units/general/helpers/sections_helper.php (revision 4885)
	@@ -1,109 +1,109 @@
	<?php

	/**
	* Porcesses sections information from configs
	*
	*/
	class kSectionsHelper extends kHelper {

	/**
	* Holds information about all sections
	*
	* @var Array
	*/
	var $Tree = Array();

	/**
	* Set's prefix and special
	*
	* @param string $prefix
	* @param string $special
	* @access public
	*/
	function Init($prefix, $special, $event_params = null)
	{
	parent::Init($prefix, $special, $event_params);
	$this->BuildTree();
	}

	/**
	* Builds xml for tree in left frame in admin
	*
	* @param Array $params
	*/
	function BuildTree()
	{
	$unit_config_reader = false;
	$data = $this->Conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "sections_parsed"');
	if ($data) {
	$this->Tree = unserialize($data['Data']);
	return ;
	}
	- $this->Application->UnitConfigReader->includeConfigFiles();
	+ $this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH);

	$this->Tree = Array();
	if (!$unit_config_reader) {
	$unit_config_reader =& $this->Application->recallObject('kUnitConfigReader');
	}

	$prefixes = array_keys($unit_config_reader->configData);
	foreach ($prefixes as $prefix) {
	$config =& $unit_config_reader->configData[$prefix];
	$sections = getArrayValue($config, 'Sections');
	if (!$sections) continue;

	// echo 'Prefix: ['.$prefix.'] has ['.count($sections).'] sections<br />';

	foreach ($sections as $section_name => $section_params) {
	// we could also skip not allowed sections here in future
	$section_params['SectionPrefix'] = $prefix;
	$section_params['url']['m_opener'] = 'r';

	$pass_section = getArrayValue($section_params, 'url', 'pass_section');

	if ($pass_section) {
	unset($section_params['url']['pass_section']);
	$section_params['url']['section'] = $section_name;
	if (!isset($section_params['url']['module'])) {
	$module_name = $this->Application->findModule('Path', $config['ModuleFolder'].'/', 'Name');
	$section_params['url']['module'] = $module_name;
	}
	}
	if (!isset($section_params['url']['t'])) {
	$section_params['url']['t'] = 'index';
	}

	$current_data = isset($this->Tree[$section_name]) ? $this->Tree[$section_name] : Array();
	$this->Tree[$section_name] = array_merge_recursive2($current_data, $section_params);

	$this->Tree[ $section_params['parent'] ]['children'][ "{$section_params['priority']}" ] = $section_name;

	if ($section_params['type'] == stTAB) {
	// if this is tab, then mark parent section as TabOnly
	$this->Tree[ $section_params['parent'] ]['tabs_only'] = true;
	}
	}
	}

	$this->Conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("sections_parsed", '.$this->Conn->qstr(serialize($this->Tree)).', '.adodb_mktime().')');
	}

	/**
	* Returns details information about section
	*
	* @param string $section_name
	* @return Array
	*/
	function &getSectionData($section_name)
	{
	if (isset($this->Tree[$section_name])) {
	$ret =& $this->Tree[$section_name];
	}
	else {
	$ret = Array();
	}
	return $ret;
	}
	}

	?>
	\ No newline at end of file

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

in-portalNo OneTemporaryActions

File Metadata

in-portalView Options

Event Timeline

in-portal
No OneTemporary
Actions

in-portal
View Options