Index: trunk/core/units/languages/import_xml.php
===================================================================
diff -u -N -r1623 -r1636
--- trunk/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 1623)
+++ trunk/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 1636)
@@ -1,5 +1,8 @@
 <?php
-
+	
+	define('LANG_OVERWRITE_EXISTING', 1);
+	define('LANG_SKIP_EXISTING', 2);
+	
 	class LangXML_Parser extends kBase {
 	
 		/**
@@ -16,13 +19,47 @@
 		 */
 		var $Conn = null;
 		
+		/**
+		 * Fields of language currently beeing processed
+		 *
+		 * @var Array
+		 */
 		var $current_language = Array();
+		
+		/**
+		 * Fields of phrase currently beeing processed
+		 *
+		 * @var Array
+		 */
 		var $current_phrase = Array();
+		
+		/**
+		 * Fields of event currently beeing processed
+		 *
+		 * @var Array
+		 */
 		var $current_event = Array();
 		
+		/**
+		 * Event type + name mapping to id (from system)
+		 *
+		 * @var Array
+		 */
 		var $events_hash = Array();
 		
+		
+		/**
+		 * Phrase types allowed for import/export operations
+		 *
+		 * @var Array
+		 */
 		var $phrase_types_allowed = Array();
+		
+		/**
+		 * Modules allowed for export (import in development)
+		 *
+		 * @var Array
+		 */
 		var $modules_allowed = Array();
 		
 		var $lang_object = null;
@@ -31,6 +68,8 @@
 		
 		var $ip_address = '';
 		
+		var $import_mode = LANG_SKIP_EXISTING;
+		
 		function LangXML_Parser()
 		{
 			parent::kBase();
@@ -74,12 +113,13 @@
 			return $temp_table;
 		}
 		
-		function Parse($filename, $phrase_types, $module_ids)
+		function Parse($filename, $phrase_types, $module_ids, $import_mode = LANG_SKIP_EXISTING)
 		{		
 			// define the XML parsing routines/functions to call based on the handler path
 			if( !file_exists($filename) ) return false;
 			
 			$this->phrase_types_allowed = array_flip($phrase_types);
+			$this->import_mode = $import_mode;
 			
 			//if (in_array('In-Portal',)
 			
@@ -106,6 +146,14 @@
 			{
 				case 'LANGUAGES LANGUAGE':
 					$this->current_language = Array('PackName' => $attributes['PACKNAME'], 'LocalName' => $attributes['PACKNAME']);
+					
+					$sql = 'SELECT %s FROM %s WHERE PackName = %s';
+					$sql = sprintf(	$sql,
+									$this->lang_object->IDField,
+									kTempTablesHandler::GetLiveName($this->lang_object->TableName),
+									$this->Conn->qstr($this->current_event['PackName']) );
+					$language_id = $this->Conn->GetOne($sql);
+					if($language_id) $this->current_language['LanguageId'] = $language_id;
 					break;
 					
 				case 'LANGUAGES LANGUAGE PHRASES':